* 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.
#include <getopt.h>
#include <limits.h>
-#define VERSION "1.1.2"
+#define VERSION "1.1.3"
#define BUFFER_SIZE 4096
int case_sensitive = 0;
char *title = 0;
int error_flash = 0;
+int exclamation_negates = 0;
int attr_modeline, attr_focus_line, attr_error;
fprintf(out, " start in regexp mode\n");
fprintf(out, " -a, --case-sensitive\n");
fprintf(out, " start in case sensitive mode\n");
+ fprintf(out, " -n, --exclamation-negates\n");
+ fprintf(out, " exclamation points in substring requires the string 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");
int n;
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
- for(n = 0; n < matcher->nb_patterns; n++) {
- if(strstr(string, matcher->patterns[n]) == 0) return 0;
+ 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;
+ }
}
} else {
- for(n = 0; n < matcher->nb_patterns; n++) {
- if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+ 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;
+ }
}
}
return 1;
{ "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 }
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;
strcpy(output_filename, "");
- while (!rest_are_files &&
- (c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeat:l:c:-h",
+ while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h",
long_options, NULL)) != -1) {
switch(c) {
case_sensitive = 1;
break;
+ case 'n':
+ exclamation_negates = 1;
+ break;
+
case 't':
free(title);
title = safe_malloc((strlen(optarg) + 1) * sizeof(char));
color_bg_highlight = colors[3];
break;
- case '-':
- rest_are_files = 1;
- break;
-
case 'h':
show_help = 1;
break;
done = 1;
}
+ else if(key == KEY_RESIZE || key == -1) {
+ /* Do nothing when the tty is resized */
+ }
+
else {
/* Unknown key */
error_feedback();