X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=selector.c;h=d4ddb27af2e50683f5c362ef8e435773ca1beb5e;hp=a404087c65c7920f48f08a1f9bc03ee75e3d6b1b;hb=c12e106a918136ed474eca04d9bcf592d2324d5d;hpb=557b838d5ba7fb635943b62222f9d82fab7dcf8c

diff --git a/selector.c b/selector.c
index a404087..d4ddb27 100644
--- a/selector.c
+++ b/selector.c
@@ -25,7 +25,7 @@
 /*
 
   To use it as a super-history-search for bash:
-  selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
+  selector --bash <(history)
 
 */
 
@@ -43,8 +43,9 @@
 #include <regex.h>
 #include <locale.h>
 #include <getopt.h>
+#include <limits.h>
 
-#define VERSION "1.1.1"
+#define VERSION "1.1.2"
 
 #define BUFFER_SIZE 4096
 
@@ -127,7 +128,7 @@ void str_to_positive_integers(char *string, int *values, int nb) {
               return;
             } else {
               fprintf(stderr,
-                      "Selector: Missing value in `%s'.\n", string);
+                      "selector: Missing value in `%s'.\n", string);
               exit(EXIT_FAILURE);
             }
           }
@@ -135,17 +136,17 @@ void str_to_positive_integers(char *string, int *values, int nb) {
           gotone = 0;
         } else {
           fprintf(stderr,
-                  "Selector: Too many values in `%s'.\n", string);
+                  "selector: Too many values in `%s'.\n", string);
           exit(EXIT_FAILURE);
         }
       } else {
         fprintf(stderr,
-                "Selector: Empty value in `%s'.\n", string);
+                "selector: Empty value in `%s'.\n", string);
         exit(EXIT_FAILURE);
       }
     } else {
       fprintf(stderr,
-              "Selector: Syntax error in `%s'.\n", string);
+              "selector: Syntax error in `%s'.\n", string);
       exit(EXIT_FAILURE);
     }
     s++;
@@ -189,6 +190,8 @@ void usage(FILE *out) {
   fprintf(out, "         monochrome mode\n");
   fprintf(out, " -q, --no-beep\n");
   fprintf(out, "         make a flash instead of a beep on an edition error\n");
+  fprintf(out, " --bash\n");
+  fprintf(out, "         setting for bash history search, same as -b -i -d -v -w -l ${HISTSIZE}\n");
   fprintf(out, " --, --rest-are-files\n");
   fprintf(out, "         all following arguments are filenames\n");
   fprintf(out, " -t <title>, --title <title>\n");
@@ -249,7 +252,7 @@ int add_and_get_previous_index(struct hash_table_t *hash_table,
                                const char *new_string, int new_index,
                                char **strings) {
 
-  unsigned int code = 0;
+  unsigned int code = 0, start;
   int k;
 
   /* This is my recipe. I checked, it seems to work (as long as
@@ -261,6 +264,7 @@ int add_and_get_previous_index(struct hash_table_t *hash_table,
   }
 
   code = code % hash_table->size;
+  start = code;
 
   while(hash_table->entries[code] >= 0) {
     /* There is a string with that code */
@@ -275,6 +279,12 @@ int add_and_get_previous_index(struct hash_table_t *hash_table,
     /* This collision was not the same string, let's move to the next
        in the table */
     code = (code + 1) % hash_table->size;
+    /* We came back to our original code, which means that the table
+       is full */
+    if(code == start) {
+      printf("Full hash table (that should not happen)\n");
+      exit(EXIT_FAILURE);
+   }
   }
 
   /* This string was not already in there, store the index in the
@@ -296,7 +306,7 @@ typedef struct {
   char *splitted_patterns, **patterns;
 } matcher_t;
 
-int match(char *string, matcher_t *matcher) {
+int match(matcher_t *matcher, char *string) {
   int n;
   if(matcher->nb_patterns >= 0) {
     if(matcher->case_sensitive) {
@@ -323,8 +333,9 @@ void free_matcher(matcher_t *matcher) {
   }
 }
 
-void initialize_matcher(int use_regexp, int case_sensitive,
-                        matcher_t *matcher, const char *pattern) {
+void initialize_matcher(matcher_t *matcher,
+                        int use_regexp, int case_sensitive,
+                        const char *pattern) {
   const char *s;
   char *t, *last_pattern_start;
   int n;
@@ -425,17 +436,16 @@ void kill_after_cursor(char *buffer, int *position) {
 
 /*********************************************************************/
 
-int previous_visible(int current_line, int nb_lines, char **lines,
-                     matcher_t *matcher) {
+int previous_visible(int current_line, char **lines, matcher_t *matcher) {
   int line = current_line - 1;
-  while(line >= 0 && !match(lines[line], matcher)) line--;
+  while(line >= 0 && !match(matcher, lines[line])) line--;
   return line;
 }
 
 int next_visible(int current_line, int nb_lines, char **lines,
                  matcher_t *matcher) {
   int line = current_line + 1;
-  while(line < nb_lines && !match(lines[line], matcher)) line++;
+  while(line < nb_lines && !match(matcher, lines[line])) line++;
 
   if(line < nb_lines)
     return line;
@@ -470,7 +480,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
   int nb_printed_lines = 0;
   int cursor_x;
 
-  initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
+  initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
 
   console_width = getmaxx(stdscr);
   console_height = getmaxy(stdscr);
@@ -493,14 +503,13 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
   else if(nb_lines > 0) {
     int new_focus_line;
-    if(match(lines[*current_focus_line], &matcher)) {
+    if(match(&matcher, lines[*current_focus_line])) {
       new_focus_line = *current_focus_line;
     } else {
       new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
                                     &matcher);
       if(new_focus_line < 0) {
-        new_focus_line = previous_visible(*current_focus_line, nb_lines, lines,
-                                          &matcher);
+        new_focus_line = previous_visible(*current_focus_line, lines, &matcher);
       }
     }
 
@@ -519,7 +528,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
       } else {
         /* We want to go up, let's find the first visible line above */
         for(m = 0; l >= 0 && m < -motion; m++) {
-          l = previous_visible(l, nb_lines, lines, &matcher);
+          l = previous_visible(l, lines, &matcher);
           if(l >= 0) {
             new_focus_line = l;
           }
@@ -544,21 +553,21 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
         if(first_line > 0) {
           first_line--;
-          while(first_line > 0 && !match(lines[first_line], &matcher)) {
+          while(first_line > 0 && !match(&matcher, lines[first_line])) {
             first_line--;
           }
-          if(match(lines[first_line], &matcher)) {
+          if(match(&matcher, lines[first_line])) {
             nb_match++;
           }
         }
 
         if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
           last_line++;
-          while(last_line < nb_lines - 1 && !match(lines[last_line], &matcher)) {
+          while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line])) {
             last_line++;
           }
 
-          if(match(lines[last_line], &matcher)) {
+          if(match(&matcher, lines[last_line])) {
             nb_match++;
           }
         }
@@ -567,7 +576,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
       /* Now we display them */
 
       for(l = first_line; l <= last_line; l++) {
-        if(match(lines[l], &matcher)) {
+        if(match(&matcher, lines[l])) {
           int k = 0;
 
           while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) {
@@ -750,7 +759,7 @@ void read_file(struct hash_table_t *hash_table,
   file = fopen(input_filename, "r");
 
   if(!file) {
-    fprintf(stderr, "Selector: Can not open `%s'.\n", input_filename);
+    fprintf(stderr, "selector: Can not open `%s'.\n", input_filename);
     exit(EXIT_FAILURE);
   }
 
@@ -783,7 +792,7 @@ void read_file(struct hash_table_t *hash_table,
 
     if(eol == BUFFER_SIZE) {
       raw_line[BUFFER_SIZE - 1] = '\0';
-      fprintf(stderr, "Selector: Line too long (max is %d characters):\n",
+      fprintf(stderr, "selector: Line too long (max is %d characters):\n",
               BUFFER_SIZE);
       fprintf(stderr, raw_line);
       fprintf(stderr, "\n");
@@ -806,6 +815,13 @@ void read_file(struct hash_table_t *hash_table,
 
 /*********************************************************************/
 
+/* For long options that have no equivalent short option, use a
+   non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
+enum
+{
+  OPT_BASH_MODE = CHAR_MAX + 1
+};
+
 static struct option long_options[] = {
   { "output-file", 1, 0, 'o' },
   { "pattern-separator", 1, 0, 's' },
@@ -824,6 +840,7 @@ static struct option long_options[] = {
   { "number-of-lines", 1, 0, 'l' },
   { "colors", 1, 0, 'c' },
   { "rest-are-files", no_argument, 0, '-' },
+  { "bash", no_argument, 0, OPT_BASH_MODE },
   { "help", no_argument, 0, 'h' },
   { 0, 0, 0, 0 }
 };
@@ -846,9 +863,10 @@ int main(int argc, char **argv) {
   char **lines, **labels;
   int nb_lines;
   struct hash_table_t *hash_table;
+  char *bash_histsize;
 
   if(!isatty(STDIN_FILENO)) {
-    fprintf(stderr, "Selector: The standard input is not a tty.\n");
+    fprintf(stderr, "selector: The standard input is not a tty.\n");
     exit(EXIT_FAILURE);
   }
 
@@ -945,20 +963,39 @@ int main(int argc, char **argv) {
       show_help = 1;
       break;
 
+    case OPT_BASH_MODE:
+      /* Same as -c 7,4,0,3 -q */
+      /* color_fg_modeline = 7; */
+      /* color_bg_modeline = 4; */
+      /* color_fg_highlight = 0; */
+      /* color_bg_highlight = 3; */
+      /* error_flash = 1; */
+      /* Same as -b -i -d -v -w */
+      bash_history = 1;
+      inverse_order = 1;
+      remove_duplicates = 1;
+      output_to_vt_buffer = 1;
+      add_control_qs = 1;
+      bash_histsize = getenv("HISTSIZE");
+      if(bash_histsize) {
+        str_to_positive_integers(bash_histsize, &nb_lines_max, 1);
+      }
+      break;
+
     default:
       error = 1;
       break;
     }
   }
 
-  if(show_help || error) {
-    if(error) {
-      usage(stderr);
-      exit(EXIT_FAILURE);
-    } else {
-      usage(stdout);
-      exit(EXIT_SUCCESS);
-    }
+  if(error) {
+    usage(stderr);
+    exit(EXIT_FAILURE);
+  }
+
+  if(show_help) {
+    usage(stdout);
+    exit(EXIT_SUCCESS);
   }
 
   lines = safe_malloc(nb_lines_max * sizeof(char *));
@@ -1056,7 +1093,7 @@ int main(int argc, char **argv) {
        color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
       echo();
       endwin();
-      fprintf(stderr, "Selector: Color numbers have to be between 0 and %d.\n",
+      fprintf(stderr, "selector: Color numbers have to be between 0 and %d.\n",
               COLORS - 1);
       exit(EXIT_FAILURE);
     }
@@ -1208,7 +1245,7 @@ int main(int argc, char **argv) {
         fprintf(out, "\n");
       } else {
         fprintf(stderr,
-                "Selector: Can not open %s for writing.\n",
+                "selector: Can not open %s for writing.\n",
                 output_filename);
         exit(EXIT_FAILURE);
       }