X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=selector.c;h=95d8968b6d41796798488502838904bd9f2da3de;hb=544f3784539dd637048cd0355fdba21e2ea825b6;hp=1b18ba3436328fc29a129a3d1d38becbdccf766c;hpb=0aa66afd075bf9f4ba8e79d9d6cbdb334ed6cebe;p=selector.git diff --git a/selector.c b/selector.c index 1b18ba3..95d8968 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 -l ${HISTSIZE} <(history) */ @@ -43,6 +43,7 @@ #include #include #include +#include #define VERSION "1.1.1" @@ -140,7 +141,7 @@ void str_to_positive_integers(char *string, int *values, int nb) { } } else { fprintf(stderr, - "Selector: Empty integer value in `%s'.\n", string); + "Selector: Empty value in `%s'.\n", string); exit(EXIT_FAILURE); } } else { @@ -160,36 +161,51 @@ void error_feedback() { } } -void print_help(FILE *out) { +void usage(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, " -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\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"); } @@ -793,6 +809,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 +834,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 } }; @@ -932,6 +956,21 @@ 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; + break; + default: error = 1; break; @@ -940,10 +979,10 @@ int main(int argc, char **argv) { if(show_help || error) { if(error) { - print_help(stderr); + usage(stderr); exit(EXIT_FAILURE); } else { - print_help(stdout); + usage(stdout); exit(EXIT_SUCCESS); } }