* selector is a simple command line utility for selection of strings
* with a dynamic pattern-matching.
*
- * Copyright (c) 2009 Francois Fleuret
+ * Copyright (c) 2009, 2010 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of selector.
/*
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)
*/
#include <regex.h>
#include <locale.h>
#include <getopt.h>
+#include <limits.h>
-#define VERSION "1.0.1"
+#define VERSION "1.1.1"
#define BUFFER_SIZE 4096
/*********************************************************************/
-void check_opt(int argc, char **argv, int n_opt, int n, const char *help) {
- if(n_opt + n >= argc) {
- fprintf(stderr, "Selector: Missing argument for %s, expecting %s.\n",
- argv[n_opt], help);
- exit(EXIT_FAILURE);
- }
-}
-
-int string_to_positive_integer(char *string) {
- int error = 0;
- int result = 0;
+void str_to_positive_integers(char *string, int *values, int nb) {
+ int current_value, gotone;
char *s;
+ int n;
- printf("string_to_positive_integer string=\"%s\"\n", string);
- if(*string) {
- for(s = string; *s && *s != ','; s++) {
- if(*s >= '0' && *s <= '9') {
- result = result * 10 + (int) (*s - '0');
- } else error = 1;
+ n = 0;
+ current_value = 0;
+ gotone = 0;
+ s = string;
+
+ while(1) {
+ if(*s >= '0' && *s <= '9') {
+ current_value = current_value * 10 + (int) (*s - '0');
+ gotone = 1;
+ } else if(*s == ',' || *s == '\0') {
+ if(gotone) {
+ if(n < nb) {
+ values[n++] = current_value;
+ if(*s == '\0') {
+ if(n == nb) {
+ return;
+ } else {
+ fprintf(stderr,
+ "Selector: Missing value in `%s'.\n", string);
+ exit(EXIT_FAILURE);
+ }
+ }
+ current_value = 0;
+ gotone = 0;
+ } else {
+ fprintf(stderr,
+ "Selector: Too many values in `%s'.\n", string);
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ fprintf(stderr,
+ "Selector: Empty value in `%s'.\n", string);
+ exit(EXIT_FAILURE);
+ }
+ } else {
+ fprintf(stderr,
+ "Selector: Syntax error in `%s'.\n", string);
+ exit(EXIT_FAILURE);
}
- } else error = 1;
-
- if(error) {
- fprintf(stderr,
- "Selector: Value `%s' is not a positive integer.\n",
- string);
- exit(EXIT_FAILURE);
+ s++;
}
-
- return result;
}
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 <francois@fleuret.org>.\n");
fprintf(out, "\n");
fprintf(out, "Usage: selector [options] [<filename1> [<filename2> ...]]\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 <title>\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");
}
/*********************************************************************/
-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;
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);
}
}
} 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;
}
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
+ /* We find the first and last lines to show, so that the total
+ of visible lines between them (them included) is
console_height-1 */
while(nb_match < console_height-1 &&
/*********************************************************************/
+/* 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' },
- { "separator-patterns", 1, 0, 's' },
- { "separator-display", 1, 0, 'x' },
+ { "pattern-separator", 1, 0, 's' },
+ { "label-separator", 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' },
{ "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 }
};
int main(int argc, char **argv) {
- char input_filename[BUFFER_SIZE], output_filename[BUFFER_SIZE];
- char c, *s;
+ char output_filename[BUFFER_SIZE];
char pattern[BUFFER_SIZE];
- int k, l, n;
+ int c, k, l, n;
int cursor_position;
int error = 0, show_help = 0;
int rest_are_files = 0;
int key;
int current_focus_line, displayed_focus_line;
+ int colors[4];
int color_fg_modeline, color_bg_modeline;
int color_fg_highlight, color_bg_highlight;
setlocale(LC_ALL, "");
- strcpy(input_filename, "");
strcpy(output_filename, "");
while (!rest_are_files &&
error_flash = 1;
break;
- case 'f':
- strncpy(input_filename, optarg, BUFFER_SIZE);
- break;
-
case 'i':
inverse_order = 1;
break;
break;
case 'l':
- nb_lines_max = string_to_positive_integer(optarg);
+ str_to_positive_integers(optarg, &nb_lines_max, 1);
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);
+ str_to_positive_integers(optarg, colors, 4);
+ color_fg_modeline = colors[0];
+ color_bg_modeline = colors[1];
+ color_fg_highlight = colors[2];
+ color_bg_highlight = colors[3];
break;
case '-':
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;
if(show_help || error) {
if(error) {
- print_help(stderr);
+ usage(stderr);
exit(EXIT_FAILURE);
} else {
- print_help(stdout);
+ usage(stdout);
exit(EXIT_SUCCESS);
}
}
hash_table = 0;
}
- if(input_filename[0]) {
- read_file(hash_table,
- input_filename,
- nb_lines_max, &nb_lines, lines);
- }
-
while(optind < argc) {
read_file(hash_table,
argv[optind],
projects / selector.git / blobdiff