X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=5054f6b6a0050490b4e19d59b208e5ad4eceec0b;hb=31d6b34af7e6587c8eecabeb44da4de86ec93f3d;hp=41f29e01d1f6fb23fe1309d8aefbc372642b7d05;hpb=10592c71e9df8aa493b039873a7668b09e974a9c;p=selector.git diff --git a/selector.c b/selector.c index 41f29e0..5054f6b 100644 --- a/selector.c +++ b/selector.c @@ -35,14 +35,16 @@ #include #include #include +#include #include #include #include #include #include #include +#include -#define VERSION "1.0" +#define VERSION "1.0.1" #define BUFFER_SIZE 4096 @@ -65,9 +67,22 @@ int error_flash = 0; int attr_modeline, attr_focus_line, attr_error; +/********************************************************************/ + +/* malloc with error checking. */ + +void *safe_malloc(size_t n) { + void *p = malloc(n); + if (!p && n != 0) { + printf("Can not allocate memory: %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + return p; +} + /*********************************************************************/ -void inject_into_tty_buffer(char *string) { +void inject_into_tty_buffer(char *string, int add_control_qs) { struct termios oldtio, newtio; const char *k; const char control_q = '\021'; @@ -91,9 +106,9 @@ void inject_into_tty_buffer(char *string) { void check_opt(int argc, char **argv, int n_opt, int n, const char *help) { if(n_opt + n >= argc) { - fprintf(stderr, "Missing argument for %s, expecting %s.\n", + fprintf(stderr, "Selector: Missing argument for %s, expecting %s.\n", argv[n_opt], help); - exit(1); + exit(EXIT_FAILURE); } } @@ -102,8 +117,9 @@ int string_to_positive_integer(char *string) { int result = 0; char *s; + printf("string_to_positive_integer string=\"%s\"\n", string); if(*string) { - for(s = string; *s; s++) { + for(s = string; *s && *s != ','; s++) { if(*s >= '0' && *s <= '9') { result = result * 10 + (int) (*s - '0'); } else error = 1; @@ -111,8 +127,10 @@ int string_to_positive_integer(char *string) { } else error = 1; if(error) { - fprintf(stderr, "Value `%s' is not a positive integer.\n", string); - exit(1); + fprintf(stderr, + "Selector: Value `%s' is not a positive integer.\n", + string); + exit(EXIT_FAILURE); } return result; @@ -126,25 +144,61 @@ void error_feedback() { } } +void print_help(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, " 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, " set a file to write the selected line to\n"); + fprintf(out, " -s <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, " set the maximum number of lines to take into account\n"); + fprintf(out, "\n"); +} + +/*********************************************************************/ + /* A quick and dirty hash table */ -/* 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. */ +/* 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. */ -typedef struct { +struct hash_table_t { int size; int *entries; -} hash_table_t; +}; -hash_table_t *new_hash_table(int size) { +struct hash_table_t *new_hash_table(int size) { int k; - hash_table_t *hash_table; + struct hash_table_t *hash_table; - hash_table = (hash_table_t *) malloc(sizeof(hash_table_t)); + hash_table = safe_malloc(sizeof(struct hash_table_t)); hash_table->size = size; - hash_table->entries = (int *) malloc(hash_table->size * sizeof(int)); + hash_table->entries = safe_malloc(hash_table->size * sizeof(int)); for(k = 0; k < hash_table->size; k++) { hash_table->entries[k] = -1; @@ -153,7 +207,7 @@ hash_table_t *new_hash_table(int size) { return hash_table; } -void free_hash_table(hash_table_t *hash_table) { +void free_hash_table(struct hash_table_t *hash_table) { free(hash_table->entries); free(hash_table); } @@ -162,7 +216,7 @@ void free_hash_table(hash_table_t *hash_table) { string was not already in the table, returns -1. Otherwise, returns the previous index it had. */ -int add_and_get_previous_index(hash_table_t *hash_table, +int add_and_get_previous_index(struct hash_table_t *hash_table, const char *new_string, int new_index, char **strings) { @@ -248,7 +302,8 @@ void initialize_matcher(int use_regexp, int case_sensitive, if(use_regexp) { matcher->nb_patterns = -1; - matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE); + matcher->regexp_error = regcomp(&matcher->preg, pattern, + case_sensitive ? 0 : REG_ICASE); } else { matcher->regexp_error = 0; matcher->nb_patterns = 1; @@ -260,8 +315,11 @@ void initialize_matcher(int use_regexp, int case_sensitive, } } - matcher->splitted_patterns = (char *) malloc((strlen(pattern) + 1) * sizeof(char)); - matcher->patterns = (char **) malloc(matcher->nb_patterns * sizeof(char *)); + matcher->splitted_patterns = + safe_malloc((strlen(pattern) + 1) * sizeof(char)); + + matcher->patterns = + safe_malloc(matcher->nb_patterns * sizeof(char *)); strcpy(matcher->splitted_patterns, pattern); @@ -338,13 +396,15 @@ 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, int nb_lines, char **lines, + matcher_t *matcher) { int line = current_line - 1; while(line >= 0 && !match(lines[line], matcher)) line--; return line; } -int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matcher) { +int next_visible(int current_line, int nb_lines, char **lines, + matcher_t *matcher) { int line = current_line + 1; while(line < nb_lines && !match(lines[line], matcher)) line++; @@ -356,15 +416,14 @@ int next_visible(int current_line, int nb_lines, char **lines, matcher_t *matche /*********************************************************************/ -/* The value passed to this routine in current_focus_line is the index - of the line we should have highlighted if there was no motion and if - it matched the matcher. So, the line actually highlighted is the - first one matching the matcher in that order: (1) - current_focus_line after motion, (2) the first with a greater - index, (3) the first with a lesser index. +/* 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) + the first with a lesser index. The index of the line actually shown highlighted is written in - displayed_focus_line (it can be -1) + displayed_focus_line (it can be -1 if no line at all matches the + matcher) If there is a motion and a line is actually shown highlighted, its value is written in current_focus_line. */ @@ -389,22 +448,30 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, use_default_colors(); + /* Add an empty line where we will print the modeline at the end */ + addstr("\n"); - /* First, we find a visible line. */ + /* If the regexp is erroneous, print a message saying so */ if(matcher.regexp_error) { attron(attr_error); addnstr("Regexp syntax error", console_width); attroff(attr_error); - } else if(nb_lines > 0) { + } + + /* 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)) { new_focus_line = *current_focus_line; } else { - new_focus_line = next_visible(*current_focus_line, nb_lines, lines, &matcher); + 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, nb_lines, lines, + &matcher); } } @@ -431,17 +498,20 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, } } - /* Here new_focus_line is either a line number matching the pattern, or -1 */ + /* Here new_focus_line is either a line number matching the + pattern, or -1 */ if(new_focus_line >= 0) { - int first_line = new_focus_line, last_line = new_focus_line, nb_match = 1; + 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 console_height-1 */ - while(nb_match < console_height-1 && (first_line > 0 || last_line < nb_lines - 1)) { + while(nb_match < console_height-1 && + (first_line > 0 || last_line < nb_lines - 1)) { if(first_line > 0) { first_line--; @@ -519,7 +589,11 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, addnstr("No selection", console_width); attroff(attr_error); } - } else { + } + + /* Else, print a message saying that there are no lines to select from */ + + else { attron(attr_error); addnstr("Empty choice", console_width); attroff(attr_error); @@ -563,6 +637,9 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, addstr(" "); } + /* Add a few info about the mode we are in (regexp and/or case + sensitive) */ + if(use_regexp || case_sensitive) { addstr(" ["); if(use_regexp) { @@ -590,38 +667,39 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, /*********************************************************************/ -void store_line(hash_table_t *hash_table, - const char *t, - int nb_lines_max, int *nb_lines, char **lines) { +void store_line(struct hash_table_t *hash_table, + const char *new_line, + int *nb_lines, char **lines) { int dup; /* Remove the zsh history prefix */ - if(zsh_history && *t == ':') { - while(*t && *t != ';') t++; - if(*t == ';') t++; + if(zsh_history && *new_line == ':') { + while(*new_line && *new_line != ';') new_line++; + if(*new_line == ';') new_line++; } /* Remove the bash history prefix */ if(bash_history) { - while(*t == ' ') t++; - while(*t >= '0' && *t <= '9') t++; - while(*t == ' ') t++; + while(*new_line == ' ') new_line++; + while(*new_line >= '0' && *new_line <= '9') new_line++; + while(*new_line == ' ') new_line++; } /* Check for duplicates with the hash table and insert the line in the list if necessary */ if(hash_table) { - dup = add_and_get_previous_index(hash_table, t, *nb_lines, lines); + dup = add_and_get_previous_index(hash_table, + new_line, *nb_lines, lines); } else { dup = -1; } if(dup < 0) { - lines[*nb_lines] = (char *) malloc((strlen(t) + 1) * sizeof(char)); - strcpy(lines[*nb_lines], t); + lines[*nb_lines] = safe_malloc((strlen(new_line) + 1) * sizeof(char)); + strcpy(lines[*nb_lines], new_line); } else { /* The string was already in there, so we do not allocate a new string but use the pointer to the first occurence of it */ @@ -632,28 +710,34 @@ void store_line(hash_table_t *hash_table, (*nb_lines)++; } -void read_file(hash_table_t *hash_table, +void read_file(struct hash_table_t *hash_table, const char *input_filename, int nb_lines_max, int *nb_lines, char **lines) { char raw_line[BUFFER_SIZE]; - int start, end, k; + int start, end, eol, k; FILE *file; file = fopen(input_filename, "r"); if(!file) { - fprintf(stderr, "Can not open `%s'.\n", input_filename); - exit(1); + fprintf(stderr, "Selector: Can not open `%s'.\n", input_filename); + exit(EXIT_FAILURE); } start = 0; end = 0; while(*nb_lines < nb_lines_max && (end > start || !feof(file))) { - int eol = start; + 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]; @@ -665,18 +749,25 @@ void read_file(hash_table_t *hash_table, while(eol < end && raw_line[eol] != '\n') eol++; } + /* 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, "Line too long (max is %d characters):\n", BUFFER_SIZE); + fprintf(stderr, "Selector: Line too long (max is %d characters):\n", + BUFFER_SIZE); fprintf(stderr, raw_line); fprintf(stderr, "\n"); - exit(1); + exit(EXIT_FAILURE); } + /* 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_max, nb_lines, lines); + nb_lines, lines); start = eol + 1; } @@ -686,11 +777,35 @@ void read_file(hash_table_t *hash_table, /*********************************************************************/ +static struct option long_options[] = { + { "output-file", 1, 0, 'o' }, + { "separator-patterns", 1, 0, 's' }, + { "separator-display", 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' }, + { "title", 1, 0, 't' }, + { "number-of-lines", 1, 0, 'l' }, + { "colors", 1, 0, 'c' }, + { "rest-are-files", no_argument, 0, '-' }, + { "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 pattern[BUFFER_SIZE]; - int i, k, l, n; + int k, l, n; int cursor_position; int error = 0, show_help = 0; int rest_are_files = 0; @@ -702,11 +817,11 @@ int main(int argc, char **argv) { char **lines, **labels; int nb_lines; - hash_table_t *hash_table; + struct hash_table_t *hash_table; - if(!ttyname(STDIN_FILENO)) { - fprintf(stderr, "The standard input is not a tty.\n"); - exit(1); + if(!isatty(STDIN_FILENO)) { + fprintf(stderr, "Selector: The standard input is not a tty.\n"); + exit(EXIT_FAILURE); } color_fg_modeline = COLOR_WHITE; @@ -719,156 +834,114 @@ int main(int argc, char **argv) { strcpy(input_filename, ""); strcpy(output_filename, ""); - i = 1; - while(!error && !show_help && i < argc && argv[i][0] == '-' && !rest_are_files) { + while (!rest_are_files && + (c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeat:l:c:-h", + long_options, NULL)) != -1) { - if(strcmp(argv[i], "-o") == 0) { - check_opt(argc, argv, i, 1, "<output filename>"); - strncpy(output_filename, argv[i+1], BUFFER_SIZE); - i += 2; - } + switch(c) { - else if(strcmp(argv[i], "-s") == 0) { - check_opt(argc, argv, i, 1, "<pattern separator>"); - pattern_separator = argv[i+1][0]; - i += 2; - } + case 'o': + strncpy(output_filename, optarg, BUFFER_SIZE); + break; - else if(strcmp(argv[i], "-x") == 0) { - check_opt(argc, argv, i, 1, "<label separator>"); - label_separator = argv[i+1][0]; - i += 2; - } + case 's': + pattern_separator = optarg[0]; + break; + + case 'x': + label_separator = optarg[0]; + break; - else if(strcmp(argv[i], "-v") == 0) { + case 'v': output_to_vt_buffer = 1; - i++; - } + break; - else if(strcmp(argv[i], "-w") == 0) { + case 'w': add_control_qs = 1; - i++; - } + break; - else if(strcmp(argv[i], "-m") == 0) { + case 'm': with_colors = 0; - i++; - } + break; - else if(strcmp(argv[i], "-q") == 0) { + case 'q': error_flash = 1; - i++; - } + break; - else if(strcmp(argv[i], "-f") == 0) { - check_opt(argc, argv, i, 1, "<input filename>"); - strncpy(input_filename, argv[i+1], BUFFER_SIZE); - i += 2; - } + case 'f': + strncpy(input_filename, optarg, BUFFER_SIZE); + break; - else if(strcmp(argv[i], "-i") == 0) { + case 'i': inverse_order = 1; - i++; - } + break; - else if(strcmp(argv[i], "-b") == 0) { + case 'b': bash_history = 1; - i++; - } + break; - else if(strcmp(argv[i], "-z") == 0) { + case 'z': zsh_history = 1; - i++; - } + break; - else if(strcmp(argv[i], "-d") == 0) { + case 'd': remove_duplicates = 1; - i++; - } + break; - else if(strcmp(argv[i], "-e") == 0) { + case 'e': use_regexp = 1; - i++; - } + break; - else if(strcmp(argv[i], "-a") == 0) { + case 'a': case_sensitive = 1; - i++; - } + break; - else if(strcmp(argv[i], "-t") == 0) { - check_opt(argc, argv, i, 1, "<title>"); + case 't': free(title); - title = (char *) malloc((strlen(argv[i+1]) + 1) * sizeof(char)); - strcpy(title, argv[i+1]); - i += 2; - } - - else if(strcmp(argv[i], "-l") == 0) { - check_opt(argc, argv, i, 1, "<maximum number of lines>"); - nb_lines_max = string_to_positive_integer(argv[i+1]); - i += 2; - } - - else if(strcmp(argv[i], "-c") == 0) { - check_opt(argc, argv, i, 4, "<fg modeline> <bg modeline> <fg highlight> <bg highlight>"); - color_fg_modeline = string_to_positive_integer(argv[i + 1]); - color_bg_modeline = string_to_positive_integer(argv[i + 2]); - color_fg_highlight = string_to_positive_integer(argv[i + 3]); - color_bg_highlight = string_to_positive_integer(argv[i + 4]); - i += 5; - } - - else if(strcmp(argv[i], "--") == 0) { + title = safe_malloc((strlen(optarg) + 1) * sizeof(char)); + strcpy(title, optarg); + break; + + case 'l': + nb_lines_max = string_to_positive_integer(optarg); + 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); + break; + + case '-': rest_are_files = 1; - i++; - } + break; - else if(strcmp(argv[i], "-h") == 0) { + case 'h': show_help = 1; - i++; - } + break; - else { - fprintf(stderr, "Unknown option %s.\n", argv[i]); + default: error = 1; + break; } } if(show_help || error) { - fprintf(stderr, "Selector version %s-R%s\n", VERSION, REVISION_NUMBER); - fprintf(stderr, "Written by Francois Fleuret <francois@fleuret.org>.\n"); - fprintf(stderr, "Usage: %s [options] [<filename1> [<filename2> ...]]\n", argv[0]); - fprintf(stderr, "\n"); - fprintf(stderr, " -h show this help\n"); - fprintf(stderr, " -v inject the selected line in the tty\n"); - fprintf(stderr, " -w quote control characters with ^Qs when using -v\n"); - fprintf(stderr, " -d remove duplicated lines\n"); - fprintf(stderr, " -b remove the bash history line prefix\n"); - fprintf(stderr, " -z remove the zsh history line prefix\n"); - fprintf(stderr, " -i invert the order of lines\n"); - fprintf(stderr, " -e start in regexp mode\n"); - fprintf(stderr, " -a start in case sensitive mode\n"); - fprintf(stderr, " -m monochrome mode\n"); - fprintf(stderr, " -q make a flash instead of a beep on an edition error\n"); - fprintf(stderr, " -- all following arguments are filenames\n"); - fprintf(stderr, " -t <title>\n"); - fprintf(stderr, " add a title in the modeline\n"); - fprintf(stderr, " -c <fg modeline> <bg modeline> <fg highlight> <bg highlight>\n"); - fprintf(stderr, " set the display colors\n"); - fprintf(stderr, " -o <output filename>\n"); - fprintf(stderr, " set a file to write the selected line to\n"); - fprintf(stderr, " -s <pattern separator>\n"); - fprintf(stderr, " set the symbol to separate substrings in the pattern\n"); - fprintf(stderr, " -x <label separator>\n"); - fprintf(stderr, " set the symbol to terminate the label\n"); - fprintf(stderr, " -l <max number of lines>\n"); - fprintf(stderr, " set the maximum number of lines to take into account\n"); - fprintf(stderr, "\n"); - exit(error); + if(error) { + print_help(stderr); + exit(EXIT_FAILURE); + } else { + print_help(stdout); + exit(EXIT_SUCCESS); + } } - lines = (char **) malloc(nb_lines_max * sizeof(char *)); + lines = safe_malloc(nb_lines_max * sizeof(char *)); nb_lines = 0; @@ -884,11 +957,11 @@ int main(int argc, char **argv) { nb_lines_max, &nb_lines, lines); } - while(i < argc) { + while(optind < argc) { read_file(hash_table, - argv[i], + argv[optind], nb_lines_max, &nb_lines, lines); - i++; + optind++; } if(hash_table) { @@ -907,10 +980,10 @@ int main(int argc, char **argv) { nb_lines = n; if(inverse_order) { - for(i = 0; i < nb_lines / 2; i++) { - char *s = lines[nb_lines - 1 - i]; - lines[nb_lines - 1 - i] = lines[i]; - lines[i] = s; + for(l = 0; l < nb_lines / 2; l++) { + char *s = lines[nb_lines - 1 - l]; + lines[nb_lines - 1 - l] = lines[l]; + lines[l] = s; } } @@ -918,18 +991,20 @@ int main(int argc, char **argv) { label_separator and transform control characters to printable ones */ - labels = (char **) malloc(nb_lines * sizeof(char *)); + labels = safe_malloc(nb_lines * sizeof(char *)); for(l = 0; l < nb_lines; l++) { char *s, *t; int e = 0; const char *u; t = lines[l]; + while(*t && *t != label_separator) { u = unctrl(*t++); e += strlen(u); } - labels[l] = (char *) malloc((e + 1) * sizeof(char)); + + labels[l] = safe_malloc((e + 1) * sizeof(char)); t = lines[l]; s = labels[l]; while(*t && *t != label_separator) { @@ -948,7 +1023,6 @@ int main(int argc, char **argv) { initscr(); cbreak(); noecho(); - /* nonl(); */ intrflush(stdscr, FALSE); /* So that the arrow keys work */ @@ -968,8 +1042,9 @@ int main(int argc, char **argv) { color_bg_highlight < 0 || color_bg_highlight >= COLORS) { echo(); endwin(); - fprintf(stderr, "Color numbers have to be between 0 and %d.\n", COLORS - 1); - exit(1); + 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); @@ -1073,7 +1148,8 @@ int main(int argc, char **argv) { } else if(key == '\014') { /* ^L */ - /* I suspect that we may sometime mess up the display */ + /* I suspect that we may sometime mess up the display, so ^L is + here to force a full refresh */ clear(); } @@ -1106,7 +1182,7 @@ int main(int argc, char **argv) { } if(output_to_vt_buffer && t) { - inject_into_tty_buffer(t); + inject_into_tty_buffer(t, add_control_qs); } if(output_filename[0]) { @@ -1117,8 +1193,10 @@ int main(int argc, char **argv) { } fprintf(out, "\n"); } else { - fprintf(stderr, "Can not open %s for writing.\n", output_filename); - exit(1); + fprintf(stderr, + "Selector: Can not open %s for writing.\n", + output_filename); + exit(EXIT_FAILURE); } fclose(out); } @@ -1136,5 +1214,5 @@ int main(int argc, char **argv) { free(lines); free(title); - exit(0); + exit(EXIT_SUCCESS); }