X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=7f64ebad916ffd831a5c8c590072250459953cb3;hb=a01943060785bb070dc793818dcd2219c68a5672;hp=9be758a840d9f07ce3815c4030e7de5c0505155b;hpb=8cd37ef953b9533401d63cddc72d3baa98fdfb96;p=selector.git diff --git a/selector.c b/selector.c index 9be758a..7f64eba 100644 --- a/selector.c +++ b/selector.c @@ -45,7 +45,7 @@ #include #include -#define VERSION "1.1.3" +#define VERSION "1.1.4" #define BUFFER_SIZE 4096 @@ -66,6 +66,7 @@ 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; @@ -75,8 +76,9 @@ int attr_modeline, attr_focus_line, attr_error; void *safe_malloc(size_t n) { void *p = malloc(n); - if (!p && n != 0) { - printf("Can not allocate memory: %s\n", strerror(errno)); + if(!p && n != 0) { + fprintf(stderr, + "selector: can not allocate memory: %s\n", strerror(errno)); exit(EXIT_FAILURE); } return p; @@ -187,8 +189,11 @@ void usage(FILE *out) { fprintf(out, " start in regexp mode\n"); fprintf(out, " -a, --case-sensitive\n"); fprintf(out, " start in case sensitive mode\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, " exclamation points in substring requires the string to be absent\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"); @@ -286,7 +291,8 @@ int add_and_get_previous_index(struct hash_table_t *hash_table, /* 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); } } @@ -365,12 +371,20 @@ void initialize_matcher(struct matcher *matcher, int n; if(use_regexp) { + matcher->case_sensitive = case_sensitive; matcher->nb_patterns = -1; matcher->regexp_error = regcomp(&matcher->preg, pattern, case_sensitive ? 0 : REG_ICASE); } else { matcher->regexp_error = 0; matcher->nb_patterns = 1; + + if(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++) { @@ -694,13 +708,13 @@ void update_screen(int *current_focus_line, int *displayed_focus_line, /* Add a few info about the mode we are in (regexp and/or case sensitive) */ - if(use_regexp || case_sensitive) { + if(use_regexp || matcher.case_sensitive) { addstr(" ["); if(use_regexp) { addstr("regexp"); } - if(case_sensitive) { + if(matcher.case_sensitive) { if(use_regexp) { addstr(","); } @@ -769,7 +783,7 @@ void read_file(struct hash_table_t *hash_table, int nb_lines_max, int *nb_lines, char **lines) { char raw_line[BUFFER_SIZE]; - int start, end, eol, k; + char *s; FILE *file; file = fopen(input_filename, "r"); @@ -779,51 +793,11 @@ void read_file(struct hash_table_t *hash_table, exit(EXIT_FAILURE); } - start = 0; - end = 0; - - while(*nb_lines < nb_lines_max && (end > start || !feof(file))) { - eol = start; - - /* Look for the end of a line in what is already in the buffer */ - while(eol < end && raw_line[eol] != '\n') eol++; - - /* if we did not find the of a line, move what has not been - processed and is in the buffer to the beginning of the buffer, - fill the buffer with new data from the file, and look for the - end of a line */ - if(eol == end) { - for(k = 0; k < end - start; k++) { - raw_line[k] = raw_line[k + start]; - } - end -= start; - eol -= start; - start = 0; - end += fread(raw_line + end, sizeof(char), BUFFER_SIZE - end, file); - while(eol < end && raw_line[eol] != '\n') eol++; + 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'; } - - /* The end of the line is the buffer size, which means the line is - too long */ - - if(eol == BUFFER_SIZE) { - raw_line[BUFFER_SIZE - 1] = '\0'; - fprintf(stderr, "selector: Line too long (max is %d characters):\n", - BUFFER_SIZE); - fprintf(stderr, "%s", raw_line); - fprintf(stderr, "\n"); - exit(EXIT_FAILURE); - } - - /* If we got a line, we replace the carriage return by a \0 to - finish the string */ - - raw_line[eol] = '\0'; - - store_line(hash_table, raw_line + start, - nb_lines, lines); - - start = eol + 1; + store_line(hash_table, raw_line, nb_lines, lines); } fclose(file); @@ -852,6 +826,7 @@ static struct option long_options[] = { { "remove-duplicates", no_argument, 0, 'd' }, { "regexp", no_argument, 0, 'e' }, { "case-sensitive", no_argument, 0, 'a' }, + { "upper-case-makes-case-sensitive", no_argument, 0, 'u' }, { "title", 1, 0, 't' }, { "number-of-lines", 1, 0, 'l' }, { "colors", 1, 0, 'c' }, @@ -893,7 +868,7 @@ int main(int argc, char **argv) { strcpy(output_filename, ""); - while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h", + while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeaunt:l:c:-h", long_options, NULL)) != -1) { switch(c) { @@ -950,6 +925,10 @@ int main(int argc, char **argv) { case_sensitive = 1; break; + case 'u': + upper_caps_makes_case_sensitive = 1; + break; + case 'n': exclamation_negates = 1; break; @@ -1244,7 +1223,7 @@ int main(int argc, char **argv) { /* Here we come back to standard display */ - if((key == KEY_ENTER || key == '\n')) { + if(key == KEY_ENTER || key == '\n') { char *t;