X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=selector.c;h=edff2beafe0f7472bccffbc857e55f5c59e52b09;hp=38c62acb66ae342c259f1ed9deb7538d413e2f65;hb=c06d16d13ad754eae97cb38dd45f684e0d8f1c07;hpb=e9b84f8dd42f4c22744c0b061b876dc6eaf23722 diff --git a/selector.c b/selector.c index 38c62ac..edff2be 100644 --- a/selector.c +++ b/selector.c @@ -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) */ @@ -43,8 +43,9 @@ #include #include #include +#include -#define VERSION "1.1.1" +#define VERSION "1.1.2" #define BUFFER_SIZE 4096 @@ -127,7 +128,7 @@ void str_to_positive_integers(char *string, int *values, int nb) { return; } else { fprintf(stderr, - "Selector: Missing value in `%s'.\n", string); + "selector: Missing value in `%s'.\n", string); exit(EXIT_FAILURE); } } @@ -135,17 +136,17 @@ void str_to_positive_integers(char *string, int *values, int nb) { gotone = 0; } else { fprintf(stderr, - "Selector: Too many values in `%s'.\n", string); + "selector: Too many values in `%s'.\n", string); exit(EXIT_FAILURE); } } else { fprintf(stderr, - "Selector: Empty value in `%s'.\n", string); + "selector: Empty value in `%s'.\n", string); exit(EXIT_FAILURE); } } else { fprintf(stderr, - "Selector: Syntax error in `%s'.\n", string); + "selector: Syntax error in `%s'.\n", string); exit(EXIT_FAILURE); } s++; @@ -167,29 +168,44 @@ void usage(FILE *out) { 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, " -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, " --, --rest-are-files\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, " -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, " -x <label separator>, --label-separator <label separator>\n"); fprintf(out, " set the symbol to terminate the label\n"); - fprintf(out, " -l <max number of lines>\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"); } @@ -412,8 +428,7 @@ 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, matcher_t *matcher) { int line = current_line - 1; while(line >= 0 && !match(lines[line], matcher)) line--; return line; @@ -486,8 +501,7 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, 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); } } @@ -506,7 +520,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; } @@ -737,7 +751,7 @@ void read_file(struct hash_table_t *hash_table, file = fopen(input_filename, "r"); if(!file) { - fprintf(stderr, "Selector: Can not open `%s'.\n", input_filename); + fprintf(stderr, "selector: Can not open `%s'.\n", input_filename); exit(EXIT_FAILURE); } @@ -770,7 +784,7 @@ void read_file(struct hash_table_t *hash_table, if(eol == BUFFER_SIZE) { raw_line[BUFFER_SIZE - 1] = '\0'; - fprintf(stderr, "Selector: Line too long (max is %d characters):\n", + fprintf(stderr, "selector: Line too long (max is %d characters):\n", BUFFER_SIZE); fprintf(stderr, raw_line); fprintf(stderr, "\n"); @@ -793,6 +807,13 @@ 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 +}; + static struct option long_options[] = { { "output-file", 1, 0, 'o' }, { "pattern-separator", 1, 0, 's' }, @@ -811,6 +832,7 @@ static struct option long_options[] = { { "number-of-lines", 1, 0, 'l' }, { "colors", 1, 0, 'c' }, { "rest-are-files", no_argument, 0, '-' }, + { "bash", no_argument, 0, OPT_BASH_MODE }, { "help", no_argument, 0, 'h' }, { 0, 0, 0, 0 } }; @@ -833,9 +855,10 @@ int main(int argc, char **argv) { 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); } @@ -932,20 +955,39 @@ int main(int argc, char **argv) { 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 */ + bash_history = 1; + inverse_order = 1; + remove_duplicates = 1; + output_to_vt_buffer = 1; + add_control_qs = 1; + bash_histsize = getenv("HISTSIZE"); + if(bash_histsize) { + str_to_positive_integers(bash_histsize, &nb_lines_max, 1); + } + break; + default: error = 1; break; } } - if(show_help || error) { - if(error) { - usage(stderr); - exit(EXIT_FAILURE); - } else { - usage(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 *)); @@ -1043,7 +1085,7 @@ 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); } @@ -1195,7 +1237,7 @@ int main(int argc, char **argv) { fprintf(out, "\n"); } else { fprintf(stderr, - "Selector: Can not open %s for writing.\n", + "selector: Can not open %s for writing.\n", output_filename); exit(EXIT_FAILURE); }