X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=0bac7b0a67266dbd12552fc2fdd9998cd824d98c;hb=45b3d87d5ba3d51af217f31dd4db58c90dedac2e;hp=13f73b1e9753af09539de50cbeafdfccadfc3ffc;hpb=881e755cc244197d8989cb92a8abed0bf70f4715;p=selector.git

diff --git a/selector.c b/selector.c
index 13f73b1..0bac7b0 100644
--- a/selector.c
+++ b/selector.c
@@ -22,8 +22,11 @@
  *
  */
 
-/* To use it as a super-history-search for bash:
-   selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
+/*
+
+  To use it as a super-history-search for bash:
+  selector -q -b -i -d -v -w -l ${HISTSIZE} <(history)
+
 */
 
 #define _GNU_SOURCE
@@ -41,7 +44,7 @@
 
 #define VERSION "1.0"
 
-const int buffer_size = 4096;
+#define BUFFER_SIZE 4096
 
 /* Yeah, global variables! */
 
@@ -67,11 +70,11 @@ int attr_modeline, attr_focus_line, attr_error;
 void inject_into_tty_buffer(char *string) {
   struct termios oldtio, newtio;
   const char *k;
+  const char control_q = '\021';
   tcgetattr(STDIN_FILENO, &oldtio);
   memset(&newtio, 0, sizeof(newtio));
   /* Set input mode (non-canonical, *no echo*,...) */
   tcsetattr(STDIN_FILENO, TCSANOW, &newtio);
-  const char control_q = '\021';
   /* Put the selected string in the tty input buffer */
   for(k = string; *k; k++) {
     if(add_control_qs && !(*k >= ' ' && *k <= '~')) {
@@ -88,7 +91,7 @@ void inject_into_tty_buffer(char *string) {
 
 void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
   if(n_opt + n >= argc) {
-    fprintf(stderr, "Missing argument for %s, expecting %s.\n",
+    fprintf(stderr, "Selector: Missing argument for %s, expecting %s.\n",
             argv[n_opt], help);
     exit(1);
   }
@@ -108,7 +111,9 @@ int string_to_positive_integer(char *string) {
   } else error = 1;
 
   if(error) {
-    fprintf(stderr, "Value `%s' is not a positive integer.\n", string);
+    fprintf(stderr,
+            "Selector: Value `%s' is not a positive integer.\n",
+            string);
     exit(1);
   }
 
@@ -123,67 +128,84 @@ void error_feedback() {
   }
 }
 
-/*********************************************************************/
-/* A quick and dirty hash table
+/* A quick and dirty hash table */
+
+/* The table itself stores indexes of the strings taken in a char**
+   table. When a string is added, if it was already in the table, the
+   new index replaces the previous one.  */
+
+typedef struct {
+  int size;
+  int *entries;
+} hash_table_t;
+
+hash_table_t *new_hash_table(int size) {
+  int k;
+  hash_table_t *hash_table;
+
+  hash_table = (hash_table_t *) malloc(sizeof(hash_table_t));
 
-   The table itself stores indexes of the strings taken in a char
-   **table. When a string is added, if it was already in the table,
-   the new index replaces the previous one. */
+  hash_table->size = size;
+  hash_table->entries = (int *) malloc(hash_table->size * sizeof(int));
 
-int *new_hash_table(int hash_table_size) {
-  int *result, k;
-  result = (int *) malloc(hash_table_size * sizeof(int));
-  for(k = 0; k < hash_table_size; k++) {
-    result[k] = -1;
+  for(k = 0; k < hash_table->size; k++) {
+    hash_table->entries[k] = -1;
   }
-  return result;
+
+  return hash_table;
+}
+
+void free_hash_table(hash_table_t *hash_table) {
+  free(hash_table->entries);
+  free(hash_table);
 }
 
 /* Adds new_string in the table, associated to new_index. If this
    string was not already in the table, returns -1. Otherwise, returns
    the previous index it had. */
 
-int test_and_add(char *new_string, int new_index,
-                 char **strings,
-                 int *hash_table, int hash_table_size) {
+int add_and_get_previous_index(hash_table_t *hash_table,
+                               const char *new_string, int new_index,
+                               char **strings) {
 
   unsigned int code = 0;
   int k;
 
   /* This is my recipe. I checked, it seems to work (as long as
-     hash_table_size is not a multiple of 387433 that should be okay) */
+     hash_table->size is not a multiple of 387433 that should be
+     okay) */
 
   for(k = 0; new_string[k]; k++) {
     code = code * 387433 + (unsigned int) (new_string[k]);
   }
 
-  code = code % hash_table_size;
+  code = code % hash_table->size;
 
-  while(hash_table[code] >= 0) {
+  while(hash_table->entries[code] >= 0) {
     /* There is a string with that code */
-    if(strcmp(new_string, strings[hash_table[code]]) == 0) {
+    if(strcmp(new_string, strings[hash_table->entries[code]]) == 0) {
       /* It is the same string, we keep a copy of the stored index */
-      int result = hash_table[code];
+      int result = hash_table->entries[code];
       /* Put the new one */
-      hash_table[code] = new_index;
+      hash_table->entries[code] = new_index;
       /* And return the previous one */
       return result;
     }
     /* This collision was not the same string, let's move to the next
        in the table */
-    code = (code + 1) % hash_table_size;
+    code = (code + 1) % hash_table->size;
   }
 
   /* This string was not already in there, store the index in the
      table and return -1 */
 
-  hash_table[code] = new_index;
+  hash_table->entries[code] = new_index;
   return -1;
 }
 
-/*********************************************************************/
-/* A matcher matches either with a collection of substrings, or with a
-   regexp */
+/*********************************************************************
+ A matcher matches either with a collection of substrings, or with a
+ regexp */
 
 typedef struct {
   regex_t preg;
@@ -223,11 +245,13 @@ void free_matcher(matcher_t *matcher) {
 void initialize_matcher(int use_regexp, int case_sensitive,
                         matcher_t *matcher, const char *pattern) {
   const char *s;
-  char *t;
+  char *t, *last_pattern_start;
+  int n;
 
   if(use_regexp) {
     matcher->nb_patterns = -1;
-    matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE);
+    matcher->regexp_error = regcomp(&matcher->preg, pattern,
+                                    case_sensitive ? 0 : REG_ICASE);
   } else {
     matcher->regexp_error = 0;
     matcher->nb_patterns = 1;
@@ -239,13 +263,16 @@ void initialize_matcher(int use_regexp, int case_sensitive,
       }
     }
 
-    matcher->splitted_patterns = (char *) malloc((strlen(pattern) + 1) * sizeof(char));
-    matcher->patterns = (char **) malloc(matcher->nb_patterns * sizeof(char *));
+    matcher->splitted_patterns =
+      (char *) malloc((strlen(pattern) + 1) * sizeof(char));
+
+    matcher->patterns =
+      (char **) malloc(matcher->nb_patterns * sizeof(char *));
 
     strcpy(matcher->splitted_patterns, pattern);
 
-    int n = 0;
-    char *last_pattern_start = matcher->splitted_patterns;
+    n = 0;
+    last_pattern_start = matcher->splitted_patterns;
     for(t = matcher->splitted_patterns; n < matcher->nb_patterns; t++) {
       if(*t == pattern_separator || *t == '\0') {
         *t = '\0';
@@ -256,13 +283,13 @@ void initialize_matcher(int use_regexp, int case_sensitive,
   }
 }
 
-/*********************************************************************/
-/* Buffer edition */
+/*********************************************************************
+ Buffer edition */
 
 void delete_char(char *buffer, int *position) {
   if(buffer[*position]) {
     int c = *position;
-    while(c < buffer_size && buffer[c]) {
+    while(c < BUFFER_SIZE && buffer[c]) {
       buffer[c] = buffer[c+1];
       c++;
     }
@@ -286,7 +313,7 @@ void backspace_char(char *buffer, int *position) {
 }
 
 void insert_char(char *buffer, int *position, char character) {
-  if(strlen(buffer) < buffer_size - 1) {
+  if(strlen(buffer) < BUFFER_SIZE - 1) {
     int c = *position;
     char t = buffer[c], u;
     while(t) {
@@ -317,13 +344,15 @@ 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, int nb_lines, char **lines,
+                     matcher_t *matcher) {
   int line = current_line - 1;
   while(line >= 0 && !match(lines[line], matcher)) line--;
   return line;
 }
 
-int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) {
+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++;
 
@@ -335,15 +364,14 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche
 
 /*********************************************************************/
 
-/* The value passed to this routine in current_focus_line is the index
-   of the line we should have highlighted if there was no motion and if
-   it matched the matcher. So, the line actually highlighted is the
-   first one matching the matcher in that order: (1)
-   current_focus_line after motion, (2) the first with a greater
-   index, (3) the first with a lesser index.
+/* The line highlighted is the first one matching the matcher in that
+   order: (1) current_focus_line after motion, if it does not match,
+   then (2) the first with a greater index, if none matches, then (3)
+   the first with a lesser index.
 
    The index of the line actually shown highlighted is written in
-   displayed_focus_line (it can be -1)
+   displayed_focus_line (it can be -1 if no line at all matches the
+   matcher)
 
    If there is a motion and a line is actually shown highlighted, its
    value is written in current_focus_line. */
@@ -354,35 +382,44 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
                    int cursor_position,
                    char *pattern) {
 
-  char buffer[buffer_size];
+  char buffer[BUFFER_SIZE];
   matcher_t matcher;
   int k, l, m;
+  int console_width, console_height;
+  int nb_printed_lines = 0;
+  int cursor_x;
 
   initialize_matcher(use_regexp, case_sensitive, &matcher, pattern);
 
-  int console_width = getmaxx(stdscr);
-  int console_height = getmaxy(stdscr);
-
-  /* First, we find a visible line. */
-
-  int nb_printed_lines = 0;
+  console_width = getmaxx(stdscr);
+  console_height = getmaxy(stdscr);
 
   use_default_colors();
 
+  /* Add an empty line where we will print the modeline at the end */
+
   addstr("\n");
 
+  /* If the regexp is erroneous, print a message saying so */
+
   if(matcher.regexp_error) {
     attron(attr_error);
     addnstr("Regexp syntax error", console_width);
     attroff(attr_error);
-  } else if(nb_lines > 0) {
+  }
+
+  /* Else, and we do have lines to select from, find a visible line. */
+
+  else if(nb_lines > 0) {
     int new_focus_line;
     if(match(lines[*current_focus_line], &matcher)) {
       new_focus_line = *current_focus_line;
     } else {
-      new_focus_line = next_visible(*current_focus_line, nb_lines, lines, &matcher);
+      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, nb_lines, lines,
+                                          &matcher);
       }
     }
 
@@ -409,17 +446,20 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
       }
     }
 
-    /* Here new_focus_line is either a line number matching the pattern, or -1 */
+    /* Here new_focus_line is either a line number matching the
+       pattern, or -1 */
 
     if(new_focus_line >= 0) {
 
-      int first_line = new_focus_line, last_line = new_focus_line, nb_match = 1;
+      int first_line = new_focus_line, last_line = new_focus_line;
+      int nb_match = 1;
 
       /* We find the first and last line to show, so that the total of
          visible lines between them (them included) is
          console_height-1 */
 
-      while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) {
+      while(nb_match < console_height-1 &&
+            (first_line > 0 || last_line < nb_lines - 1)) {
 
         if(first_line > 0) {
           first_line--;
@@ -449,7 +489,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
         if(match(lines[l], &matcher)) {
           int k = 0;
 
-          while(lines[l][k] && k < buffer_size - 2 && k < console_width - 2) {
+          while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) {
             buffer[k] = lines[l][k];
             k++;
           }
@@ -497,7 +537,11 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
       addnstr("No selection", console_width);
       attroff(attr_error);
     }
-  } else {
+  }
+
+  /* Else, print a message saying that there are no lines to select from */
+
+  else {
     attron(attr_error);
     addnstr("Empty choice", console_width);
     attroff(attr_error);
@@ -520,7 +564,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
   /* There must be a more elegant way of moving the cursor at a
      location met during display */
 
-  int cursor_x = 0;
+  cursor_x = 0;
 
   if(title) {
     addstr(title);
@@ -541,6 +585,9 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
     addstr(" ");
   }
 
+  /* Add a few info about the mode we are in (regexp and/or case
+     sensitive) */
+
   if(use_regexp || case_sensitive) {
     addstr(" [");
     if(use_regexp) {
@@ -568,25 +615,77 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
 /*********************************************************************/
 
-void read_file(const char *input_filename,
-               int nb_lines_max, int *nb_lines, char **lines,
-               int hash_table_size, int *hash_table) {
+void store_line(hash_table_t *hash_table,
+                const char *new_line,
+                int *nb_lines, char **lines) {
+  int dup;
+
+  /* Remove the zsh history prefix */
+
+  if(zsh_history && *new_line == ':') {
+    while(*new_line && *new_line != ';') new_line++;
+    if(*new_line == ';') new_line++;
+  }
+
+  /* Remove the bash history prefix */
+
+  if(bash_history) {
+    while(*new_line == ' ') new_line++;
+    while(*new_line >= '0' && *new_line <= '9') new_line++;
+    while(*new_line == ' ') new_line++;
+  }
+
+  /* Check for duplicates with the hash table and insert the line in
+     the list if necessary */
+
+  if(hash_table) {
+    dup = add_and_get_previous_index(hash_table,
+                                     new_line, *nb_lines, lines);
+  } else {
+    dup = -1;
+  }
+
+  if(dup < 0) {
+    lines[*nb_lines] = (char *) malloc((strlen(new_line) + 1) * sizeof(char));
+    strcpy(lines[*nb_lines], new_line);
+  } else {
+    /* The string was already in there, so we do not allocate a new
+       string but use the pointer to the first occurence of it */
+    lines[*nb_lines] = lines[dup];
+    lines[dup] = 0;
+  }
+
+  (*nb_lines)++;
+}
+
+void read_file(hash_table_t *hash_table,
+               const char *input_filename,
+               int nb_lines_max, int *nb_lines, char **lines) {
 
-  char raw_line[buffer_size];
+  char raw_line[BUFFER_SIZE];
+  int start, end, eol, k;
+  FILE *file;
 
-  FILE *file = fopen(input_filename, "r");
+  file = fopen(input_filename, "r");
 
   if(!file) {
-    fprintf(stderr, "Can not open `%s'.\n", input_filename);
+    fprintf(stderr, "Selector: Can not open `%s'.\n", input_filename);
     exit(1);
   }
 
-  int start = 0, end = 0, k;
+  start = 0;
+  end = 0;
 
   while(*nb_lines < nb_lines_max && (end > start || !feof(file))) {
-    int eol = start;
+    eol = start;
+
+    /* Look for the end of a line in what is already in the buffer */
     while(eol < end && raw_line[eol] != '\n') eol++;
 
+    /* if we did not find the of a line, move what has not been
+       processed and is in the buffer to the beginning of the buffer,
+       fill the buffer with new data from the file, and look for the
+       end of a line */
     if(eol == end) {
       for(k = 0; k < end - start; k++) {
         raw_line[k] = raw_line[k + start];
@@ -594,81 +693,61 @@ void read_file(const char *input_filename,
       end -= start;
       eol -= start;
       start = 0;
-      end += fread(raw_line + end, sizeof(char), buffer_size - end, file);
+      end += fread(raw_line + end, sizeof(char), BUFFER_SIZE - end, file);
       while(eol < end && raw_line[eol] != '\n') eol++;
     }
 
-    if(eol == buffer_size) {
-      raw_line[buffer_size - 1] = '\0';
-      fprintf(stderr, "Line too long:\n");
+    /* The end of the line is the buffer size, which means the line is
+       too long */
+
+    if(eol == BUFFER_SIZE) {
+      raw_line[BUFFER_SIZE - 1] = '\0';
+      fprintf(stderr, "Selector: Line too long (max is %d characters):\n",
+              BUFFER_SIZE);
       fprintf(stderr, raw_line);
       fprintf(stderr, "\n");
       exit(1);
     }
 
-    raw_line[eol] = '\0';
-
-    char *t = raw_line + start;
-
-    /* Remove the zsh history prefix */
-
-    if(zsh_history && *t == ':') {
-      while(*t && *t != ';') t++;
-      if(*t == ';') t++;
-    }
-
-    /* Remove the bash history prefix */
-
-    if(bash_history) {
-      while(*t == ' ') t++;
-      while(*t >= '0' && *t <= '9') t++;
-      while(*t == ' ') t++;
-    }
-
-    /* Check for duplicates with the hash table and insert the line in
-       the list if necessary */
-
-    int dup;
-
-    if(hash_table) {
-      dup = test_and_add(t, *nb_lines, lines, hash_table, hash_table_size);
-    } else {
-      dup = -1;
-    }
+    /* If we got a line, we replace the carriage return by a \0 to
+       finish the string */
 
-    if(dup < 0) {
-      lines[*nb_lines] = (char *) malloc((strlen(t) + 1) * sizeof(char));
-      strcpy(lines[*nb_lines], t);
-    } else {
-      /* The string was already in there, so we do not allocate a new
-         string but use the pointer to the first occurence of it */
-      lines[*nb_lines] = lines[dup];
-      lines[dup] = 0;
-    }
+    raw_line[eol] = '\0';
 
-    (*nb_lines)++;
+    store_line(hash_table, raw_line + start,
+               nb_lines, lines);
 
     start = eol + 1;
   }
+
+  fclose(file);
 }
 
 /*********************************************************************/
 
 int main(int argc, char **argv) {
 
-  if(!ttyname(STDIN_FILENO)) {
-    fprintf(stderr, "The standard input is not a tty.\n");
-    exit(1);
-  }
-
-  char input_filename[buffer_size], output_filename[buffer_size];
+  char input_filename[BUFFER_SIZE], output_filename[BUFFER_SIZE];
+  char pattern[BUFFER_SIZE];
   int i, k, l, n;
+  int cursor_position;
   int error = 0, show_help = 0;
   int rest_are_files = 0;
+  int key;
+  int current_focus_line, displayed_focus_line;
 
   int color_fg_modeline, color_bg_modeline;
   int color_fg_highlight, color_bg_highlight;
 
+  char **lines, **labels;
+  int nb_lines;
+  hash_table_t *hash_table;
+
+  if(!ttyname(STDIN_FILENO)) {
+    fprintf(stderr, "Selector: The standard input is not a tty.\n");
+    exit(1);
+  }
+
   color_fg_modeline  = COLOR_WHITE;
   color_bg_modeline  = COLOR_BLACK;
   color_fg_highlight = COLOR_BLACK;
@@ -680,11 +759,14 @@ int main(int argc, char **argv) {
   strcpy(output_filename, "");
 
   i = 1;
-  while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) {
+
+  while(!error && !show_help &&
+        i < argc && argv[i][0] == '-' &&
+        !rest_are_files) {
 
     if(strcmp(argv[i], "-o") == 0) {
       check_opt(argc, argv, i, 1, "<output filename>");
-      strncpy(output_filename, argv[i+1], buffer_size);
+      strncpy(output_filename, argv[i+1], BUFFER_SIZE);
       i += 2;
     }
 
@@ -722,7 +804,7 @@ int main(int argc, char **argv) {
 
     else if(strcmp(argv[i], "-f") == 0) {
       check_opt(argc, argv, i, 1, "<input filename>");
-      strncpy(input_filename, argv[i+1], buffer_size);
+      strncpy(input_filename, argv[i+1], BUFFER_SIZE);
       i += 2;
     }
 
@@ -771,7 +853,8 @@ int main(int argc, char **argv) {
     }
 
     else if(strcmp(argv[i], "-c") == 0) {
-      check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
+      check_opt(argc, argv, i, 4,
+                "<fg modeline> <bg modeline> <fg highlight> <bg highlight>");
       color_fg_modeline = string_to_positive_integer(argv[i + 1]);
       color_bg_modeline = string_to_positive_integer(argv[i + 2]);
       color_fg_highlight = string_to_positive_integer(argv[i + 3]);
@@ -790,68 +873,79 @@ int main(int argc, char **argv) {
     }
 
     else {
-      fprintf(stderr, "Unknown option %s.\n", argv[i]);
+      fprintf(stderr, "Selector: Unknown option %s.\n", argv[i]);
       error = 1;
     }
   }
 
   if(show_help || error) {
-    fprintf(stderr, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER);
-    fprintf(stderr, "Written by Francois Fleuret <francois@fleuret.org>.\n");
-    fprintf(stderr, "Usage: %s [options] [<filename1> [<filename2> ...]]\n", argv[0]);
-    fprintf(stderr, "\n");
-    fprintf(stderr, " -h      show this help\n");
-    fprintf(stderr, " -v      inject the selected line in the tty\n");
-    fprintf(stderr, " -w      quote control characters with ^Qs when using -v\n");
-    fprintf(stderr, " -d      remove duplicated lines\n");
-    fprintf(stderr, " -b      remove the bash history line prefix\n");
-    fprintf(stderr, " -z      remove the zsh history line prefix\n");
-    fprintf(stderr, " -i      invert the order of lines\n");
-    fprintf(stderr, " -e      start in regexp mode\n");
-    fprintf(stderr, " -a      start in case sensitive mode\n");
-    fprintf(stderr, " -m      monochrome mode\n");
-    fprintf(stderr, " -q      make a flash instead of a beep on an edition error\n");
-    fprintf(stderr, " --      all following arguments are filenames\n");
-    fprintf(stderr, " -t <title>\n");
-    fprintf(stderr, "         add a title in the modeline\n");
-    fprintf(stderr, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n");
-    fprintf(stderr, "         set the display colors\n");
-    fprintf(stderr, " -o <output filename>\n");
-    fprintf(stderr, "         set a file to write the selected line to\n");
-    fprintf(stderr, " -s <pattern separator>\n");
-    fprintf(stderr, "         set the symbol to separate substrings in the pattern\n");
-    fprintf(stderr, " -x <label separator>\n");
-    fprintf(stderr, "         set the symbol to terminate the label\n");
-    fprintf(stderr, " -l <max number of lines>\n");
-    fprintf(stderr, "         set the maximum number of lines to take into account\n");
-    fprintf(stderr, "\n");
+    FILE *out;
+    if(show_help) {
+      out = stdout;
+    } else {
+      out = stderr;
+    }
+
+    fprintf(out, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER);
+    fprintf(out, "Written by Francois Fleuret <francois@fleuret.org>.\n");
+    fprintf(out, "\n");
+    fprintf(out, "Usage: %s [options] [<filename1> [<filename2> ...]]\n",
+            argv[0]);
+    fprintf(out, "\n");
+    fprintf(out, " -h      show this help\n");
+    fprintf(out, " -v      inject the selected line in the tty\n");
+    fprintf(out, " -w      quote control characters with ^Qs when using -v\n");
+    fprintf(out, " -d      remove duplicated lines\n");
+    fprintf(out, " -b      remove the bash history line prefix\n");
+    fprintf(out, " -z      remove the zsh history line prefix\n");
+    fprintf(out, " -i      invert the order of lines\n");
+    fprintf(out, " -e      start in regexp mode\n");
+    fprintf(out, " -a      start in case sensitive mode\n");
+    fprintf(out, " -m      monochrome mode\n");
+    fprintf(out, " -q      make a flash instead of a beep on an edition error\n");
+    fprintf(out, " --      all following arguments are filenames\n");
+    fprintf(out, " -t <title>\n");
+    fprintf(out, "         add a title in the modeline\n");
+    fprintf(out, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n");
+    fprintf(out, "         set the display colors\n");
+    fprintf(out, " -o <output filename>\n");
+    fprintf(out, "         set a file to write the selected line to\n");
+    fprintf(out, " -s <pattern separator>\n");
+    fprintf(out, "         set the symbol to separate substrings in the pattern\n");
+    fprintf(out, " -x <label separator>\n");
+    fprintf(out, "         set the symbol to terminate the label\n");
+    fprintf(out, " -l <max number of lines>\n");
+    fprintf(out, "         set the maximum number of lines to take into account\n");
+    fprintf(out, "\n");
     exit(error);
   }
 
-  char **lines = (char **) malloc(nb_lines_max * sizeof(char *));
+  lines = (char **) malloc(nb_lines_max * sizeof(char *));
 
-  int nb_lines = 0;
-  int hash_table_size = nb_lines_max * 10;
-  int *hash_table = 0;
+  nb_lines = 0;
 
   if(remove_duplicates) {
-    hash_table = new_hash_table(hash_table_size);
+    hash_table = new_hash_table(nb_lines_max * 10);
+  } else {
+    hash_table = 0;
   }
 
   if(input_filename[0]) {
-    read_file(input_filename,
-              nb_lines_max, &nb_lines, lines,
-              hash_table_size, hash_table);
+    read_file(hash_table,
+              input_filename,
+              nb_lines_max, &nb_lines, lines);
   }
 
   while(i < argc) {
-    read_file(argv[i],
-              nb_lines_max, &nb_lines, lines,
-              hash_table_size, hash_table);
+    read_file(hash_table,
+              argv[i],
+              nb_lines_max, &nb_lines, lines);
     i++;
   }
 
-  free(hash_table);
+  if(hash_table) {
+    free_hash_table(hash_table);
+  }
 
   /* Now remove the null strings */
 
@@ -876,16 +970,19 @@ int main(int argc, char **argv) {
      label_separator and transform control characters to printable
      ones */
 
-  char **labels = (char **) malloc(nb_lines * sizeof(char *));
+  labels = (char **) malloc(nb_lines * sizeof(char *));
+
   for(l = 0; l < nb_lines; l++) {
     char *s, *t;
+    int e = 0;
     const char *u;
     t = lines[l];
-    int e = 0;
+
     while(*t && *t != label_separator) {
       u = unctrl(*t++);
       e += strlen(u);
     }
+
     labels[l] = (char *) malloc((e + 1) * sizeof(char));
     t = lines[l];
     s = labels[l];
@@ -896,10 +993,8 @@ int main(int argc, char **argv) {
     *s = '\0';
   }
 
-  char pattern[buffer_size];
   pattern[0] = '\0';
 
-  int cursor_position;
   cursor_position = 0;
 
   /* Here we start to display with curse */
@@ -927,7 +1022,8 @@ int main(int argc, char **argv) {
        color_bg_highlight < 0 || color_bg_highlight >= COLORS) {
       echo();
       endwin();
-      fprintf(stderr, "Color numbers have to be between 0 and %d.\n", COLORS - 1);
+      fprintf(stderr, "Selector: Color numbers have to be between 0 and %d.\n",
+              COLORS - 1);
       exit(1);
     }
 
@@ -942,19 +1038,18 @@ int main(int argc, char **argv) {
 
   }
 
-  int key;
-  int current_focus_line = 0, displayed_focus_line = 0;
+  current_focus_line = 0;
+  displayed_focus_line = 0;
 
   update_screen(&current_focus_line, &displayed_focus_line,
                 0,
                 nb_lines, labels, cursor_position, pattern);
 
   do {
+    int motion = 0;
 
     key = getch();
 
-    int motion = 0;
-
     if(key >= ' ' && key <= '~') { /* Insert character */
       insert_char(pattern, &cursor_position, key);
     }
@@ -1049,7 +1144,7 @@ int main(int argc, char **argv) {
   echo();
   endwin();
 
-/* Here we come back to standard display */
+  /* Here we come back to standard display */
 
   if((key == KEY_ENTER || key == '\n')) {
 
@@ -1077,7 +1172,9 @@ int main(int argc, char **argv) {
         }
         fprintf(out, "\n");
       } else {
-        fprintf(stderr, "Can not open %s for writing.\n", output_filename);
+        fprintf(stderr,
+                "Selector: Can not open %s for writing.\n",
+                output_filename);
         exit(1);
       }
       fclose(out);