X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=7f64ebad916ffd831a5c8c590072250459953cb3;hb=a2e9ecbe63af0f7b4b84b1b2a81562714746bcdc;hp=e635029c32fb13d70ed01fdc1e50cf21ed9d31d0;hpb=a595f153fa69b0a4339ef71bcda42c1363a57687;p=selector.git

diff --git a/selector.c b/selector.c
index e635029..7f64eba 100644
--- 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 Francois Fleuret
+ *  Copyright (c) 2009, 2010, 2011 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.3"
+#define VERSION "1.1.4"
 
 #define BUFFER_SIZE 4096
 
@@ -66,6 +66,7 @@ int case_sensitive = 0;
 char *title = 0;
 int error_flash = 0;
 int exclamation_negates = 0;
+int upper_caps_makes_case_sensitive = 0;
 
 int attr_modeline, attr_focus_line, attr_error;
 
@@ -75,8 +76,9 @@ int attr_modeline, attr_focus_line, attr_error;
 
 void *safe_malloc(size_t n) {
   void *p = malloc(n);
-  if (!p && n != 0) {
-    printf("Can not allocate memory: %s\n", strerror(errno));
+  if(!p && n != 0) {
+    fprintf(stderr,
+            "selector: can not allocate memory: %s\n", strerror(errno));
     exit(EXIT_FAILURE);
   }
   return p;
@@ -187,16 +189,18 @@ void usage(FILE *out) {
   fprintf(out, "         start in regexp mode\n");
   fprintf(out, " -a, --case-sensitive\n");
   fprintf(out, "         start in case sensitive mode\n");
+  fprintf(out, " -u, --upper-case-makes-case-sensitive\n");
+  fprintf(out, "         using an upper case character in the matching string makes\n");
+  fprintf(out, "         the matching case-sensitive\n");
   fprintf(out, " -n, --exclamation-negates\n");
-  fprintf(out, "         exclamation points in substring requires the string to be absent\n");
+  fprintf(out, "         substrings starting with an exclamation mark have to be absent\n");
   fprintf(out, " -m, --monochrome\n");
   fprintf(out, "         monochrome mode\n");
   fprintf(out, " -q, --no-beep\n");
   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, " --, --rest-are-files\n");
-  fprintf(out, "         all following arguments are filenames\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, " -c <colors>, --colors <colors>\n");
@@ -287,7 +291,8 @@ int add_and_get_previous_index(struct hash_table_t *hash_table,
     /* We came back to our original code, which means that the table
        is full */
     if(code == start) {
-      printf("Full hash table (that should not happen)\n");
+      fprintf(stderr,
+              "Full hash table (that should not happen)\n");
       exit(EXIT_FAILURE);
    }
   }
@@ -303,15 +308,15 @@ int add_and_get_previous_index(struct hash_table_t *hash_table,
  A matcher matches either with a collection of substrings, or with a
  regexp */
 
-typedef struct {
+struct matcher {
   regex_t preg;
   int regexp_error;
   int nb_patterns;
   int case_sensitive;
   char *splitted_patterns, **patterns;
-} matcher_t;
+};
 
-int match(matcher_t *matcher, char *string) {
+int match(struct matcher *matcher, char *string) {
   int n;
   if(matcher->nb_patterns >= 0) {
     if(matcher->case_sensitive) {
@@ -349,7 +354,7 @@ int match(matcher_t *matcher, char *string) {
   }
 }
 
-void free_matcher(matcher_t *matcher) {
+void free_matcher(struct matcher *matcher) {
   if(matcher->nb_patterns < 0) {
     if(!matcher->regexp_error) regfree(&matcher->preg);
   } else {
@@ -358,7 +363,7 @@ void free_matcher(matcher_t *matcher) {
   }
 }
 
-void initialize_matcher(matcher_t *matcher,
+void initialize_matcher(struct matcher *matcher,
                         int use_regexp, int case_sensitive,
                         const char *pattern) {
   const char *s;
@@ -366,12 +371,20 @@ void initialize_matcher(matcher_t *matcher,
   int n;
 
   if(use_regexp) {
+    matcher->case_sensitive = case_sensitive;
     matcher->nb_patterns = -1;
     matcher->regexp_error = regcomp(&matcher->preg, pattern,
                                     case_sensitive ? 0 : REG_ICASE);
   } else {
     matcher->regexp_error = 0;
     matcher->nb_patterns = 1;
+
+    if(upper_caps_makes_case_sensitive) {
+      for(s = pattern; *s && !case_sensitive; s++) {
+        case_sensitive = (*s >= 'A' && *s <= 'Z');
+      }
+    }
+
     matcher->case_sensitive = case_sensitive;
 
     for(s = pattern; *s; s++) {
@@ -461,14 +474,14 @@ void kill_after_cursor(char *buffer, int *position) {
 
 /*********************************************************************/
 
-int previous_visible(int current_line, char **lines, matcher_t *matcher) {
+int previous_visible(int current_line, char **lines, struct matcher *matcher) {
   int line = current_line - 1;
   while(line >= 0 && !match(matcher, lines[line])) line--;
   return line;
 }
 
 int next_visible(int current_line, int nb_lines, char **lines,
-                 matcher_t *matcher) {
+                 struct matcher *matcher) {
   int line = current_line + 1;
   while(line < nb_lines && !match(matcher, lines[line])) line++;
 
@@ -499,7 +512,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
                    char *pattern) {
 
   char buffer[BUFFER_SIZE];
-  matcher_t matcher;
+  struct matcher matcher;
   int k, l, m;
   int console_width, console_height;
   int nb_printed_lines = 0;
@@ -604,32 +617,24 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
         if(match(&matcher, lines[l])) {
           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) {
             buffer[k] = lines[l][k];
             k++;
           }
 
-          /* We fill the rest of the line with blanks if this is the
-             highlighted line */
+          /* Highlight the highlighted line ... */
 
           if(l == new_focus_line) {
             while(k < console_width) {
               buffer[k++] = ' ';
             }
-          }
-
-          buffer[k++] = '\n';
-          buffer[k++] = '\0';
-
-          clrtoeol();
-
-          /* Highlight the highlighted line ... */
-
-          if(l == new_focus_line) {
             attron(attr_focus_line);
             addnstr(buffer, console_width);
             attroff(attr_focus_line);
           } else {
+            buffer[k++] = '\n';
+            buffer[k++] = '\0';
+            /* clrtoeol(); */
             addnstr(buffer, console_width);
           }
 
@@ -703,13 +708,13 @@ void update_screen(int *current_focus_line, int *displayed_focus_line,
   /* Add a few info about the mode we are in (regexp and/or case
      sensitive) */
 
-  if(use_regexp || case_sensitive) {
+  if(use_regexp || matcher.case_sensitive) {
     addstr(" [");
     if(use_regexp) {
       addstr("regexp");
     }
 
-    if(case_sensitive) {
+    if(matcher.case_sensitive) {
       if(use_regexp) {
         addstr(",");
       }
@@ -778,7 +783,7 @@ void read_file(struct hash_table_t *hash_table,
                int nb_lines_max, int *nb_lines, char **lines) {
 
   char raw_line[BUFFER_SIZE];
-  int start, end, eol, k;
+  char *s;
   FILE *file;
 
   file = fopen(input_filename, "r");
@@ -788,51 +793,11 @@ void read_file(struct hash_table_t *hash_table,
     exit(EXIT_FAILURE);
   }
 
-  start = 0;
-  end = 0;
-
-  while(*nb_lines < nb_lines_max && (end > start || !feof(file))) {
-    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];
-      }
-      end -= start;
-      eol -= start;
-      start = 0;
-      end += fread(raw_line + end, sizeof(char), BUFFER_SIZE - end, file);
-      while(eol < end && raw_line[eol] != '\n') eol++;
+  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';
     }
-
-    /* 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, "%s", raw_line);
-      fprintf(stderr, "\n");
-      exit(EXIT_FAILURE);
-    }
-
-    /* If we got a line, we replace the carriage return by a \0 to
-       finish the string */
-
-    raw_line[eol] = '\0';
-
-    store_line(hash_table, raw_line + start,
-               nb_lines, lines);
-
-    start = eol + 1;
+    store_line(hash_table, raw_line, nb_lines, lines);
   }
 
   fclose(file);
@@ -861,10 +826,10 @@ static struct option long_options[] = {
   { "remove-duplicates", no_argument, 0, 'd' },
   { "regexp", no_argument, 0, 'e' },
   { "case-sensitive", no_argument, 0, 'a' },
+  { "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
   { "title", 1, 0, 't' },
   { "number-of-lines", 1, 0, 'l' },
   { "colors", 1, 0, 'c' },
-  { "rest-are-files", no_argument, 0, '-' },
   { "bash", no_argument, 0, OPT_BASH_MODE },
   { "help", no_argument, 0, 'h' },
   { 0, 0, 0, 0 }
@@ -877,7 +842,6 @@ int main(int argc, char **argv) {
   int c, k, l, n;
   int cursor_position;
   int error = 0, show_help = 0, done = 0;
-  int rest_are_files = 0;
   int key;
   int current_focus_line, displayed_focus_line;
 
@@ -904,8 +868,7 @@ int main(int argc, char **argv) {
 
   strcpy(output_filename, "");
 
-  while (!rest_are_files &&
-         (c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h",
+  while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeaunt:l:c:-h",
                           long_options, NULL)) != -1) {
 
     switch(c) {
@@ -962,6 +925,10 @@ int main(int argc, char **argv) {
       case_sensitive = 1;
       break;
 
+    case 'u':
+      upper_caps_makes_case_sensitive = 1;
+      break;
+
     case 'n':
       exclamation_negates = 1;
       break;
@@ -984,10 +951,6 @@ int main(int argc, char **argv) {
       color_bg_highlight = colors[3];
       break;
 
-    case '-':
-      rest_are_files = 1;
-      break;
-
     case 'h':
       show_help = 1;
       break;
@@ -1240,6 +1203,10 @@ int main(int argc, char **argv) {
       done = 1;
     }
 
+    else if(key == KEY_RESIZE || key == -1) {
+      /* Do nothing when the tty is resized */
+    }
+
     else {
       /* Unknown key */
       error_feedback();
@@ -1256,7 +1223,7 @@ int main(int argc, char **argv) {
 
   /* Here we come back to standard display */
 
-  if((key == KEY_ENTER || key == '\n')) {
+  if(key == KEY_ENTER || key == '\n') {
 
     char *t;