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

diff --git a/selector.c b/selector.c
index 4746d01..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,7 +75,7 @@ int attr_modeline, attr_focus_line, attr_error;
 
 void *safe_malloc(size_t n) {
   void *p = malloc(n);
-  if (!p && n != 0) {
+  if(!p && n != 0) {
     fprintf(stderr,
             "selector: can not allocate memory: %s\n", strerror(errno));
     exit(EXIT_FAILURE);
@@ -192,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");
@@ -291,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);
    }
   }
@@ -319,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;
@@ -928,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));
@@ -1222,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;