X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=638aaadb327df0677c38fe2bef3c56bf697b246a;hb=a5951faf47e3adcecd2c4dbb621616cca7d4f02b;hp=ed30692c7b33b7ca3bef64e179f0f227c87be9c0;hpb=cd2588f04d4d909d5108ba705fcba0337d89ac9c;p=selector.git

diff --git a/selector.c b/selector.c
index ed30692..638aaad 100644
--- a/selector.c
+++ b/selector.c
@@ -45,7 +45,7 @@
 #include <getopt.h>
 #include <limits.h>
 
-#define VERSION "1.1.4"
+#define VERSION "1.1.5"
 
 #define BUFFER_SIZE 4096
 
@@ -65,7 +65,6 @@ int use_regexp = 0;
 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;
@@ -76,8 +75,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;
@@ -191,8 +191,6 @@ void usage(FILE *out) {
   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, "         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");
@@ -290,7 +288,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);
    }
   }
@@ -318,32 +317,12 @@ int match(struct matcher *matcher, char *string) {
   int n;
   if(matcher->nb_patterns >= 0) {
     if(matcher->case_sensitive) {
-      if(exclamation_negates) {
-        for(n = 0; n < matcher->nb_patterns; n++) {
-          if(matcher->patterns[n][0] == '!') {
-            if(strstr(string, matcher->patterns[n] + 1) != 0) return 0;
-          } else {
-            if(strstr(string, matcher->patterns[n]) == 0) return 0;
-          }
-        }
-      } else {
-        for(n = 0; n < matcher->nb_patterns; n++) {
-          if(strstr(string, matcher->patterns[n]) == 0) return 0;
-        }
+      for(n = 0; n < matcher->nb_patterns; n++) {
+        if(strstr(string, matcher->patterns[n]) == 0) return 0;
       }
     } else {
-      if(exclamation_negates) {
-        for(n = 0; n < matcher->nb_patterns; n++) {
-          if(matcher->patterns[n][0] == '!') {
-            if(strcasestr(string, matcher->patterns[n] + 1) != 0) return 0;
-          } else {
-            if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
-          }
-        }
-      } else {
-        for(n = 0; n < matcher->nb_patterns; n++) {
-          if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
-        }
+      for(n = 0; n < matcher->nb_patterns; n++) {
+        if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
       }
     }
     return 1;
@@ -781,7 +760,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");
@@ -791,51 +770,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++;
-    }
-
-    /* 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);
+  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 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);
@@ -967,10 +906,6 @@ int main(int argc, char **argv) {
       upper_caps_makes_case_sensitive = 1;
       break;
 
-    case 'n':
-      exclamation_negates = 1;
-      break;
-
     case 't':
       free(title);
       title = safe_malloc((strlen(optarg) + 1) * sizeof(char));
@@ -1261,7 +1196,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;