X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=fa0589c331b7b9879154671a05065cd5e28e8459;hb=b39a1e12a6cdb06d518c99ea96adebbbaddf5193;hp=746e2f01a28053869d9c4ca251ec53d9d7e917f1;hpb=fb0759ace1206981d3718e7b5f743737dd788a53;p=selector.git

diff --git a/selector.c b/selector.c
index 746e2f0..fa0589c 100644
--- a/selector.c
+++ b/selector.c
@@ -35,14 +35,16 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#include <errno.h>
 #include <ncurses.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <termios.h>
 #include <regex.h>
 #include <locale.h>
+#include <getopt.h>
 
-#define VERSION "1.0"
+#define VERSION "1.0.1"
 
 #define BUFFER_SIZE 4096
 
@@ -65,6 +67,19 @@ int error_flash = 0;
 
 int attr_modeline, attr_focus_line, attr_error;
 
+/********************************************************************/
+
+/* malloc with error checking.  */
+
+void *safe_malloc(size_t n) {
+  void *p = malloc(n);
+  if (!p && n != 0) {
+    printf("Can not allocate memory: %s\n", strerror(errno));
+    exit(EXIT_FAILURE);
+  }
+  return p;
+}
+
 /*********************************************************************/
 
 void inject_into_tty_buffer(char *string, int add_control_qs) {
@@ -102,8 +117,9 @@ int string_to_positive_integer(char *string) {
   int result = 0;
   char *s;
 
+  printf("string_to_positive_integer string=\"%s\"\n", string);
   if(*string) {
-    for(s = string; *s; s++) {
+    for(s = string; *s && *s != ','; s++) {
       if(*s >= '0' && *s <= '9') {
         result = result * 10 + (int) (*s - '0');
       } else error = 1;
@@ -128,6 +144,40 @@ void error_feedback() {
   }
 }
 
+void print_help(FILE *out) {
+
+  fprintf(out, "Selector version %s (%s)\n", VERSION, UNAME);
+  fprintf(out, "Written by Francois Fleuret <francois@fleuret.org>.\n");
+  fprintf(out, "\n");
+  fprintf(out, "Usage: selector [options] [<filename1> [<filename2> ...]]\n");
+  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");
+}
+
 /*********************************************************************/
 
 /* A quick and dirty hash table */
@@ -145,10 +195,10 @@ struct hash_table_t *new_hash_table(int size) {
   int k;
   struct hash_table_t *hash_table;
 
-  hash_table = (struct hash_table_t *) malloc(sizeof(struct hash_table_t));
+  hash_table = safe_malloc(sizeof(struct hash_table_t));
 
   hash_table->size = size;
-  hash_table->entries = (int *) malloc(hash_table->size * sizeof(int));
+  hash_table->entries = safe_malloc(hash_table->size * sizeof(int));
 
   for(k = 0; k < hash_table->size; k++) {
     hash_table->entries[k] = -1;
@@ -266,10 +316,10 @@ void initialize_matcher(int use_regexp, int case_sensitive,
     }
 
     matcher->splitted_patterns =
-      (char *) malloc((strlen(pattern) + 1) * sizeof(char));
+      safe_malloc((strlen(pattern) + 1) * sizeof(char));
 
     matcher->patterns =
-      (char **) malloc(matcher->nb_patterns * sizeof(char *));
+      safe_malloc(matcher->nb_patterns * sizeof(char *));
 
     strcpy(matcher->splitted_patterns, pattern);
 
@@ -648,7 +698,7 @@ void store_line(struct hash_table_t *hash_table,
   }
 
   if(dup < 0) {
-    lines[*nb_lines] = (char *) malloc((strlen(new_line) + 1) * sizeof(char));
+    lines[*nb_lines] = safe_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
@@ -727,11 +777,35 @@ void read_file(struct hash_table_t *hash_table,
 
 /*********************************************************************/
 
+static struct option long_options[] = {
+  { "output-file", 1, 0, 'o' },
+  { "pattern-separator", 1, 0, 's' },
+  { "label-separator", 1, 0, 'x' },
+  { "inject-in-tty", no_argument, 0, 'v' },
+  { "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' },
+  { "remove-duplicates", no_argument, 0, 'd' },
+  { "regexp", no_argument, 0, 'e' },
+  { "case-sensitive", no_argument, 0, 'a' },
+  { "title", 1, 0, 't' },
+  { "number-of-lines", 1, 0, 'l' },
+  { "colors", 1, 0, 'c' },
+  { "rest-are-files", no_argument, 0, '-' },
+  { "help", no_argument, 0, 'h' },
+  { 0, 0, 0, 0 }
+};
+
 int main(int argc, char **argv) {
 
   char input_filename[BUFFER_SIZE], output_filename[BUFFER_SIZE];
+  char c, *s;
   char pattern[BUFFER_SIZE];
-  int i, k, l, n;
+  int k, l, n;
   int cursor_position;
   int error = 0, show_help = 0;
   int rest_are_files = 0;
@@ -760,169 +834,114 @@ int main(int argc, char **argv) {
   strcpy(input_filename, "");
   strcpy(output_filename, "");
 
-  i = 1;
+  while (!rest_are_files &&
+         (c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeat:l:c:-h",
+                          long_options, NULL)) != -1) {
 
-  while(!error && !show_help &&
-        i < argc &&
-        argv[i][0] == '-' && !rest_are_files) {
+    switch(c) {
 
-    if(strcmp(argv[i], "-o") == 0) {
-      check_opt(argc, argv, i, 1, "<output filename>");
-      strncpy(output_filename, argv[i+1], BUFFER_SIZE);
-      i += 2;
-    }
+    case 'o':
+      strncpy(output_filename, optarg, BUFFER_SIZE);
+      break;
 
-    else if(strcmp(argv[i], "-s") == 0) {
-      check_opt(argc, argv, i, 1, "<pattern separator>");
-      pattern_separator = argv[i+1][0];
-      i += 2;
-    }
+    case 's':
+      pattern_separator = optarg[0];
+      break;
 
-    else if(strcmp(argv[i], "-x") == 0) {
-      check_opt(argc, argv, i, 1, "<label separator>");
-      label_separator = argv[i+1][0];
-      i += 2;
-    }
+    case 'x':
+      label_separator = optarg[0];
+      break;
 
-    else if(strcmp(argv[i], "-v") == 0) {
+    case 'v':
       output_to_vt_buffer = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-w") == 0) {
+    case 'w':
       add_control_qs = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-m") == 0) {
+    case 'm':
       with_colors = 0;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-q") == 0) {
+    case 'q':
       error_flash = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-f") == 0) {
-      check_opt(argc, argv, i, 1, "<input filename>");
-      strncpy(input_filename, argv[i+1], BUFFER_SIZE);
-      i += 2;
-    }
+    case 'f':
+      strncpy(input_filename, optarg, BUFFER_SIZE);
+      break;
 
-    else if(strcmp(argv[i], "-i") == 0) {
+    case 'i':
       inverse_order = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-b") == 0) {
+    case 'b':
       bash_history = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-z") == 0) {
+    case 'z':
       zsh_history = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-d") == 0) {
+    case 'd':
       remove_duplicates = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-e") == 0) {
+    case 'e':
       use_regexp = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-a") == 0) {
+    case 'a':
       case_sensitive = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-t") == 0) {
-      check_opt(argc, argv, i, 1, "<title>");
+    case 't':
       free(title);
-      title = (char *) malloc((strlen(argv[i+1]) + 1) * sizeof(char));
-      strcpy(title, argv[i+1]);
-      i += 2;
-    }
-
-    else if(strcmp(argv[i], "-l") == 0) {
-      check_opt(argc, argv, i, 1, "<maximum number of lines>");
-      nb_lines_max = string_to_positive_integer(argv[i+1]);
-      i += 2;
-    }
-
-    else if(strcmp(argv[i], "-c") == 0) {
-      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]);
-      color_bg_highlight = string_to_positive_integer(argv[i + 4]);
-      i += 5;
-    }
-
-    else if(strcmp(argv[i], "--") == 0) {
+      title = safe_malloc((strlen(optarg) + 1) * sizeof(char));
+      strcpy(title, optarg);
+      break;
+
+    case 'l':
+      nb_lines_max = string_to_positive_integer(optarg);
+      break;
+
+    case 'c':
+      s = optarg;
+      color_fg_modeline = string_to_positive_integer(s);
+      while(*s && *s != ',') s++; if(*s == ',') { s++; }
+      color_bg_modeline = string_to_positive_integer(s);
+      while(*s && *s != ',') s++; if(*s == ',') { s++; }
+      color_fg_highlight = string_to_positive_integer(s);
+      while(*s && *s != ',') s++; if(*s == ',') { s++; }
+      color_bg_highlight = string_to_positive_integer(s);
+      break;
+
+    case '-':
       rest_are_files = 1;
-      i++;
-    }
+      break;
 
-    else if(strcmp(argv[i], "-h") == 0) {
+    case 'h':
       show_help = 1;
-      i++;
-    }
+      break;
 
-    else {
-      fprintf(stderr, "Selector: Unknown option %s.\n", argv[i]);
+    default:
       error = 1;
+      break;
     }
   }
 
   if(show_help || error) {
-    FILE *out;
-    if(show_help) {
-      out = stdout;
+    if(error) {
+      print_help(stderr);
+      exit(EXIT_FAILURE);
     } else {
-      out = stderr;
+      print_help(stdout);
+      exit(EXIT_SUCCESS);
     }
-
-    fprintf(out, "Selector version %s-R%s (%s)\n", VERSION, REVISION_NUMBER, UNAME);
-    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);
   }
 
-  lines = (char **) malloc(nb_lines_max * sizeof(char *));
+  lines = safe_malloc(nb_lines_max * sizeof(char *));
 
   nb_lines = 0;
 
@@ -938,11 +957,11 @@ int main(int argc, char **argv) {
               nb_lines_max, &nb_lines, lines);
   }
 
-  while(i < argc) {
+  while(optind < argc) {
     read_file(hash_table,
-              argv[i],
+              argv[optind],
               nb_lines_max, &nb_lines, lines);
-    i++;
+    optind++;
   }
 
   if(hash_table) {
@@ -961,10 +980,10 @@ int main(int argc, char **argv) {
   nb_lines = n;
 
   if(inverse_order) {
-    for(i = 0; i < nb_lines / 2; i++) {
-      char *s = lines[nb_lines - 1 - i];
-      lines[nb_lines - 1 - i] = lines[i];
-      lines[i] = s;
+    for(l = 0; l < nb_lines / 2; l++) {
+      char *s = lines[nb_lines - 1 - l];
+      lines[nb_lines - 1 - l] = lines[l];
+      lines[l] = s;
     }
   }
 
@@ -972,7 +991,7 @@ int main(int argc, char **argv) {
      label_separator and transform control characters to printable
      ones */
 
-  labels = (char **) malloc(nb_lines * sizeof(char *));
+  labels = safe_malloc(nb_lines * sizeof(char *));
 
   for(l = 0; l < nb_lines; l++) {
     char *s, *t;
@@ -985,7 +1004,7 @@ int main(int argc, char **argv) {
       e += strlen(u);
     }
 
-    labels[l] = (char *) malloc((e + 1) * sizeof(char));
+    labels[l] = safe_malloc((e + 1) * sizeof(char));
     t = lines[l];
     s = labels[l];
     while(*t && *t != label_separator) {