X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=selector.c;h=945844fc80b9db117ecb3c35c7aef238c2955cab;hp=5054f6b6a0050490b4e19d59b208e5ad4eceec0b;hb=HEAD;hpb=31d6b34af7e6587c8eecabeb44da4de86ec93f3d diff --git a/selector.c b/selector.c index 5054f6b..945844f 100644 --- a/selector.c +++ b/selector.c @@ -3,7 +3,7 @@ * selector is a simple command line utility for selection of strings * with a dynamic pattern-matching. * - * Copyright (c) 2009 Francois Fleuret + * Copyright (c) 2009-2015 Francois Fleuret * Written by Francois Fleuret * * This file is part of selector. @@ -25,7 +25,7 @@ /* To use it as a super-history-search for bash: - selector -q -b -i -d -v -w -l ${HISTSIZE} <(history) + selector --bash <(history) */ @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -43,29 +44,34 @@ #include #include #include +#include -#define VERSION "1.0.1" +#define VERSION "1.1.8" -#define BUFFER_SIZE 4096 +#define BUFFER_SIZE 16384 /* Yeah, global variables! */ -int nb_lines_max = 1000; -char pattern_separator = ';'; -char label_separator = '\0'; -int output_to_vt_buffer = 0; -int add_control_qs = 0; -int with_colors = 1; -int zsh_history = 0; -int bash_history = 0; -int inverse_order = 0; -int remove_duplicates = 0; -int use_regexp = 0; -int case_sensitive = 0; -char *title = 0; -int error_flash = 0; - -int attr_modeline, attr_focus_line, attr_error; +int global_nb_lines_max = 1000; +char global_pattern_separator = ';'; +char global_label_separator = '\0'; +int global_output_to_vt_buffer = 0; +int global_add_control_qs = 0; +int global_with_colors = 1; +int global_zsh_history = 0; +int global_bash_history = 0; +int global_inverse_order = 0; +int global_remove_duplicates = 0; +int global_use_regexp = 0; +int global_case_sensitive = 0; +char *global_title = 0; +regex_t *global_prefix_regexp = 0; +int global_error_flash = 0; +int global_upper_caps_makes_case_sensitive = 0; +int global_show_long_lines = 0; +int global_show_hits = 0; + +int global_attr_modeline, global_attr_focus_line, global_attr_error, global_attr_hits; /********************************************************************/ @@ -73,8 +79,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: cannot allocate memory: %s\n", strerror(errno)); exit(EXIT_FAILURE); } return p; @@ -104,76 +111,119 @@ void inject_into_tty_buffer(char *string, int add_control_qs) { /*********************************************************************/ -void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { - if(n_opt + n >= argc) { - fprintf(stderr, "Selector: Missing argument for %s, expecting %s.\n", - argv[n_opt], help); - exit(EXIT_FAILURE); - } -} - -int string_to_positive_integer(char *string) { - int error = 0; - int result = 0; +void str_to_positive_integers(char *string, int *values, int nb) { + int current_value, got_one; char *s; + int n; - printf("string_to_positive_integer string=\"%s\"\n", string); - if(*string) { - for(s = string; *s && *s != ','; s++) { - if(*s >= '0' && *s <= '9') { - result = result * 10 + (int) (*s - '0'); - } else error = 1; + n = 0; + current_value = 0; + got_one = 0; + s = string; + + while(1) { + if(*s >= '0' && *s <= '9') { + current_value = current_value * 10 + (int) (*s - '0'); + got_one = 1; + } else if(*s == ',' || *s == '\0') { + if(got_one) { + if(n < nb) { + values[n++] = current_value; + if(*s == '\0') { + if(n == nb) { + return; + } else { + fprintf(stderr, + "selector: Missing value in `%s'.\n", string); + exit(EXIT_FAILURE); + } + } + current_value = 0; + got_one = 0; + } else { + fprintf(stderr, + "selector: Too many values in `%s'.\n", string); + exit(EXIT_FAILURE); + } + } else { + fprintf(stderr, + "selector: Empty value in `%s'.\n", string); + exit(EXIT_FAILURE); + } + } else { + fprintf(stderr, + "selector: Syntax error in `%s'.\n", string); + exit(EXIT_FAILURE); } - } else error = 1; - - if(error) { - fprintf(stderr, - "Selector: Value `%s' is not a positive integer.\n", - string); - exit(EXIT_FAILURE); + s++; } - - return result; } void error_feedback() { - if(error_flash) { + if(global_error_flash) { flash(); } else { beep(); } } -void print_help(FILE *out) { +void usage(FILE *out) { fprintf(out, "Selector version %s (%s)\n", VERSION, UNAME); fprintf(out, "Written by Francois Fleuret .\n"); fprintf(out, "\n"); fprintf(out, "Usage: selector [options] [ [ ...]]\n"); fprintf(out, "\n"); - fprintf(out, " -h show this help\n"); - fprintf(out, " -v inject the selected line in the tty\n"); - fprintf(out, " -w quote control characters with ^Qs when using -v\n"); - fprintf(out, " -d remove duplicated lines\n"); - fprintf(out, " -b remove the bash history line prefix\n"); - fprintf(out, " -z remove the zsh history line prefix\n"); - fprintf(out, " -i invert the order of lines\n"); - fprintf(out, " -e start in regexp mode\n"); - fprintf(out, " -a start in case sensitive mode\n"); - fprintf(out, " -m monochrome mode\n"); - fprintf(out, " -q make a flash instead of a beep on an edition error\n"); - fprintf(out, " -- all following arguments are filenames\n"); - fprintf(out, " -t \n"); + fprintf(out, " -h, --help\n"); + fprintf(out, " show this help\n"); + fprintf(out, " -v, --inject-in-tty\n"); + fprintf(out, " inject the selected line in the tty\n"); + fprintf(out, " -w, --add-control-qs\n"); + fprintf(out, " quote control characters with ^Qs when using -v\n"); + fprintf(out, " -d, --remove-duplicates\n"); + fprintf(out, " remove duplicated lines\n"); + fprintf(out, " -b, --remove-bash-prefix\n"); + fprintf(out, " remove the bash history line prefix\n"); + fprintf(out, " -z, --remove-zsh-prefix\n"); + fprintf(out, " remove the zsh history line prefix\n"); + fprintf(out, " -i, --revert-order\n"); + fprintf(out, " invert the order of lines\n"); + fprintf(out, " -e, --regexp\n"); + fprintf(out, " start in regexp mode\n"); + fprintf(out, " -a, --case-sensitive\n"); + fprintf(out, " start in case sensitive mode\n"); + fprintf(out, " -j, --show-long-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, " using an upper case character in the matching string makes\n"); + fprintf(out, " the matching case-sensitive\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, " --delete-regexp <regexp>\n"); + fprintf(out, " deletes in every line the portion matching the regexp\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, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n"); - fprintf(out, " set the display colors\n"); - fprintf(out, " -o <output filename>\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, " -o <output filename>, --output-file <output filename>\n"); fprintf(out, " set a file to write the selected line to\n"); - fprintf(out, " -s <pattern separator>\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>\n"); - fprintf(out, " set the symbol to terminate the label\n"); - fprintf(out, " -l <max number of lines>\n"); + fprintf(out, " -x <label separator>, --label-separator <label separator>\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"); } @@ -182,6 +232,8 @@ void print_help(FILE *out) { /* A quick and dirty hash table */ +#define MAGIC_HASH_MULTIPLIER 387433 + /* The table itself stores indexes of the strings taken in a char** table. When a string is added, if it was already in the table, the new index replaces the previous one. */ @@ -220,18 +272,19 @@ int add_and_get_previous_index(struct hash_table_t *hash_table, const char *new_string, int new_index, char **strings) { - unsigned int code = 0; + unsigned int code = 0, start; int k; /* This is my recipe. I checked, it seems to work (as long as - hash_table->size is not a multiple of 387433 that should be - okay) */ + hash_table->size is not a multiple of MAGIC_HASH_MULTIPLIER that + should be okay) */ for(k = 0; new_string[k]; k++) { - code = code * 387433 + (unsigned int) (new_string[k]); + code = code * MAGIC_HASH_MULTIPLIER + (unsigned int) (new_string[k]); } code = code % hash_table->size; + start = code; while(hash_table->entries[code] >= 0) { /* There is a string with that code */ @@ -246,6 +299,13 @@ int add_and_get_previous_index(struct hash_table_t *hash_table, /* This collision was not the same string, let's move to the next in the table */ code = (code + 1) % hash_table->size; + /* We came back to our original code, which means that the table + is full */ + if(code == start) { + fprintf(stderr, + "Full hash table (that should not happen)\n"); + exit(EXIT_FAILURE); + } } /* This string was not already in there, store the index in the @@ -259,33 +319,127 @@ int add_and_get_previous_index(struct hash_table_t *hash_table, A matcher matches either with a collection of substrings, or with a regexp */ -typedef struct { +struct matcher { regex_t preg; int regexp_error; int nb_patterns; int case_sensitive; char *splitted_patterns, **patterns; -} matcher_t; +}; + +/* Routine to add an interval to a sorted list of intervals + 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[f-1] start end */ + /* XXXXXXXXXXXX| */ + switches[f] = start; + switches[f+1] = end; + return n + 2; + } + + if(f % 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 + (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 + ((g - 1) - f)]; } + return n - ((g - 1) - f); + } -int match(char *string, matcher_t *matcher) { + } else { + + if(f == g) { + /* switches[f-1] start end switches[f] */ + /* XXXXXXXXXXXX| |XXXXXXXXXX */ + for(k = n - 1; k >= f; k--) { + switches[k + 2] = switches[k]; + } + switches[f] = start; + switches[f + 1] = end; + return n + 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 + (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 + ((g - 1) - (f + 1))]; } + return n - ((g - 1) - (f + 1)); + } + } +} + +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(strstr(string, matcher->patterns[n]) == 0) return 0; + 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])); + } } } else { for(n = 0; n < matcher->nb_patterns; n++) { - if(strcasestr(string, matcher->patterns[n]) == 0) return 0; + 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])); + } } } 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; + } } } -void free_matcher(matcher_t *matcher) { +void free_matcher(struct matcher *matcher) { if(matcher->nb_patterns < 0) { if(!matcher->regexp_error) regfree(&matcher->preg); } else { @@ -294,23 +448,32 @@ void free_matcher(matcher_t *matcher) { } } -void initialize_matcher(int use_regexp, int case_sensitive, - matcher_t *matcher, const char *pattern) { +void initialize_matcher(struct matcher *matcher, + int use_regexp, int case_sensitive, + const char *pattern) { const char *s; char *t, *last_pattern_start; int n; if(use_regexp) { + matcher->case_sensitive = case_sensitive; matcher->nb_patterns = -1; matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE); } else { matcher->regexp_error = 0; matcher->nb_patterns = 1; + + if(global_upper_caps_makes_case_sensitive) { + for(s = pattern; *s && !case_sensitive; s++) { + case_sensitive = (*s >= 'A' && *s <= 'Z'); + } + } + matcher->case_sensitive = case_sensitive; for(s = pattern; *s; s++) { - if(*s == pattern_separator) { + if(*s == global_pattern_separator) { matcher->nb_patterns++; } } @@ -326,7 +489,7 @@ void initialize_matcher(int use_regexp, int case_sensitive, n = 0; last_pattern_start = matcher->splitted_patterns; for(t = matcher->splitted_patterns; n < matcher->nb_patterns; t++) { - if(*t == pattern_separator || *t == '\0') { + if(*t == global_pattern_separator || *t == '\0') { *t = '\0'; matcher->patterns[n++] = last_pattern_start; last_pattern_start = t + 1; @@ -396,17 +559,16 @@ void kill_after_cursor(char *buffer, int *position) { /*********************************************************************/ -int previous_visible(int current_line, int nb_lines, char **lines, - matcher_t *matcher) { +int previous_visible(int current_line, char **lines, struct matcher *matcher) { int line = current_line - 1; - while(line >= 0 && !match(lines[line], matcher)) line--; + while(line >= 0 && !match(matcher, lines[line], 0, 0)) line--; return line; } int next_visible(int current_line, int nb_lines, char **lines, - matcher_t *matcher) { + struct matcher *matcher) { int line = current_line + 1; - while(line < nb_lines && !match(lines[line], matcher)) line++; + while(line < nb_lines && !match(matcher, lines[line], 0, 0)) line++; if(line < nb_lines) return line; @@ -416,6 +578,32 @@ int next_visible(int current_line, int nb_lines, char **lines, /*********************************************************************/ +void print_string_with_switches(char *buffer, int line_width, + int nb_patterns, int *switches) { + int w, current = 0, next; + if(switches) { + for(w = 0; w < nb_patterns && switches[2 * w] < line_width; w++) { + if(switches[2 * w] < switches[2 * w + 1]) { + next = switches[2 * w]; + if(next > line_width) { next = line_width; } + if(next > current) { addnstr(buffer + current, next - current); } + attron(global_attr_hits); + current = next; + next = switches[2 * w + 1]; + if(next > line_width) { next = line_width; } + if(next > current) { addnstr(buffer + current, next - current); } + attroff(global_attr_hits); + current = next; + } + } + if(current < line_width) { + addnstr(buffer + current, line_width - current); + } + } else { + addnstr(buffer, line_width); + } +} + /* The line highlighted is the first one matching the matcher in that order: (1) current_focus_line after motion, if it does not match, then (2) the first with a greater index, if none matches, then (3) @@ -433,15 +621,26 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, int nb_lines, char **lines, int cursor_position, char *pattern) { - + int *switches; char buffer[BUFFER_SIZE]; - matcher_t matcher; + struct matcher matcher; int k, l, m; int console_width, console_height; int nb_printed_lines = 0; int cursor_x; + int nb_switches; + + initialize_matcher(&matcher, global_use_regexp, global_case_sensitive, pattern); - initialize_matcher(use_regexp, case_sensitive, &matcher, pattern); + if(global_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; + } console_width = getmaxx(stdscr); console_height = getmaxy(stdscr); @@ -455,23 +654,22 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, /* If the regexp is erroneous, print a message saying so */ if(matcher.regexp_error) { - attron(attr_error); + attron(global_attr_error); addnstr("Regexp syntax error", console_width); - attroff(attr_error); + attroff(global_attr_error); } /* Else, and we do have lines to select from, find a visible line. */ else if(nb_lines > 0) { int new_focus_line; - if(match(lines[*current_focus_line], &matcher)) { + 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, &matcher); if(new_focus_line < 0) { - new_focus_line = previous_visible(*current_focus_line, nb_lines, lines, - &matcher); + new_focus_line = previous_visible(*current_focus_line, lines, &matcher); } } @@ -490,7 +688,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, } else { /* We want to go up, let's find the first visible line above */ for(m = 0; l >= 0 && m < -motion; m++) { - l = previous_visible(l, nb_lines, lines, &matcher); + l = previous_visible(l, lines, &matcher); if(l >= 0) { new_focus_line = l; } @@ -506,8 +704,8 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, int first_line = new_focus_line, last_line = new_focus_line; int nb_match = 1; - /* We find the first and last line to show, so that the total of - visible lines between them (them included) is + /* We find the first and last lines to show, so that the total + of visible lines between them (them included) is console_height-1 */ while(nb_match < console_height-1 && @@ -515,21 +713,21 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, if(first_line > 0) { first_line--; - while(first_line > 0 && !match(lines[first_line], &matcher)) { + while(first_line > 0 && !match(&matcher, lines[first_line], 0, 0)) { first_line--; } - if(match(lines[first_line], &matcher)) { + 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(lines[last_line], &matcher)) { + while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0, 0)) { last_line++; } - if(match(lines[last_line], &matcher)) { + if(match(&matcher, lines[last_line], 0, 0)) { nb_match++; } } @@ -538,36 +736,49 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, /* Now we display them */ for(l = first_line; l <= last_line; l++) { - if(match(lines[l], &matcher)) { + if(match(&matcher, lines[l], &nb_switches, switches)) { int k = 0; - while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width - 2) { + while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) { buffer[k] = lines[l][k]; k++; } - /* We fill the rest of the line with blanks if this is the - highlighted line */ - - if(l == new_focus_line) { - while(k < console_width) { - buffer[k++] = ' '; - } - } - - buffer[k++] = '\n'; - buffer[k++] = '\0'; - - clrtoeol(); - /* Highlight the highlighted line ... */ if(l == new_focus_line) { - attron(attr_focus_line); - addnstr(buffer, console_width); - attroff(attr_focus_line); + if(global_show_long_lines && k >= console_width) { + attron(global_attr_focus_line); + print_string_with_switches(buffer, console_width-1, + nb_switches / 2, switches); + /* attron(global_attr_error); */ + addnstr("\\", 1); + /* attroff(global_attr_error); */ + attroff(global_attr_focus_line); + } else { + while(k < console_width) { + buffer[k++] = ' '; + } + attron(global_attr_focus_line); + print_string_with_switches(buffer, k, + nb_switches / 2, switches); + attroff(global_attr_focus_line); + } } else { - addnstr(buffer, console_width); + if(global_show_long_lines && k >= console_width) { + print_string_with_switches(buffer, console_width-1, + nb_switches / 2, switches); + attron(global_attr_focus_line); + addnstr("\\", 1); + attroff(global_attr_focus_line); + } else { + if(k < console_width) { + buffer[k++] = '\n'; + buffer[k++] = '\0'; + } + print_string_with_switches(buffer, k, + nb_switches / 2, switches); + } } nb_printed_lines++; @@ -585,18 +796,18 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, *displayed_focus_line = new_focus_line; if(nb_printed_lines == 0) { - attron(attr_error); + attron(global_attr_error); addnstr("No selection", console_width); - attroff(attr_error); + attroff(global_attr_error); } } /* Else, print a message saying that there are no lines to select from */ else { - attron(attr_error); + attron(global_attr_error); addnstr("Empty choice", console_width); - attroff(attr_error); + attroff(global_attr_error); } clrtobot(); @@ -605,7 +816,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, move(0, 0); - attron(attr_modeline); + attron(global_attr_modeline); for(k = 0; k < console_width; k++) buffer[k] = ' '; buffer[console_width] = '\0'; @@ -618,10 +829,10 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, cursor_x = 0; - if(title) { - addstr(title); + if(global_title) { + addstr(global_title); addstr(" "); - cursor_x += strlen(title) + 1; + cursor_x += strlen(global_title) + 1; } sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines); @@ -640,14 +851,14 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, /* Add a few info about the mode we are in (regexp and/or case sensitive) */ - if(use_regexp || case_sensitive) { + if(global_use_regexp || matcher.case_sensitive) { addstr(" ["); - if(use_regexp) { + if(global_use_regexp) { addstr("regexp"); } - if(case_sensitive) { - if(use_regexp) { + if(matcher.case_sensitive) { + if(global_use_regexp) { addstr(","); } addstr("case"); @@ -657,31 +868,43 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, move(0, cursor_x); - attroff(attr_modeline); + attroff(global_attr_modeline); /* We are done */ refresh(); + if(switches) { free(switches); } free_matcher(&matcher); } /*********************************************************************/ void store_line(struct hash_table_t *hash_table, - const char *new_line, + char *new_line, int *nb_lines, char **lines) { int dup; + char *c, *d; + regmatch_t matches; + + /* Remove some parts matching a regexp */ + + if(global_prefix_regexp && regexec(global_prefix_regexp, new_line, 1, &matches, 0) == 0) { + c = new_line + matches.rm_so; + d = new_line + matches.rm_eo; + while(*d) { *c++ = *d++; } + *c = 0; + } /* Remove the zsh history prefix */ - if(zsh_history && *new_line == ':') { + if(global_zsh_history && *new_line == ':') { while(*new_line && *new_line != ';') new_line++; if(*new_line == ';') new_line++; } /* Remove the bash history prefix */ - if(bash_history) { + if(global_bash_history) { while(*new_line == ' ') new_line++; while(*new_line >= '0' && *new_line <= '9') new_line++; while(*new_line == ' ') new_line++; @@ -715,61 +938,33 @@ 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; + 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); } - 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]; + if(global_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'; } - 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++; + store_line(hash_table, raw_line, nb_lines, lines); } - - /* 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, raw_line); - fprintf(stderr, "\n"); - exit(EXIT_FAILURE); + } 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); } - - /* 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; } fclose(file); @@ -777,53 +972,69 @@ void read_file(struct hash_table_t *hash_table, /*********************************************************************/ +/* For long options that have no equivalent short option, use a + non-character as a pseudo short option, starting with CHAR_MAX + 1. */ +enum { + OPT_BASH_MODE = CHAR_MAX + 1, + OPT_DELETE_REGEXP = CHAR_MAX + 2 +}; + static struct option long_options[] = { { "output-file", 1, 0, 'o' }, - { "separator-patterns", 1, 0, 's' }, - { "separator-display", 1, 0, 'x' }, + { "pattern-separator", 1, 0, 's' }, + { "label-separator", 1, 0, 'x' }, { "inject-in-tty", no_argument, 0, 'v' }, { "add-control-qs", no_argument, 0, 'w' }, { "monochrome", no_argument, 0, 'm' }, { "no-beep", no_argument, 0, 'q' }, - { "input-file", 1, 0, 'f' }, { "revert-order", no_argument, 0, 'i' }, { "remove-bash-prefix", no_argument, 0, 'b' }, { "remove-zsh-prefix", no_argument, 0, 'z' }, { "remove-duplicates", no_argument, 0, 'd' }, { "regexp", no_argument, 0, 'e' }, { "case-sensitive", no_argument, 0, 'a' }, + { "show-long-lines", no_argument, 0, 'j'}, + { "show-hits", no_argument, 0, 'y'}, + { "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' }, - { "rest-are-files", no_argument, 0, '-' }, + { "bash", no_argument, 0, OPT_BASH_MODE }, + { "delete-regexp", 1, 0, OPT_DELETE_REGEXP }, { "help", no_argument, 0, 'h' }, { 0, 0, 0, 0 } }; int main(int argc, char **argv) { - char input_filename[BUFFER_SIZE], output_filename[BUFFER_SIZE]; - char c, *s; + char output_filename[BUFFER_SIZE]; char pattern[BUFFER_SIZE]; - int k, l, n; + int c, k, l, n; int cursor_position; - int error = 0, show_help = 0; - int rest_are_files = 0; + int error = 0, show_help = 0, done = 0; int key; int current_focus_line, displayed_focus_line; + int colors[4]; int color_fg_modeline, color_bg_modeline; int color_fg_highlight, color_bg_highlight; char **lines, **labels; int nb_lines; struct hash_table_t *hash_table; + char *bash_histsize; if(!isatty(STDIN_FILENO)) { - fprintf(stderr, "Selector: The standard input is not a tty.\n"); + fprintf(stderr, "selector: The standard input is not a tty.\n"); exit(EXIT_FAILURE); } + /* Group and others have no access to created files */ + umask(S_IRWXG | S_IRWXO); + + pattern[0] = '\0'; + color_fg_modeline = COLOR_WHITE; color_bg_modeline = COLOR_BLACK; color_fg_highlight = COLOR_BLACK; @@ -831,11 +1042,9 @@ int main(int argc, char **argv) { setlocale(LC_ALL, ""); - strcpy(input_filename, ""); 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:ibzdeajyunt:r:l:c:-h", long_options, NULL)) != -1) { switch(c) { @@ -845,122 +1054,154 @@ int main(int argc, char **argv) { break; case 's': - pattern_separator = optarg[0]; + global_pattern_separator = optarg[0]; break; case 'x': - label_separator = optarg[0]; + if(strcmp(optarg, "\\n") == 0) { + global_label_separator = '\n'; + } else { + global_label_separator = optarg[0]; + } break; case 'v': - output_to_vt_buffer = 1; + global_output_to_vt_buffer = 1; break; case 'w': - add_control_qs = 1; + global_add_control_qs = 1; break; case 'm': - with_colors = 0; + global_with_colors = 0; break; case 'q': - error_flash = 1; - break; - - case 'f': - strncpy(input_filename, optarg, BUFFER_SIZE); + global_error_flash = 1; break; case 'i': - inverse_order = 1; + global_inverse_order = 1; break; case 'b': - bash_history = 1; + global_bash_history = 1; break; case 'z': - zsh_history = 1; + global_zsh_history = 1; break; case 'd': - remove_duplicates = 1; + global_remove_duplicates = 1; break; case 'e': - use_regexp = 1; + global_use_regexp = 1; break; case 'a': - case_sensitive = 1; + global_case_sensitive = 1; + break; + + case 'j': + global_show_long_lines = 1; + break; + + case 'y': + global_show_hits = 1; + break; + + case 'u': + global_upper_caps_makes_case_sensitive = 1; break; case 't': - free(title); - title = safe_malloc((strlen(optarg) + 1) * sizeof(char)); - strcpy(title, optarg); + free(global_title); + global_title = safe_malloc((strlen(optarg) + 1) * sizeof(char)); + strcpy(global_title, optarg); break; - case 'l': - nb_lines_max = string_to_positive_integer(optarg); + case OPT_DELETE_REGEXP: + free(global_prefix_regexp); + global_prefix_regexp = safe_malloc(sizeof(*global_prefix_regexp)); + + if(regcomp(global_prefix_regexp, optarg, 0)) { + fprintf(stderr, "selector: Regexp syntax error `%s'.\n", optarg); + exit(EXIT_FAILURE); + } break; - case 'c': - s = optarg; - color_fg_modeline = string_to_positive_integer(s); - while(*s && *s != ',') s++; if(*s == ',') { s++; } - color_bg_modeline = string_to_positive_integer(s); - while(*s && *s != ',') s++; if(*s == ',') { s++; } - color_fg_highlight = string_to_positive_integer(s); - while(*s && *s != ',') s++; if(*s == ',') { s++; } - color_bg_highlight = string_to_positive_integer(s); + case 'r': + strcpy(pattern, optarg); break; - case '-': - rest_are_files = 1; + case 'l': + str_to_positive_integers(optarg, &global_nb_lines_max, 1); + break; + + case 'c': + str_to_positive_integers(optarg, colors, 4); + color_fg_modeline = colors[0]; + color_bg_modeline = colors[1]; + color_fg_highlight = colors[2]; + color_bg_highlight = colors[3]; break; case 'h': show_help = 1; break; + case OPT_BASH_MODE: + /* Same as -c 7,4,0,3 -q */ + /* color_fg_modeline = 7; */ + /* color_bg_modeline = 4; */ + /* color_fg_highlight = 0; */ + /* color_bg_highlight = 3; */ + /* error_flash = 1; */ + /* Same as -b -i -d -v -w */ + global_bash_history = 1; + global_inverse_order = 1; + global_remove_duplicates = 1; + global_output_to_vt_buffer = 1; + global_add_control_qs = 1; + bash_histsize = getenv("HISTSIZE"); + if(bash_histsize) { + str_to_positive_integers(bash_histsize, &global_nb_lines_max, 1); + } + break; + default: error = 1; break; } } - if(show_help || error) { - if(error) { - print_help(stderr); - exit(EXIT_FAILURE); - } else { - print_help(stdout); - exit(EXIT_SUCCESS); - } + if(error) { + usage(stderr); + exit(EXIT_FAILURE); + } + + if(show_help) { + usage(stdout); + exit(EXIT_SUCCESS); } - lines = safe_malloc(nb_lines_max * sizeof(char *)); + lines = safe_malloc(global_nb_lines_max * sizeof(char *)); nb_lines = 0; - if(remove_duplicates) { - hash_table = new_hash_table(nb_lines_max * 10); + if(global_remove_duplicates) { + hash_table = new_hash_table(global_nb_lines_max * 10); } else { hash_table = 0; } - if(input_filename[0]) { - read_file(hash_table, - input_filename, - nb_lines_max, &nb_lines, lines); - } - while(optind < argc) { read_file(hash_table, argv[optind], - nb_lines_max, &nb_lines, lines); + global_nb_lines_max, &nb_lines, lines); optind++; } @@ -979,7 +1220,7 @@ int main(int argc, char **argv) { nb_lines = n; - if(inverse_order) { + if(global_inverse_order) { for(l = 0; l < nb_lines / 2; l++) { char *s = lines[nb_lines - 1 - l]; lines[nb_lines - 1 - l] = lines[l]; @@ -999,7 +1240,7 @@ int main(int argc, char **argv) { const char *u; t = lines[l]; - while(*t && *t != label_separator) { + while(*t && *t != global_label_separator) { u = unctrl(*t++); e += strlen(u); } @@ -1007,15 +1248,13 @@ int main(int argc, char **argv) { labels[l] = safe_malloc((e + 1) * sizeof(char)); t = lines[l]; s = labels[l]; - while(*t && *t != label_separator) { + while(*t && *t != global_label_separator) { u = unctrl(*t++); while(*u) { *s++ = *u++; } } *s = '\0'; } - pattern[0] = '\0'; - cursor_position = 0; /* Here we start to display with curse */ @@ -1028,11 +1267,12 @@ int main(int argc, char **argv) { /* So that the arrow keys work */ keypad(stdscr, TRUE); - attr_error = A_STANDOUT; - attr_modeline = A_REVERSE; - attr_focus_line = A_STANDOUT; + global_attr_error = A_STANDOUT; + global_attr_modeline = A_REVERSE; + global_attr_focus_line = A_STANDOUT; + global_attr_hits = A_BOLD; - if(with_colors && has_colors()) { + if(global_with_colors && has_colors()) { start_color(); @@ -1042,24 +1282,25 @@ int main(int argc, char **argv) { color_bg_highlight < 0 || color_bg_highlight >= COLORS) { echo(); endwin(); - fprintf(stderr, "Selector: Color numbers have to be between 0 and %d.\n", + fprintf(stderr, "selector: Color numbers have to be between 0 and %d.\n", COLORS - 1); exit(EXIT_FAILURE); } init_pair(1, color_fg_modeline, color_bg_modeline); - attr_modeline = COLOR_PAIR(1); + global_attr_modeline = COLOR_PAIR(1); init_pair(2, color_fg_highlight, color_bg_highlight); - attr_focus_line = COLOR_PAIR(2); + global_attr_focus_line = COLOR_PAIR(2); init_pair(3, COLOR_WHITE, COLOR_RED); - attr_error = COLOR_PAIR(3); + global_attr_error = COLOR_PAIR(3); } current_focus_line = 0; displayed_focus_line = 0; + cursor_position = strlen(pattern); update_screen(¤t_focus_line, &displayed_focus_line, 0, @@ -1132,11 +1373,11 @@ int main(int argc, char **argv) { } else if(key == '\022') { /* ^R */ - use_regexp = !use_regexp; + global_use_regexp = !global_use_regexp; } else if(key == '\011') { /* ^I */ - case_sensitive = !case_sensitive; + global_case_sensitive = !global_case_sensitive; } else if(key == '\025') { /* ^U */ @@ -1153,48 +1394,61 @@ int main(int argc, char **argv) { clear(); } + else if(key == '\007' || /* ^G */ + key == '\033' || /* ^[ (escape) */ + key == '\n' || + key == KEY_ENTER) { + done = 1; + } + + else if(key == KEY_RESIZE || key == -1) { + /* Do nothing when the tty is resized */ + } + + else { + /* Unknown key */ + error_feedback(); + } + update_screen(¤t_focus_line, &displayed_focus_line, motion, nb_lines, labels, cursor_position, pattern); - } while(key != '\007' && /* ^G */ - key != '\033' && /* ^[ (escape) */ - key != '\n' && - key != KEY_ENTER); + } while(!done); echo(); endwin(); /* Here we come back to standard display */ - if((key == KEY_ENTER || key == '\n')) { + if(key == KEY_ENTER || key == '\n') { char *t; if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) { t = lines[displayed_focus_line]; - if(label_separator) { - while(*t && *t != label_separator) t++; + if(global_label_separator) { + while(*t && *t != global_label_separator) t++; if(*t) t++; } } else { t = 0; } - if(output_to_vt_buffer && t) { - inject_into_tty_buffer(t, add_control_qs); + if(global_output_to_vt_buffer && t) { + inject_into_tty_buffer(t, global_add_control_qs); } if(output_filename[0]) { FILE *out = fopen(output_filename, "w"); if(out) { if(t) { - fprintf(out, t); + fprintf(out, "%s", t); } 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); } @@ -1212,7 +1466,12 @@ int main(int argc, char **argv) { free(labels); free(lines); - free(title); + free(global_title); + + if(global_prefix_regexp) { + regfree(global_prefix_regexp); + free(global_prefix_regexp); + } exit(EXIT_SUCCESS); }