Changed the help for the -j option.

[selector.git] / selector.c

diff --git a/selector.c b/selector.c
index 81286d6..24ad55d 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 Francois Fleuret
+ *  Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret
  *  Written by Francois Fleuret <francois@fleuret.org>
  *
  *  This file is part of selector.
@@ -45,7 +45,7 @@
 #include <getopt.h>
 #include <limits.h>
 
-#define VERSION "1.1.5"
+#define VERSION "1.1.6"
 
 #define BUFFER_SIZE 4096
 
@@ -191,7 +191,7 @@ void usage(FILE *out) {
   fprintf(out, " -a, --case-sensitive\n");
   fprintf(out, "         start in case sensitive mode\n");
   fprintf(out, " -j, --show-long-lines\n");
-  fprintf(out, "         print three dots at the end of truncated lines\n");
+  fprintf(out, "         print a long-line indicator at the end of truncated lines\n");
   fprintf(out, " -y, --show-hits\n");
   fprintf(out, "         highlight the matching substrings\n");
   fprintf(out, " -u, --upper-case-makes-case-sensitive\n");
@@ -320,8 +320,9 @@ struct matcher {
 };
 
 /* Routine to add an interval to a sorted list of intervals
-   extermities. Returns the number of extremities. This is an effing
-   nightmare */
+   extremities. Returns the resulting number of extremities.
+
+   This routine is an effing nightmare */
 
 int add_interval(int n, int *switches, int start, int end) {
   int f, g, k;
@@ -334,8 +335,8 @@ int add_interval(int n, int *switches, int start, int end) {
   while(g < n && switches[g] <= end) { g++; }
 
   if(f == n) {
-    /* switches[n]   start  end  */
-    /* XXXXXXXXXX|               */
+    /* switches[n-1]   start  end  */
+    /* XXXXXXXXXXXX|               */
     switches[f] = start;
     switches[f+1] = end;
     return n + 2;
@@ -410,38 +411,22 @@ int match(struct matcher *matcher, char *string, int *nb_switches, int *switches
           *nb_switches = add_interval(*nb_switches, switches,
                                       (int) (where - string),
                                       (int) (where - string) + strlen(matcher->patterns[n]));
-          #warning CHECK THE INTERVALS
-          {
-            int k, i;
-            FILE *out = fopen("/tmp/intervals", "w");
-            for(k = 0; k < (*nb_switches)/2; k++) {
-              i = 0;
-              for(; i < switches[2 * k]; i++) fprintf(out, "-");
-              for(; i < switches[2 * k + 1]; i++) fprintf(out, "%c", string[i]);
-              for(; i < strlen(string); i++) fprintf(out, "-");
-              fprintf(out, "\n");
-            }
-            fclose(out);
-            for(k = 0; k < *nb_switches - 1; k++) {
-              if(switches[k] > switches[k+1]) {
-                abort();
-              }
-            }
-          }
         }
       }
     }
     return 1;
   } else {
-    if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) {
-      if(switches) {
+    if(switches) {
+      if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) {
         *nb_switches = 2;
         switches[0] = matches.rm_so;
         switches[1] = matches.rm_eo;
+        return 1;
+      } else {
+        return 0;
       }
-      return 1;
     } else {
-      return 0;
+      return regexec(&matcher->preg, string, 0, 0, 0) == 0;
     }
   }
 }
@@ -586,7 +571,6 @@ int next_visible(int current_line, int nb_lines, char **lines,
 /*********************************************************************/
 
 void print_string_with_switches(char *buffer, int line_width,
-                                int console_width,
                                 int nb_patterns, int *switches) {
   int w, current = 0, next;
   if(switches) {
@@ -605,10 +589,10 @@ void print_string_with_switches(char *buffer, int line_width,
       }
     }
     if(current < line_width) {
-      addnstr(buffer + current, console_width - current);
+      addnstr(buffer + current, line_width - current);
     }
   } else {
-    addnstr(buffer, console_width);
+    addnstr(buffer, line_width);
   }
 }
 
@@ -640,10 +624,14 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
   initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
 
-  if(show_hits && matcher.nb_patterns >= 0) {
-    switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+  if(show_hits) {
+    if(matcher.nb_patterns >= 0) {
+      switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+    } else {
+      switches = safe_malloc(sizeof(int) * 2);
+    }
   } else {
-    switches = safe_malloc(sizeof(int) * 2);
+    switches = 0;
   }
 
   console_width = getmaxx(stdscr);
@@ -752,36 +740,36 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
 
           if(l == new_focus_line) {
             if(show_long_lines && k >= console_width) {
-              if(console_width >= 4) {
-                buffer[console_width - 4] = ' ';
-                buffer[console_width - 3] = '.';
-                buffer[console_width - 2] = '.';
-                buffer[console_width - 1] = '.';
-              }
+              attron(attr_focus_line);
+              print_string_with_switches(buffer, console_width-1,
+                                         nb_switches / 2, switches);
+              /* attron(attr_error); */
+              addnstr("\\", 1);
+              /* attroff(attr_error); */
+              attroff(attr_focus_line);
             } else {
               while(k < console_width) {
                 buffer[k++] = ' ';
               }
+              attron(attr_focus_line);
+              print_string_with_switches(buffer, k,
+                                         nb_switches / 2, switches);
+              attroff(attr_focus_line);
             }
-            attron(attr_focus_line);
-            print_string_with_switches(buffer, k, console_width,
-                                       nb_switches / 2, switches);
-            attroff(attr_focus_line);
           } else {
             if(show_long_lines && k >= console_width) {
-              if(console_width >= 4) {
-                buffer[console_width - 4] = ' ';
-                buffer[console_width - 3] = '.';
-                buffer[console_width - 2] = '.';
-                buffer[console_width - 1] = '.';
-              }
+              print_string_with_switches(buffer, console_width-1,
+                                         nb_switches / 2, switches);
+              attron(attr_focus_line);
+              addnstr("\\", 1);
+              attroff(attr_focus_line);
             } else {
               buffer[k++] = '\n';
               buffer[k++] = '\0';
-            }
 
-            print_string_with_switches(buffer, k, console_width,
-                                       nb_switches / 2, switches);
+              print_string_with_switches(buffer, k,
+                                         nb_switches / 2, switches);
+            }
           }
 
           nb_printed_lines++;
@@ -974,6 +962,7 @@ static struct option long_options[] = {
   { "regexp", no_argument, 0, 'e' },
   { "case-sensitive", no_argument, 0, 'a' },
   { "show-long-lines", no_argument, 0, 'j'},
+  { "show-hits", no_argument, 0, 'j'},
   { "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
   { "title", 1, 0, 't' },
   { "number-of-lines", 1, 0, 'l' },