From: Francois Fleuret Date: Sat, 19 Feb 2011 22:09:53 +0000 (+0100) Subject: Removed the handling of the -- option, as it seems to be standard in getopt. X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=738fb5bb77517dc990d08a85520bd5998288a2dd;p=selector.git Removed the handling of the -- option, as it seems to be standard in getopt. --- diff --git a/selector.1 b/selector.1 index 660e4a7..a5b5f24 100644 --- a/selector.1 +++ b/selector.1 @@ -91,7 +91,7 @@ to match \fB-q\fR, \fB--no-beep\fR make a flash instead of a beep when there is an edition error .TP -\fB--\fR, \fB--rest-are-files\fR +\fB--\fR state that all following arguments are filenames .TP \fB--bash\fR diff --git a/selector.c b/selector.c index d09f472..1081617 100644 --- a/selector.c +++ b/selector.c @@ -195,8 +195,7 @@ 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, " --, --rest-are-files\n"); - fprintf(out, " all following arguments are filenames\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, " -c <colors>, --colors <colors>\n"); @@ -864,7 +863,6 @@ static struct option long_options[] = { { "title", 1, 0, 't' }, { "number-of-lines", 1, 0, 'l' }, { "colors", 1, 0, 'c' }, - { "rest-are-files", no_argument, 0, '-' }, { "bash", no_argument, 0, OPT_BASH_MODE }, { "help", no_argument, 0, 'h' }, { 0, 0, 0, 0 } @@ -877,7 +875,6 @@ int main(int argc, char **argv) { int c, k, l, n; int cursor_position; int error = 0, show_help = 0, done = 0; - int rest_are_files = 0; int key; int current_focus_line, displayed_focus_line; @@ -904,8 +901,7 @@ int main(int argc, char **argv) { strcpy(output_filename, ""); - while (!rest_are_files && - (c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h", + while ((c = getopt_long(argc, argv, "o:s:x:vwmqf:ibzdeant:l:c:-h", long_options, NULL)) != -1) { switch(c) { @@ -984,10 +980,6 @@ int main(int argc, char **argv) { color_bg_highlight = colors[3]; break; - case '-': - rest_are_files = 1; - break; - case 'h': show_help = 1; break;