X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=selector.c;h=24ad55d607862c63e516db2d1da28af9897905af;hp=ff75c7adc08875111c515d695f17c9eb6a5f6d77;hb=db0d8f2855537dee1b1a39600d8acecd98f603ed;hpb=ba39a532d21befe924af75cc5f9161a4cd793147 diff --git a/selector.c b/selector.c index ff75c7a..24ad55d 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,7 +45,7 @@ #include #include -#define VERSION "1.1.5" +#define VERSION "1.1.6" #define BUFFER_SIZE 4096 @@ -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"); @@ -320,43 +320,40 @@ 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; + 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[n-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); } @@ -365,7 +362,7 @@ int add_interval(int n, int *switches, int start, int end) { 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; @@ -373,18 +370,18 @@ int add_interval(int n, int *switches, int start, int end) { 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)); } } @@ -393,6 +390,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; } @@ -418,7 +416,18 @@ int match(struct matcher *matcher, char *string, int *nb_switches, int *switches } 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; + } } } @@ -562,7 +571,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) { @@ -570,21 +578,21 @@ void print_string_with_switches(char *buffer, int line_width, 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); } } @@ -616,8 +624,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; } @@ -728,35 +740,36 @@ 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, 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'; + + print_string_with_switches(buffer, k, + nb_switches / 2, switches); } - print_string_with_switches(buffer, k, console_width, - nb_switches, switches); } nb_printed_lines++; @@ -949,6 +962,7 @@ 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' }, { "number-of-lines", 1, 0, 'l' },