X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=77ab6036921b9dfde551ef2b8f860d787b2994f0;hb=ca3e09ab0e4ffc59ba170094421571ada871adbb;hp=a4d9ee5b06be1fa2c23cac0bd9ba0a67440c5b6a;hpb=f18a4423d8eb4fe2d3afb792ac5dbadfbc30bd74;p=selector.git diff --git a/selector.c b/selector.c index a4d9ee5..77ab603 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, 2010, 2011 Francois Fleuret + * Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret * Written by Francois Fleuret * * This file is part of selector. @@ -45,9 +45,9 @@ #include #include -#define VERSION "1.1.5" +#define VERSION "1.1.7" -#define BUFFER_SIZE 4096 +#define BUFFER_SIZE 16384 /* Yeah, global variables! */ @@ -191,7 +191,7 @@ void usage(FILE *out) { 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"); @@ -206,6 +206,8 @@ void usage(FILE *out) { fprintf(out, " -- all following arguments are filenames\n"); fprintf(out, " -t , --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"); @@ -214,7 +216,8 @@ void usage(FILE *out) { 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"); @@ -320,8 +323,9 @@ struct matcher { }; /* 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; @@ -334,8 +338,8 @@ int add_interval(int n, int *switches, int start, int end) { while(g < n && switches[g] <= end) { g++; } if(f == n) { - /* switches[n] start end */ - /* XXXXXXXXXX| */ + /* switches[n-1] start end */ + /* XXXXXXXXXXXX| */ switches[f] = start; switches[f+1] = end; return n + 2; @@ -389,6 +393,7 @@ int add_interval(int n, int *switches, int start, int end) { 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; } @@ -409,30 +414,23 @@ int match(struct matcher *matcher, char *string, int *nb_switches, int *switches *nb_switches = add_interval(*nb_switches, switches, (int) (where - string), (int) (where - string) + strlen(matcher->patterns[n])); - #warning CHECK THE INTERVALS - { - int k, i; - FILE *out = fopen("/tmp/intervals", "w"); - for(k = 0; k < (*nb_switches)/2; k++) { - i = 0; - for(; i < switches[2 * k]; i++) fprintf(out, "-"); - for(; i < switches[2 * k + 1]; i++) fprintf(out, "%c", string[i]); - for(; i < strlen(string); i++) fprintf(out, "-"); - fprintf(out, "\n"); - } - fclose(out); - for(k = 0; k < *nb_switches - 1; k++) { - if(switches[k] > switches[k+1]) { - abort(); - } - } - } } } } 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; + } } } @@ -576,7 +574,6 @@ int next_visible(int current_line, int nb_lines, char **lines, /*********************************************************************/ 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) { @@ -595,10 +592,10 @@ void print_string_with_switches(char *buffer, int line_width, } } 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); } } @@ -630,8 +627,12 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, 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; } @@ -742,35 +743,37 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, 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, - nb_switches / 2, 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, - nb_switches / 2, switches); } nb_printed_lines++; @@ -921,6 +924,7 @@ void read_file(struct hash_table_t *hash_table, char raw_line[BUFFER_SIZE]; char *s; FILE *file; + int l; file = fopen(input_filename, "r"); @@ -929,11 +933,22 @@ void read_file(struct hash_table_t *hash_table, 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); @@ -963,8 +978,10 @@ static struct option long_options[] = { { "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 }, @@ -996,6 +1013,8 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } + pattern[0] = '\0'; + color_fg_modeline = COLOR_WHITE; color_bg_modeline = COLOR_BLACK; color_fg_highlight = COLOR_BLACK; @@ -1005,7 +1024,7 @@ int main(int argc, char **argv) { 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) { @@ -1019,7 +1038,11 @@ int main(int argc, char **argv) { break; case 'x': - label_separator = optarg[0]; + if(strcmp(optarg, "\\n") == 0) { + label_separator = '\n'; + } else { + label_separator = optarg[0]; + } break; case 'v': @@ -1080,6 +1103,10 @@ int main(int argc, char **argv) { strcpy(title, optarg); break; + case 'r': + strcpy(pattern, optarg); + break; + case 'l': str_to_positive_integers(optarg, &nb_lines_max, 1); break; @@ -1198,8 +1225,6 @@ int main(int argc, char **argv) { *s = '\0'; } - pattern[0] = '\0'; - cursor_position = 0; /* Here we start to display with curse */ @@ -1245,6 +1270,7 @@ int main(int argc, char **argv) { current_focus_line = 0; displayed_focus_line = 0; + cursor_position = strlen(pattern); update_screen(¤t_focus_line, &displayed_focus_line, 0,