#include <locale.h>
#include <getopt.h>
-#define VERSION "1.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;
- 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, " --, --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 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 &&
int main(int argc, char **argv) {
char output_filename[BUFFER_SIZE];
- char *s;
char pattern[BUFFER_SIZE];
int c, k, l, n;
int cursor_position;
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;
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 '-':
if(show_help || error) {
if(error) {
- print_help(stderr);
+ usage(stderr);
exit(EXIT_FAILURE);
} else {
- print_help(stdout);
+ usage(stdout);
exit(EXIT_SUCCESS);
}
}