From: Francois Fleuret <francois@fleuret.org>
Date: Mon, 2 Jul 2012 16:49:50 +0000 (+0200)
Subject: Using the label separator \n indicates that labels and strings to return are on alter... 
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=ca3e09ab0e4ffc59ba170094421571ada871adbb;p=selector.git

Using the label separator \n indicates that labels and strings to return are on alternating lines.
---

diff --git a/selector.1 b/selector.1
index 17e867f..5b54665 100644
--- a/selector.1
+++ b/selector.1
@@ -140,7 +140,8 @@ specify the character to separate the substrings in the search pattern
 .TP
 \fB-x \fI<separator>\fR, \fB--label-separator \fI<separator>\fR
 specify the character to separate what to show to the user during the
-selection from the line to return
+selection from the line to return. If the provided separator is "\\n",
+the lines to show to the user alternate with the lines to return
 .TP
 \fB-l \fI<number>\fR, \fB--number-of-lines \fI<number>\fR
 specify the maximum number of lines to take into account
@@ -152,15 +153,13 @@ To use selector to search into your bash history
 .B selector -q --bash <(history)
 
 To show a list of directories and insert a cd command to the selected
-one (using @ as a separator)
+one
 
-.B selector -v -x @ <(find . -type d | awk \(aq{print $0\(dq@cd \(dq$0}\(aq)
+.B selector -v -x \(dq\\\\n\(dq <(find . -type d | awk \(aq{print $0\(dq\\\\ncd \(dq$0}\(aq)
 
-To select a line in a long text and returns the line number (this
-command uses ^A as a separator, hence there will be problems if the
-file contains ^A)
+To select a line in a long text and returns the line number
 
-.B selector -v -x ^A <(awk < something.txt \(aq{ print $0\(dq^A\(dqNR }\(aq)
+.B selector -v -x \(dq\\\\n\(dq <(awk < something.txt \(aq{ print $0\(dq\\\\n\(dqNR }\(aq)
 
 .SH "BUGS"
 
diff --git a/selector.c b/selector.c
index aafaf9d..77ab603 100644
--- a/selector.c
+++ b/selector.c
@@ -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! */
 
@@ -216,7 +216,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,6 +924,7 @@ 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");
 
@@ -931,11 +933,22 @@ void read_file(struct hash_table_t *hash_table,
     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 +1038,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':