* selector is a simple command line utility for selection of strings
* with a dynamic pattern-matching.
*
- * Copyright (c) 2009, 2010, 2011 Francois Fleuret
+ * Copyright (c) 2009-2013 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.5"
+#define VERSION "1.1.7"
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 16384
/* Yeah, global variables! */
void *p = malloc(n);
if(!p && n != 0) {
fprintf(stderr,
- "selector: can not allocate memory: %s\n", strerror(errno));
+ "selector: cannot allocate memory: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
return p;
fprintf(out, " -a, --case-sensitive\n");
fprintf(out, " start in case sensitive mode\n");
fprintf(out, " -j, --show-long-lines\n");
- fprintf(out, " print three dots at the end of truncated lines\n");
+ fprintf(out, " print a long-line indicator at the end of truncated lines\n");
fprintf(out, " -y, --show-hits\n");
fprintf(out, " highlight the matching substrings\n");
fprintf(out, " -u, --upper-case-makes-case-sensitive\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, " -- all following arguments are filenames\n");
+ fprintf(out, " --\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, " -r <pattern>, --pattern <pattern>\n");
+ fprintf(out, " set an initial pattern\n");
fprintf(out, " -c <colors>, --colors <colors>\n");
fprintf(out, " set the display colors with an argument of the form\n");
fprintf(out, " <fg_modeline>,<bg_modeline>,<fg_highlight>,<bg_highlight>\n");
fprintf(out, " -s <pattern separator>, --pattern-separator <pattern separator>\n");
fprintf(out, " set the symbol to separate substrings in the pattern\n");
fprintf(out, " -x <label separator>, --label-separator <label separator>\n");
- fprintf(out, " set the symbol to terminate the label\n");
+ fprintf(out, " set the character to separate the label to show from the\n");
+ fprintf(out, " string to return\n");
fprintf(out, " -l <max number of lines>, --number-of-lines <max number of lines>\n");
fprintf(out, " set the maximum number of lines to take into account\n");
fprintf(out, "\n");
};
/* Routine to add an interval to a sorted list of intervals
- extermities. Returns the number of extremities. This is an effing
- nightmare */
+ extremities. Returns the resulting number of extremities.
+
+ This routine is an effing nightmare */
int add_interval(int n, int *switches, int start, int end) {
int f, g, k;
+ if(start == end) { return n; }
+
f = 0;
while(f < n && switches[f] <= start) { f++; }
g = f;
while(g < n && switches[g] <= end) { g++; }
if(f == n) {
- /* switches[n] start end */
- /* XXXXXXXXXX| */
+ /* switches[f-1] start end */
+ /* XXXXXXXXXXXX| */
switches[f] = start;
switches[f+1] = end;
return n + 2;
}
- if(f%2) {
-
- if(f == g) {
- /* switches[f-1] start end switches[f] */
- /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
- return n;
- }
+ if(f % 2) {
- if(g%2) {
+ if(g % 2) {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
- for(k = f; k < n; k++) { switches[k] = switches[(k - f) + g]; }
+ for(k = f; k < n; k++) { switches[k] = switches[k + (g - f)]; }
return n - (g - f);
} else {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... XXXXXXXXXXXX| |XXXXXXXXXX */
switches[g - 1] = end;
- for(k = f; k < n; k++) { switches[k] = switches[(k - f) + (g - 1)]; }
+ for(k = f; k < n; k++) { switches[k] = switches[k + ((g - 1) - f)]; }
return n - ((g - 1) - f);
}
if(f == g) {
/* switches[f-1] start end switches[f] */
/* XXXXXXXXXXXX| |XXXXXXXXXX */
- for(k = n; k >= f; k--) {
+ for(k = n - 1; k >= f; k--) {
switches[k + 2] = switches[k];
}
switches[f] = start;
return n + 2;
}
- if(g%2) {
+ if(g % 2) {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
switches[f] = start;
- for(k = f + 1; k < n; k++) { switches[k] = switches[(k - (f + 1)) + g]; }
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + (g - (f + 1))]; }
return n - (g - (f + 1));
} else {
/* switches[f-1] start switches[f] switches[g-1] end switches[g] */
/* XXXXXXXXXXXX| |XXXXXXXXXX ... XXXXXXXXXXXX| |XXXXXXXXXX */
switches[f] = start;
switches[g - 1] = end;
- for(k = f + 1; k < n; k++) { switches[k] = switches[(k - (f + 1)) + (g - 1)]; }
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + ((g - 1) - (f + 1))]; }
return n - ((g - 1) - (f + 1));
}
}
}
-int match(struct matcher *matcher, char *string, int *switches) {
- int n, nb_switches = 0;
+int match(struct matcher *matcher, char *string, int *nb_switches, int *switches) {
+ int n;
char *where;
+ regmatch_t matches;
+
+ if(nb_switches) { *nb_switches = 0; }
+
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
for(n = 0; n < matcher->nb_patterns; n++) {
if((where = strstr(string, matcher->patterns[n])) == 0) return 0;
if(switches) {
- nb_switches = add_interval(nb_switches, switches,
- (int) (where - string),
- (int) (where - string) + strlen(matcher->patterns[n]));
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
}
}
} else {
for(n = 0; n < matcher->nb_patterns; n++) {
if((where = strcasestr(string, matcher->patterns[n])) == 0) return 0;
if(switches) {
- nb_switches = add_interval(nb_switches, switches,
- (int) (where - string),
- (int) (where - string) + strlen(matcher->patterns[n]));
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
}
}
}
return 1;
} else {
- return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ if(switches) {
+ if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) {
+ *nb_switches = 2;
+ switches[0] = matches.rm_so;
+ switches[1] = matches.rm_eo;
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ }
}
}
int previous_visible(int current_line, char **lines, struct matcher *matcher) {
int line = current_line - 1;
- while(line >= 0 && !match(matcher, lines[line], 0)) line--;
+ while(line >= 0 && !match(matcher, lines[line], 0, 0)) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
struct matcher *matcher) {
int line = current_line + 1;
- while(line < nb_lines && !match(matcher, lines[line], 0)) line++;
+ while(line < nb_lines && !match(matcher, lines[line], 0, 0)) line++;
if(line < nb_lines)
return line;
/*********************************************************************/
void print_string_with_switches(char *buffer, int line_width,
- int console_width,
int nb_patterns, int *switches) {
int w, current = 0, next;
if(switches) {
if(switches[2 * w] < switches[2 * w + 1]) {
next = switches[2 * w];
if(next > line_width) { next = line_width; }
- addnstr(buffer + current, next - current);
+ if(next > current) { addnstr(buffer + current, next - current); }
attron(attr_hits);
current = next;
next = switches[2 * w + 1];
if(next > line_width) { next = line_width; }
- addnstr(buffer + current, next - current);
+ if(next > current) { addnstr(buffer + current, next - current); }
attroff(attr_hits);
current = next;
}
}
if(current < line_width) {
- addnstr(buffer + current, console_width - current);
+ addnstr(buffer + current, line_width - current);
}
} else {
- addnstr(buffer, console_width);
+ addnstr(buffer, line_width);
}
}
int console_width, console_height;
int nb_printed_lines = 0;
int cursor_x;
+ int nb_switches;
initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
- if(show_hits && matcher.nb_patterns > 0) {
- switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ if(show_hits) {
+ if(matcher.nb_patterns >= 0) {
+ switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ } else {
+ switches = safe_malloc(sizeof(int) * 2);
+ }
} else {
switches = 0;
}
else if(nb_lines > 0) {
int new_focus_line;
- if(match(&matcher, lines[*current_focus_line], 0)) {
+ if(match(&matcher, lines[*current_focus_line], 0, 0)) {
new_focus_line = *current_focus_line;
} else {
new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
if(first_line > 0) {
first_line--;
- while(first_line > 0 && !match(&matcher, lines[first_line], 0)) {
+ while(first_line > 0 && !match(&matcher, lines[first_line], 0, 0)) {
first_line--;
}
- if(match(&matcher, lines[first_line], 0)) {
+ if(match(&matcher, lines[first_line], 0, 0)) {
nb_match++;
}
}
if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
- while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0)) {
+ while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0, 0)) {
last_line++;
}
- if(match(&matcher, lines[last_line], 0)) {
+ if(match(&matcher, lines[last_line], 0, 0)) {
nb_match++;
}
}
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
- if(match(&matcher, lines[l], switches)) {
+ if(match(&matcher, lines[l], &nb_switches, switches)) {
int k = 0;
while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) {
if(l == new_focus_line) {
if(show_long_lines && k >= console_width) {
- if(console_width >= 4) {
- buffer[console_width - 4] = ' ';
- buffer[console_width - 3] = '.';
- buffer[console_width - 2] = '.';
- buffer[console_width - 1] = '.';
- }
+ attron(attr_focus_line);
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ /* attron(attr_error); */
+ addnstr("\\", 1);
+ /* attroff(attr_error); */
+ attroff(attr_focus_line);
} else {
while(k < console_width) {
buffer[k++] = ' ';
}
+ attron(attr_focus_line);
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ attroff(attr_focus_line);
}
- attron(attr_focus_line);
- print_string_with_switches(buffer, k, console_width,
- matcher.nb_patterns, switches);
- attroff(attr_focus_line);
} else {
if(show_long_lines && k >= console_width) {
- if(console_width >= 4) {
- buffer[console_width - 4] = ' ';
- buffer[console_width - 3] = '.';
- buffer[console_width - 2] = '.';
- buffer[console_width - 1] = '.';
- }
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ attron(attr_focus_line);
+ addnstr("\\", 1);
+ attroff(attr_focus_line);
} else {
- buffer[k++] = '\n';
- buffer[k++] = '\0';
+ if(k < console_width) {
+ buffer[k++] = '\n';
+ buffer[k++] = '\0';
+ }
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
}
- print_string_with_switches(buffer, k, console_width,
- matcher.nb_patterns, switches);
}
nb_printed_lines++;
char raw_line[BUFFER_SIZE];
char *s;
FILE *file;
+ int l;
file = fopen(input_filename, "r");
if(!file) {
- fprintf(stderr, "selector: Can not open `%s'.\n", input_filename);
+ fprintf(stderr, "selector: Cannot open `%s'.\n", input_filename);
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(label_separator == '\n') {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+ l = strlen(raw_line);
+ fgets(raw_line + l, BUFFER_SIZE - l, file);
+ for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+ *s = '\0';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
+ }
+ } else {
+ 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';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
}
- store_line(hash_table, raw_line, nb_lines, lines);
}
fclose(file);
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
{ "show-long-lines", no_argument, 0, 'j'},
+ { "show-hits", no_argument, 0, 'j'},
{ "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
+ { "pattern", 1, 0, 'r' },
{ "number-of-lines", 1, 0, 'l' },
{ "colors", 1, 0, 'c' },
{ "bash", no_argument, 0, OPT_BASH_MODE },
exit(EXIT_FAILURE);
}
+ pattern[0] = '\0';
+
color_fg_modeline = COLOR_WHITE;
color_bg_modeline = COLOR_BLACK;
color_fg_highlight = COLOR_BLACK;
strcpy(output_filename, "");
- while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:l:c:-h",
+ while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:r:l:c:-h",
long_options, NULL)) != -1) {
switch(c) {
break;
case 'x':
- label_separator = optarg[0];
+ if(strcmp(optarg, "\\n") == 0) {
+ label_separator = '\n';
+ } else {
+ label_separator = optarg[0];
+ }
break;
case 'v':
strcpy(title, optarg);
break;
+ case 'r':
+ strcpy(pattern, optarg);
+ break;
+
case 'l':
str_to_positive_integers(optarg, &nb_lines_max, 1);
break;
*s = '\0';
}
- pattern[0] = '\0';
-
cursor_position = 0;
/* Here we start to display with curse */
current_focus_line = 0;
displayed_focus_line = 0;
+ cursor_position = strlen(pattern);
update_screen(¤t_focus_line, &displayed_focus_line,
0,
fprintf(out, "\n");
} else {
fprintf(stderr,
- "selector: Can not open %s for writing.\n",
+ "selector: Cannot open %s for writing.\n",
output_filename);
exit(EXIT_FAILURE);
}