Cosmetics.

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index aafaf9d..afd5ce7 100644 (file)
--- a/selector.c
+++ b/selector.c
@@ -3,7 +3,7 @@
  *  selector is a simple command line utility for selection of strings
  *  with a dynamic pattern-matching.
  *
- *  Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret
+ *  Copyright (c) 2009-2013 Francois Fleuret
  *  Written by Francois Fleuret <francois@fleuret.org>
  *
  *  This file is part of selector.
@@ -45,9 +45,9 @@
 #include <getopt.h>
 #include <limits.h>
 
-#define VERSION "1.1.6"
+#define VERSION "1.1.7"
 
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 16384
 
 /* Yeah, global variables! */
 
@@ -79,7 +79,7 @@ void *safe_malloc(size_t n) {
   void *p = malloc(n);
   if(!p && n != 0) {
     fprintf(stderr,
-            "selector: can not allocate memory: %s\n", strerror(errno));
+            "selector: cannot allocate memory: %s\n", strerror(errno));
     exit(EXIT_FAILURE);
   }
   return p;
@@ -203,7 +203,8 @@ void usage(FILE *out) {
   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, " --      all following arguments are filenames\n");
+  fprintf(out, " --\n");
+  fprintf(out, "         all following arguments are filenames\n");
   fprintf(out, " -t <title>, --title <title>\n");
   fprintf(out, "         add a title in the modeline\n");
   fprintf(out, " -r <pattern>, --pattern <pattern>\n");
@@ -216,7 +217,8 @@ void usage(FILE *out) {
   fprintf(out, " -s <pattern separator>, --pattern-separator <pattern separator>\n");
   fprintf(out, "         set the symbol to separate substrings in the pattern\n");
   fprintf(out, " -x <label separator>, --label-separator <label separator>\n");
-  fprintf(out, "         set the symbol to terminate the label\n");
+  fprintf(out, "         set the character to separate the label to show from the\n");
+  fprintf(out, "         string to return\n");
   fprintf(out, " -l <max number of lines>, --number-of-lines <max number of lines>\n");
   fprintf(out, "         set the maximum number of lines to take into account\n");
   fprintf(out, "\n");
@@ -923,19 +925,31 @@ void read_file(struct hash_table_t *hash_table,
   char raw_line[BUFFER_SIZE];
   char *s;
   FILE *file;
+  int l;
 
   file = fopen(input_filename, "r");
 
   if(!file) {
-    fprintf(stderr, "selector: Can not open `%s'.\n", input_filename);
+    fprintf(stderr, "selector: Cannot open `%s'.\n", input_filename);
     exit(EXIT_FAILURE);
   }
 
-  while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
-    for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
-      *s = '\0';
+  if(label_separator == '\n') {
+    while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+      l = strlen(raw_line);
+      fgets(raw_line + l, BUFFER_SIZE - l, file);
+      for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+        *s = '\0';
+      }
+      store_line(hash_table, raw_line, nb_lines, lines);
+    }
+  } else {
+    while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+      for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+        *s = '\0';
+      }
+      store_line(hash_table, raw_line, nb_lines, lines);
     }
-    store_line(hash_table, raw_line, nb_lines, lines);
   }
 
   fclose(file);
@@ -1025,7 +1039,11 @@ int main(int argc, char **argv) {
       break;
 
     case 'x':
-      label_separator = optarg[0];
+      if(strcmp(optarg, "\\n") == 0) {
+        label_separator = '\n';
+      } else {
+        label_separator = optarg[0];
+      }
       break;
 
     case 'v':
@@ -1401,7 +1419,7 @@ int main(int argc, char **argv) {
         fprintf(out, "\n");
       } else {
         fprintf(stderr,
-                "selector: Can not open %s for writing.\n",
+                "selector: Cannot open %s for writing.\n",
                 output_filename);
         exit(EXIT_FAILURE);
       }