X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=selector.c;h=6695bb6bc939dc8344f1397e32badd1d95aa1097;hb=5a8349a6786a7564e565ef1e7df8de71bd717b7d;hp=77ab6036921b9dfde551ef2b8f860d787b2994f0;hpb=ca3e09ab0e4ffc59ba170094421571ada871adbb;p=selector.git diff --git a/selector.c b/selector.c index 77ab603..6695bb6 100644 --- a/selector.c +++ b/selector.c @@ -3,7 +3,7 @@ * selector is a simple command line utility for selection of strings * with a dynamic pattern-matching. * - * Copyright (c) 2009, 2010, 2011, 2012 Francois Fleuret + * Copyright (c) 2009-2013 Francois Fleuret * Written by Francois Fleuret * * This file is part of selector. @@ -79,7 +79,7 @@ void *safe_malloc(size_t n) { 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; @@ -203,7 +203,8 @@ void usage(FILE *out) { 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, " --\n"); + fprintf(out, " all following arguments are filenames\n"); fprintf(out, " -t , --title <title>\n"); fprintf(out, " add a title in the modeline\n"); fprintf(out, " -r <pattern>, --pattern <pattern>\n"); @@ -338,7 +339,7 @@ int add_interval(int n, int *switches, int start, int end) { while(g < n && switches[g] <= end) { g++; } if(f == n) { - /* switches[n-1] start end */ + /* switches[f-1] start end */ /* XXXXXXXXXXXX| */ switches[f] = start; switches[f+1] = end; @@ -929,7 +930,7 @@ void read_file(struct hash_table_t *hash_table, 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); } @@ -1418,7 +1419,7 @@ int main(int argc, char **argv) { 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); }