* selector is a simple command line utility for selection of strings
* with a dynamic pattern-matching.
*
- * Copyright (c) 2009, 2010, 2011 Francois Fleuret
+ * Copyright (c) 2009-2015 Francois Fleuret
* Written by Francois Fleuret <francois@fleuret.org>
*
* This file is part of selector.
#include <stdio.h>
#include <stdlib.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <getopt.h>
#include <limits.h>
-#define VERSION "1.1.4"
+#define VERSION "1.1.8"
-#define BUFFER_SIZE 4096
+#define BUFFER_SIZE 16384
/* Yeah, global variables! */
-int nb_lines_max = 1000;
-char pattern_separator = ';';
-char label_separator = '\0';
-int output_to_vt_buffer = 0;
-int add_control_qs = 0;
-int with_colors = 1;
-int zsh_history = 0;
-int bash_history = 0;
-int inverse_order = 0;
-int remove_duplicates = 0;
-int use_regexp = 0;
-int case_sensitive = 0;
-char *title = 0;
-int error_flash = 0;
-int exclamation_negates = 0;
-int upper_caps_makes_case_sensitive = 0;
-
-int attr_modeline, attr_focus_line, attr_error;
+int global_nb_lines_max = 1000;
+char global_pattern_separator = ';';
+char global_label_separator = '\0';
+int global_output_to_vt_buffer = 0;
+int global_add_control_qs = 0;
+int global_with_colors = 1;
+int global_zsh_history = 0;
+int global_bash_history = 0;
+int global_inverse_order = 0;
+int global_remove_duplicates = 0;
+int global_use_regexp = 0;
+int global_case_sensitive = 0;
+char *global_title = 0;
+regex_t *global_prefix_regexp = 0;
+int global_error_flash = 0;
+int global_upper_caps_makes_case_sensitive = 0;
+int global_show_long_lines = 0;
+int global_show_hits = 0;
+
+int global_attr_modeline, global_attr_focus_line, global_attr_error, global_attr_hits;
/********************************************************************/
void *p = malloc(n);
if(!p && n != 0) {
fprintf(stderr,
- "selector: can not allocate memory: %s\n", strerror(errno));
+ "selector: cannot allocate memory: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
return p;
/*********************************************************************/
void str_to_positive_integers(char *string, int *values, int nb) {
- int current_value, gotone;
+ int current_value, got_one;
char *s;
int n;
n = 0;
current_value = 0;
- gotone = 0;
+ got_one = 0;
s = string;
while(1) {
if(*s >= '0' && *s <= '9') {
current_value = current_value * 10 + (int) (*s - '0');
- gotone = 1;
+ got_one = 1;
} else if(*s == ',' || *s == '\0') {
- if(gotone) {
+ if(got_one) {
if(n < nb) {
values[n++] = current_value;
if(*s == '\0') {
}
}
current_value = 0;
- gotone = 0;
+ got_one = 0;
} else {
fprintf(stderr,
"selector: Too many values in `%s'.\n", string);
}
void error_feedback() {
- if(error_flash) {
+ if(global_error_flash) {
flash();
} else {
beep();
fprintf(out, " start in regexp mode\n");
fprintf(out, " -a, --case-sensitive\n");
fprintf(out, " start in case sensitive mode\n");
+ fprintf(out, " -j, --show-long-lines\n");
+ fprintf(out, " print a long-line indicator at the end of truncated lines\n");
+ fprintf(out, " -y, --show-hits\n");
+ fprintf(out, " highlight the matching substrings\n");
fprintf(out, " -u, --upper-case-makes-case-sensitive\n");
fprintf(out, " using an upper case character in the matching string makes\n");
fprintf(out, " the matching case-sensitive\n");
- fprintf(out, " -n, --exclamation-negates\n");
- fprintf(out, " substrings starting with an exclamation mark have to be absent\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, " -- all following arguments are filenames\n");
+ fprintf(out, " --delete-regexp <regexp>\n");
+ fprintf(out, " deletes in every line the portion matching the regexp\n");
+ fprintf(out, " --\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, " -r <pattern>, --pattern <pattern>\n");
+ fprintf(out, " set an initial pattern\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, " -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>, --label-separator <label separator>\n");
- fprintf(out, " set the symbol to terminate the label\n");
+ fprintf(out, " set the character to separate the label to show from the\n");
+ fprintf(out, " string to return\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");
/* We came back to our original code, which means that the table
is full */
if(code == start) {
- printf("Full hash table (that should not happen)\n");
+ fprintf(stderr,
+ "Full hash table (that should not happen)\n");
exit(EXIT_FAILURE);
}
}
char *splitted_patterns, **patterns;
};
-int match(struct matcher *matcher, char *string) {
+/* Routine to add an interval to a sorted list of intervals
+ extremities. Returns the resulting number of extremities.
+
+ This routine is an effing nightmare */
+
+int add_interval(int n, int *switches, int start, int end) {
+ int f, g, k;
+
+ if(start == end) { return n; }
+
+ f = 0;
+ while(f < n && switches[f] <= start) { f++; }
+ g = f;
+ while(g < n && switches[g] <= end) { g++; }
+
+ if(f == n) {
+ /* switches[f-1] start end */
+ /* XXXXXXXXXXXX| */
+ switches[f] = start;
+ switches[f+1] = end;
+ return n + 2;
+ }
+
+ if(f % 2) {
+
+ if(g % 2) {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
+ for(k = f; k < n; k++) { switches[k] = switches[k + (g - f)]; }
+ return n - (g - f);
+ } else {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| ... XXXXXXXXXXXX| |XXXXXXXXXX */
+ switches[g - 1] = end;
+ for(k = f; k < n; k++) { switches[k] = switches[k + ((g - 1) - f)]; }
+ return n - ((g - 1) - f);
+ }
+
+ } else {
+
+ if(f == g) {
+ /* switches[f-1] start end switches[f] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX */
+ for(k = n - 1; k >= f; k--) {
+ switches[k + 2] = switches[k];
+ }
+ switches[f] = start;
+ switches[f + 1] = end;
+ return n + 2;
+ }
+
+ if(g % 2) {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX ... |XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX| */
+ switches[f] = start;
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + (g - (f + 1))]; }
+ return n - (g - (f + 1));
+ } else {
+ /* switches[f-1] start switches[f] switches[g-1] end switches[g] */
+ /* XXXXXXXXXXXX| |XXXXXXXXXX ... XXXXXXXXXXXX| |XXXXXXXXXX */
+ switches[f] = start;
+ switches[g - 1] = end;
+ for(k = f + 1; k < n; k++) { switches[k] = switches[k + ((g - 1) - (f + 1))]; }
+ return n - ((g - 1) - (f + 1));
+ }
+ }
+}
+
+int match(struct matcher *matcher, char *string, int *nb_switches, int *switches) {
int n;
+ char *where;
+ regmatch_t matches;
+
+ if(nb_switches) { *nb_switches = 0; }
+
if(matcher->nb_patterns >= 0) {
if(matcher->case_sensitive) {
- if(exclamation_negates) {
- for(n = 0; n < matcher->nb_patterns; n++) {
- if(matcher->patterns[n][0] == '!') {
- if(strstr(string, matcher->patterns[n] + 1) != 0) return 0;
- } else {
- if(strstr(string, matcher->patterns[n]) == 0) return 0;
- }
- }
- } else {
- for(n = 0; n < matcher->nb_patterns; n++) {
- if(strstr(string, matcher->patterns[n]) == 0) return 0;
+ for(n = 0; n < matcher->nb_patterns; n++) {
+ if((where = strstr(string, matcher->patterns[n])) == 0) return 0;
+ if(switches) {
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
}
}
} else {
- if(exclamation_negates) {
- for(n = 0; n < matcher->nb_patterns; n++) {
- if(matcher->patterns[n][0] == '!') {
- if(strcasestr(string, matcher->patterns[n] + 1) != 0) return 0;
- } else {
- if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
- }
- }
- } else {
- for(n = 0; n < matcher->nb_patterns; n++) {
- if(strcasestr(string, matcher->patterns[n]) == 0) return 0;
+ for(n = 0; n < matcher->nb_patterns; n++) {
+ if((where = strcasestr(string, matcher->patterns[n])) == 0) return 0;
+ if(switches) {
+ *nb_switches = add_interval(*nb_switches, switches,
+ (int) (where - string),
+ (int) (where - string) + strlen(matcher->patterns[n]));
}
}
}
return 1;
} else {
- return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ if(switches) {
+ if(regexec(&matcher->preg, string, 1, &matches, 0) == 0) {
+ *nb_switches = 2;
+ switches[0] = matches.rm_so;
+ switches[1] = matches.rm_eo;
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ return regexec(&matcher->preg, string, 0, 0, 0) == 0;
+ }
}
}
matcher->regexp_error = 0;
matcher->nb_patterns = 1;
- if(upper_caps_makes_case_sensitive) {
+ if(global_upper_caps_makes_case_sensitive) {
for(s = pattern; *s && !case_sensitive; s++) {
case_sensitive = (*s >= 'A' && *s <= 'Z');
}
matcher->case_sensitive = case_sensitive;
for(s = pattern; *s; s++) {
- if(*s == pattern_separator) {
+ if(*s == global_pattern_separator) {
matcher->nb_patterns++;
}
}
n = 0;
last_pattern_start = matcher->splitted_patterns;
for(t = matcher->splitted_patterns; n < matcher->nb_patterns; t++) {
- if(*t == pattern_separator || *t == '\0') {
+ if(*t == global_pattern_separator || *t == '\0') {
*t = '\0';
matcher->patterns[n++] = last_pattern_start;
last_pattern_start = t + 1;
int previous_visible(int current_line, char **lines, struct matcher *matcher) {
int line = current_line - 1;
- while(line >= 0 && !match(matcher, lines[line])) line--;
+ while(line >= 0 && !match(matcher, lines[line], 0, 0)) line--;
return line;
}
int next_visible(int current_line, int nb_lines, char **lines,
struct matcher *matcher) {
int line = current_line + 1;
- while(line < nb_lines && !match(matcher, lines[line])) line++;
+ while(line < nb_lines && !match(matcher, lines[line], 0, 0)) line++;
if(line < nb_lines)
return line;
/*********************************************************************/
+void print_string_with_switches(char *buffer, int line_width,
+ int nb_patterns, int *switches) {
+ int w, current = 0, next;
+ if(switches) {
+ for(w = 0; w < nb_patterns && switches[2 * w] < line_width; w++) {
+ if(switches[2 * w] < switches[2 * w + 1]) {
+ next = switches[2 * w];
+ if(next > line_width) { next = line_width; }
+ if(next > current) { addnstr(buffer + current, next - current); }
+ attron(global_attr_hits);
+ current = next;
+ next = switches[2 * w + 1];
+ if(next > line_width) { next = line_width; }
+ if(next > current) { addnstr(buffer + current, next - current); }
+ attroff(global_attr_hits);
+ current = next;
+ }
+ }
+ if(current < line_width) {
+ addnstr(buffer + current, line_width - current);
+ }
+ } else {
+ addnstr(buffer, line_width);
+ }
+}
+
/* The line highlighted is the first one matching the matcher in that
order: (1) current_focus_line after motion, if it does not match,
then (2) the first with a greater index, if none matches, then (3)
int nb_lines, char **lines,
int cursor_position,
char *pattern) {
-
+ int *switches;
char buffer[BUFFER_SIZE];
struct matcher matcher;
int k, l, m;
int console_width, console_height;
int nb_printed_lines = 0;
int cursor_x;
+ int nb_switches;
+
+ initialize_matcher(&matcher, global_use_regexp, global_case_sensitive, pattern);
- initialize_matcher(&matcher, use_regexp, case_sensitive, pattern);
+ if(global_show_hits) {
+ if(matcher.nb_patterns >= 0) {
+ switches = safe_malloc(sizeof(int) * matcher.nb_patterns * 2);
+ } else {
+ switches = safe_malloc(sizeof(int) * 2);
+ }
+ } else {
+ switches = 0;
+ }
console_width = getmaxx(stdscr);
console_height = getmaxy(stdscr);
/* If the regexp is erroneous, print a message saying so */
if(matcher.regexp_error) {
- attron(attr_error);
+ attron(global_attr_error);
addnstr("Regexp syntax error", console_width);
- attroff(attr_error);
+ attroff(global_attr_error);
}
/* Else, and we do have lines to select from, find a visible line. */
else if(nb_lines > 0) {
int new_focus_line;
- if(match(&matcher, lines[*current_focus_line])) {
+ if(match(&matcher, lines[*current_focus_line], 0, 0)) {
new_focus_line = *current_focus_line;
} else {
new_focus_line = next_visible(*current_focus_line, nb_lines, lines,
if(first_line > 0) {
first_line--;
- while(first_line > 0 && !match(&matcher, lines[first_line])) {
+ while(first_line > 0 && !match(&matcher, lines[first_line], 0, 0)) {
first_line--;
}
- if(match(&matcher, lines[first_line])) {
+ if(match(&matcher, lines[first_line], 0, 0)) {
nb_match++;
}
}
if(nb_match < console_height - 1 && last_line < nb_lines - 1) {
last_line++;
- while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line])) {
+ while(last_line < nb_lines - 1 && !match(&matcher, lines[last_line], 0, 0)) {
last_line++;
}
- if(match(&matcher, lines[last_line])) {
+ if(match(&matcher, lines[last_line], 0, 0)) {
nb_match++;
}
}
/* Now we display them */
for(l = first_line; l <= last_line; l++) {
- if(match(&matcher, lines[l])) {
+ if(match(&matcher, lines[l], &nb_switches, switches)) {
int k = 0;
while(lines[l][k] && k < BUFFER_SIZE - 2 && k < console_width) {
/* Highlight the highlighted line ... */
if(l == new_focus_line) {
- while(k < console_width) {
- buffer[k++] = ' ';
+ if(global_show_long_lines && k >= console_width) {
+ attron(global_attr_focus_line);
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ /* attron(global_attr_error); */
+ addnstr("\\", 1);
+ /* attroff(global_attr_error); */
+ attroff(global_attr_focus_line);
+ } else {
+ while(k < console_width) {
+ buffer[k++] = ' ';
+ }
+ attron(global_attr_focus_line);
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ attroff(global_attr_focus_line);
}
- attron(attr_focus_line);
- addnstr(buffer, console_width);
- attroff(attr_focus_line);
} else {
- buffer[k++] = '\n';
- buffer[k++] = '\0';
- /* clrtoeol(); */
- addnstr(buffer, console_width);
+ if(global_show_long_lines && k >= console_width) {
+ print_string_with_switches(buffer, console_width-1,
+ nb_switches / 2, switches);
+ attron(global_attr_focus_line);
+ addnstr("\\", 1);
+ attroff(global_attr_focus_line);
+ } else {
+ if(k < console_width) {
+ buffer[k++] = '\n';
+ buffer[k++] = '\0';
+ }
+ print_string_with_switches(buffer, k,
+ nb_switches / 2, switches);
+ }
}
nb_printed_lines++;
*displayed_focus_line = new_focus_line;
if(nb_printed_lines == 0) {
- attron(attr_error);
+ attron(global_attr_error);
addnstr("No selection", console_width);
- attroff(attr_error);
+ attroff(global_attr_error);
}
}
/* Else, print a message saying that there are no lines to select from */
else {
- attron(attr_error);
+ attron(global_attr_error);
addnstr("Empty choice", console_width);
- attroff(attr_error);
+ attroff(global_attr_error);
}
clrtobot();
move(0, 0);
- attron(attr_modeline);
+ attron(global_attr_modeline);
for(k = 0; k < console_width; k++) buffer[k] = ' ';
buffer[console_width] = '\0';
cursor_x = 0;
- if(title) {
- addstr(title);
+ if(global_title) {
+ addstr(global_title);
addstr(" ");
- cursor_x += strlen(title) + 1;
+ cursor_x += strlen(global_title) + 1;
}
sprintf(buffer, "%d/%d ", nb_printed_lines, nb_lines);
/* Add a few info about the mode we are in (regexp and/or case
sensitive) */
- if(use_regexp || matcher.case_sensitive) {
+ if(global_use_regexp || matcher.case_sensitive) {
addstr(" [");
- if(use_regexp) {
+ if(global_use_regexp) {
addstr("regexp");
}
if(matcher.case_sensitive) {
- if(use_regexp) {
+ if(global_use_regexp) {
addstr(",");
}
addstr("case");
move(0, cursor_x);
- attroff(attr_modeline);
+ attroff(global_attr_modeline);
/* We are done */
refresh();
+ if(switches) { free(switches); }
free_matcher(&matcher);
}
/*********************************************************************/
void store_line(struct hash_table_t *hash_table,
- const char *new_line,
+ char *new_line,
int *nb_lines, char **lines) {
int dup;
+ char *c, *d;
+ regmatch_t matches;
+
+ /* Remove some parts matching a regexp */
+
+ if(global_prefix_regexp && regexec(global_prefix_regexp, new_line, 1, &matches, 0) == 0) {
+ c = new_line + matches.rm_so;
+ d = new_line + matches.rm_eo;
+ while(*d) { *c++ = *d++; }
+ *c = 0;
+ }
/* Remove the zsh history prefix */
- if(zsh_history && *new_line == ':') {
+ if(global_zsh_history && *new_line == ':') {
while(*new_line && *new_line != ';') new_line++;
if(*new_line == ';') new_line++;
}
/* Remove the bash history prefix */
- if(bash_history) {
+ if(global_bash_history) {
while(*new_line == ' ') new_line++;
while(*new_line >= '0' && *new_line <= '9') new_line++;
while(*new_line == ' ') new_line++;
char raw_line[BUFFER_SIZE];
char *s;
FILE *file;
+ int l;
file = fopen(input_filename, "r");
if(!file) {
- fprintf(stderr, "selector: Can not open `%s'.\n", input_filename);
+ fprintf(stderr, "selector: Cannot open `%s'.\n", input_filename);
exit(EXIT_FAILURE);
}
- while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
- for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
- *s = '\0';
+ if(global_label_separator == '\n') {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+ l = strlen(raw_line);
+ fgets(raw_line + l, BUFFER_SIZE - l, file);
+ for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+ *s = '\0';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
+ }
+ } else {
+ while(*nb_lines < nb_lines_max && fgets(raw_line, BUFFER_SIZE, file)) {
+ for(s = raw_line + strlen(raw_line) - 1; s > raw_line && *s == '\n'; s--) {
+ *s = '\0';
+ }
+ store_line(hash_table, raw_line, nb_lines, lines);
}
- store_line(hash_table, raw_line, nb_lines, lines);
}
fclose(file);
/* 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
+enum {
+ OPT_BASH_MODE = CHAR_MAX + 1,
+ OPT_DELETE_REGEXP = CHAR_MAX + 2
};
static struct option long_options[] = {
{ "remove-duplicates", no_argument, 0, 'd' },
{ "regexp", no_argument, 0, 'e' },
{ "case-sensitive", no_argument, 0, 'a' },
+ { "show-long-lines", no_argument, 0, 'j'},
+ { "show-hits", no_argument, 0, 'y'},
{ "upper-case-makes-case-sensitive", no_argument, 0, 'u' },
{ "title", 1, 0, 't' },
+ { "pattern", 1, 0, 'r' },
{ "number-of-lines", 1, 0, 'l' },
{ "colors", 1, 0, 'c' },
{ "bash", no_argument, 0, OPT_BASH_MODE },
+ { "delete-regexp", 1, 0, OPT_DELETE_REGEXP },
{ "help", no_argument, 0, 'h' },
{ 0, 0, 0, 0 }
};
exit(EXIT_FAILURE);
}
+ /* Group and others have no access to created files */
+ umask(S_IRWXG | S_IRWXO);
+
+ pattern[0] = '\0';
+
color_fg_modeline = COLOR_WHITE;
color_bg_modeline = COLOR_BLACK;
color_fg_highlight = COLOR_BLACK;
strcpy(output_filename, "");
- while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeaunt:l:c:-h",
+ while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeajyunt:r:l:c:-h",
long_options, NULL)) != -1) {
switch(c) {
break;
case 's':
- pattern_separator = optarg[0];
+ global_pattern_separator = optarg[0];
break;
case 'x':
- label_separator = optarg[0];
+ if(strcmp(optarg, "\\n") == 0) {
+ global_label_separator = '\n';
+ } else {
+ global_label_separator = optarg[0];
+ }
break;
case 'v':
- output_to_vt_buffer = 1;
+ global_output_to_vt_buffer = 1;
break;
case 'w':
- add_control_qs = 1;
+ global_add_control_qs = 1;
break;
case 'm':
- with_colors = 0;
+ global_with_colors = 0;
break;
case 'q':
- error_flash = 1;
+ global_error_flash = 1;
break;
case 'i':
- inverse_order = 1;
+ global_inverse_order = 1;
break;
case 'b':
- bash_history = 1;
+ global_bash_history = 1;
break;
case 'z':
- zsh_history = 1;
+ global_zsh_history = 1;
break;
case 'd':
- remove_duplicates = 1;
+ global_remove_duplicates = 1;
break;
case 'e':
- use_regexp = 1;
+ global_use_regexp = 1;
break;
case 'a':
- case_sensitive = 1;
+ global_case_sensitive = 1;
break;
- case 'u':
- upper_caps_makes_case_sensitive = 1;
+ case 'j':
+ global_show_long_lines = 1;
break;
- case 'n':
- exclamation_negates = 1;
+ case 'y':
+ global_show_hits = 1;
+ break;
+
+ case 'u':
+ global_upper_caps_makes_case_sensitive = 1;
break;
case 't':
- free(title);
- title = safe_malloc((strlen(optarg) + 1) * sizeof(char));
- strcpy(title, optarg);
+ free(global_title);
+ global_title = safe_malloc((strlen(optarg) + 1) * sizeof(char));
+ strcpy(global_title, optarg);
+ break;
+
+ case OPT_DELETE_REGEXP:
+ free(global_prefix_regexp);
+ global_prefix_regexp = safe_malloc(sizeof(*global_prefix_regexp));
+
+ if(regcomp(global_prefix_regexp, optarg, 0)) {
+ fprintf(stderr, "selector: Regexp syntax error `%s'.\n", optarg);
+ exit(EXIT_FAILURE);
+ }
+ break;
+
+ case 'r':
+ strcpy(pattern, optarg);
break;
case 'l':
- str_to_positive_integers(optarg, &nb_lines_max, 1);
+ str_to_positive_integers(optarg, &global_nb_lines_max, 1);
break;
case 'c':
/* 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;
+ global_bash_history = 1;
+ global_inverse_order = 1;
+ global_remove_duplicates = 1;
+ global_output_to_vt_buffer = 1;
+ global_add_control_qs = 1;
bash_histsize = getenv("HISTSIZE");
if(bash_histsize) {
- str_to_positive_integers(bash_histsize, &nb_lines_max, 1);
+ str_to_positive_integers(bash_histsize, &global_nb_lines_max, 1);
}
break;
exit(EXIT_SUCCESS);
}
- lines = safe_malloc(nb_lines_max * sizeof(char *));
+ lines = safe_malloc(global_nb_lines_max * sizeof(char *));
nb_lines = 0;
- if(remove_duplicates) {
- hash_table = new_hash_table(nb_lines_max * 10);
+ if(global_remove_duplicates) {
+ hash_table = new_hash_table(global_nb_lines_max * 10);
} else {
hash_table = 0;
}
while(optind < argc) {
read_file(hash_table,
argv[optind],
- nb_lines_max, &nb_lines, lines);
+ global_nb_lines_max, &nb_lines, lines);
optind++;
}
nb_lines = n;
- if(inverse_order) {
+ if(global_inverse_order) {
for(l = 0; l < nb_lines / 2; l++) {
char *s = lines[nb_lines - 1 - l];
lines[nb_lines - 1 - l] = lines[l];
const char *u;
t = lines[l];
- while(*t && *t != label_separator) {
+ while(*t && *t != global_label_separator) {
u = unctrl(*t++);
e += strlen(u);
}
labels[l] = safe_malloc((e + 1) * sizeof(char));
t = lines[l];
s = labels[l];
- while(*t && *t != label_separator) {
+ while(*t && *t != global_label_separator) {
u = unctrl(*t++);
while(*u) { *s++ = *u++; }
}
*s = '\0';
}
- pattern[0] = '\0';
-
cursor_position = 0;
/* Here we start to display with curse */
/* So that the arrow keys work */
keypad(stdscr, TRUE);
- attr_error = A_STANDOUT;
- attr_modeline = A_REVERSE;
- attr_focus_line = A_STANDOUT;
+ global_attr_error = A_STANDOUT;
+ global_attr_modeline = A_REVERSE;
+ global_attr_focus_line = A_STANDOUT;
+ global_attr_hits = A_BOLD;
- if(with_colors && has_colors()) {
+ if(global_with_colors && has_colors()) {
start_color();
}
init_pair(1, color_fg_modeline, color_bg_modeline);
- attr_modeline = COLOR_PAIR(1);
+ global_attr_modeline = COLOR_PAIR(1);
init_pair(2, color_fg_highlight, color_bg_highlight);
- attr_focus_line = COLOR_PAIR(2);
+ global_attr_focus_line = COLOR_PAIR(2);
init_pair(3, COLOR_WHITE, COLOR_RED);
- attr_error = COLOR_PAIR(3);
+ global_attr_error = COLOR_PAIR(3);
}
current_focus_line = 0;
displayed_focus_line = 0;
+ cursor_position = strlen(pattern);
update_screen(¤t_focus_line, &displayed_focus_line,
0,
}
else if(key == '\022') { /* ^R */
- use_regexp = !use_regexp;
+ global_use_regexp = !global_use_regexp;
}
else if(key == '\011') { /* ^I */
- case_sensitive = !case_sensitive;
+ global_case_sensitive = !global_case_sensitive;
}
else if(key == '\025') { /* ^U */
if(displayed_focus_line >= 0 && displayed_focus_line < nb_lines) {
t = lines[displayed_focus_line];
- if(label_separator) {
- while(*t && *t != label_separator) t++;
+ if(global_label_separator) {
+ while(*t && *t != global_label_separator) t++;
if(*t) t++;
}
} else {
t = 0;
}
- if(output_to_vt_buffer && t) {
- inject_into_tty_buffer(t, add_control_qs);
+ if(global_output_to_vt_buffer && t) {
+ inject_into_tty_buffer(t, global_add_control_qs);
}
if(output_filename[0]) {
fprintf(out, "\n");
} else {
fprintf(stderr,
- "selector: Can not open %s for writing.\n",
+ "selector: Cannot open %s for writing.\n",
output_filename);
exit(EXIT_FAILURE);
}
free(labels);
free(lines);
- free(title);
+ free(global_title);
+
+ if(global_prefix_regexp) {
+ regfree(global_prefix_regexp);
+ free(global_prefix_regexp);
+ }
exit(EXIT_SUCCESS);
}
projects / selector.git / blobdiff