From: Francois Fleuret Date: Tue, 29 Nov 2011 07:26:02 +0000 (+0100) Subject: Removed the atrocious -n option. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=2e30a3b61ab280c8a4151c1f699f0ed82d24a052;p=selector.git Removed the atrocious -n option. --- diff --git a/selector.1 b/selector.1 index 82669b2..4b6d3ed 100644 --- a/selector.1 +++ b/selector.1 @@ -97,10 +97,6 @@ start in case sensitive mode using an upper case in the matching string makes the matching case-sensitive .TP -\fB-n\fR, \fB--exclamation-negates\fR -substrings starting with an exclamation mark must be absent for a line -to match -.TP \fB-q\fR, \fB--no-beep\fR make a flash instead of a beep when there is an edition error .TP diff --git a/selector.c b/selector.c index 7f64eba..da3bc4a 100644 --- a/selector.c +++ b/selector.c @@ -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; @@ -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"); @@ -320,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; @@ -929,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));