Cosmetics.

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index 8f2296b..63b7c24 100644 (file)
--- a/selector.c
+++ b/selector.c
@@ -25,7 +25,7 @@
 /*
 
   To use it as a super-history-search for bash:
-  selector --bash -l ${HISTSIZE} <(history)
+  selector --bash <(history)
 
 */
 
@@ -45,7 +45,7 @@
 #include <getopt.h>
 #include <limits.h>
 
-#define VERSION "1.1.1"
+#define VERSION "1.1.2"
 
 #define BUFFER_SIZE 4096
 
@@ -128,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);
             }
           }
@@ -136,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++;
@@ -191,7 +191,7 @@ void usage(FILE *out) {
   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\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");
@@ -252,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
@@ -264,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 */
@@ -278,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
@@ -751,7 +758,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);
   }
 
@@ -784,7 +791,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");
@@ -855,9 +862,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);
   }
 
@@ -967,6 +975,10 @@ int main(int argc, char **argv) {
       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:
@@ -975,14 +987,14 @@ int main(int argc, char **argv) {
     }
   }
 
-  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 *));
@@ -1080,7 +1092,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);
     }
@@ -1232,7 +1244,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);
       }