From: Francois Fleuret <francois@fleuret.org>
Date: Fri, 16 Apr 2010 21:07:22 +0000 (+0200)
Subject: Removed the -f option.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=75b9b95eb74ceac889716fcb70292c00a5e2b7c9;p=selector.git

Removed the -f option.
---

diff --git a/selector.1 b/selector.1
index 7dfedd8..905a7cf 100644
--- a/selector.1
+++ b/selector.1
@@ -117,9 +117,6 @@ selection from the line to return
 .TP
 \fB-l \fI<number>\fR, \fB--number-of-lines \fI<number>\fR
 specify the maximum number of lines to take into account
-.TP
-\fB-f \fI<filename>\fR, \fB--input-file \fI<filename>\fR
-specify a file to search into (option kept for compatibility reasons)
 
 .SH "EXAMPLES"
 
diff --git a/selector.c b/selector.c
index b7a5e18..e3c0b33 100644
--- a/selector.c
+++ b/selector.c
@@ -784,7 +784,6 @@ static struct option long_options[] = {
   { "add-control-qs", no_argument, 0, 'w' },
   { "monochrome", no_argument, 0, 'm' },
   { "no-beep", no_argument, 0, 'q' },
-  { "input-file", 1, 0, 'f' },
   { "revert-order", no_argument, 0, 'i' },
   { "remove-bash-prefix", no_argument, 0, 'b' },
   { "remove-zsh-prefix", no_argument, 0, 'z' },
@@ -801,7 +800,7 @@ static struct option long_options[] = {
 
 int main(int argc, char **argv) {
 
-  char input_filename[BUFFER_SIZE], output_filename[BUFFER_SIZE];
+  char output_filename[BUFFER_SIZE];
   char *s;
   char pattern[BUFFER_SIZE];
   int c, k, l, n;
@@ -830,7 +829,6 @@ int main(int argc, char **argv) {
 
   setlocale(LC_ALL, "");
 
-  strcpy(input_filename, "");
   strcpy(output_filename, "");
 
   while (!rest_are_files &&
@@ -867,10 +865,6 @@ int main(int argc, char **argv) {
       error_flash = 1;
       break;
 
-    case 'f':
-      strncpy(input_filename, optarg, BUFFER_SIZE);
-      break;
-
     case 'i':
       inverse_order = 1;
       break;
@@ -950,12 +944,6 @@ int main(int argc, char **argv) {
     hash_table = 0;
   }
 
-  if(input_filename[0]) {
-    read_file(hash_table,
-              input_filename,
-              nb_lines_max, &nb_lines, lines);
-  }
-
   while(optind < argc) {
     read_file(hash_table,
               argv[optind],