X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=0efdd1cc800dbf8de7004d500af41bb19c48275e;hb=496ff801c25b7be6c45b97e141f4890809f4fd08;hp=ddddb112f95f0f6f596365354154950388401b80;hpb=5f6df6ed91c745f06cdaec8983a7b1485994da39;p=selector.git diff --git a/selector.c b/selector.c index ddddb11..0efdd1c 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, 2012 Francois Fleuret + * Copyright (c) 2009-2013 Francois Fleuret * Written by Francois Fleuret * * This file is part of selector. @@ -33,6 +33,7 @@ #include #include +#include #include #include #include @@ -45,9 +46,9 @@ #include #include -#define VERSION "1.1.6" +#define VERSION "1.1.7" -#define BUFFER_SIZE 4096 +#define BUFFER_SIZE 16384 /* Yeah, global variables! */ @@ -79,7 +80,7 @@ void *safe_malloc(size_t n) { 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; @@ -191,7 +192,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"); @@ -203,9 +204,12 @@ void usage(FILE *out) { 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>\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 +218,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"); @@ -335,7 +340,7 @@ int add_interval(int n, int *switches, int start, int end) { while(g < n && switches[g] <= end) { g++; } if(f == n) { - /* switches[n-1] start end */ + /* switches[f-1] start end */ /* XXXXXXXXXXXX| */ switches[f] = start; switches[f+1] = end; @@ -571,7 +576,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) { @@ -590,10 +594,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); } } @@ -741,36 +745,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,19 +926,31 @@ 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"); 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); @@ -966,6 +983,7 @@ static struct option long_options[] = { { "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 }, @@ -992,11 +1010,16 @@ int main(int argc, char **argv) { struct hash_table_t *hash_table; char *bash_histsize; + /* Group and others have no access to created files */ + umask(S_IRWXG | S_IRWXO); + if(!isatty(STDIN_FILENO)) { fprintf(stderr, "selector: The standard input is not a tty.\n"); exit(EXIT_FAILURE); } + pattern[0] = '\0'; + color_fg_modeline = COLOR_WHITE; color_bg_modeline = COLOR_BLACK; color_fg_highlight = COLOR_BLACK; @@ -1006,7 +1029,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) { @@ -1020,7 +1043,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': @@ -1081,6 +1108,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; @@ -1199,8 +1230,6 @@ int main(int argc, char **argv) { *s = '\0'; } - pattern[0] = '\0'; - cursor_position = 0; /* Here we start to display with curse */ @@ -1246,6 +1275,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, @@ -1393,7 +1423,7 @@ int main(int argc, char **argv) { 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); }