* 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.
#include <locale.h>
#include <getopt.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");
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 &&
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' },
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 '-':
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],