X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0fb669f9d648dfdd7a39478a6b658511455ae966..2a4647a32f3de7eda80133370b05cea9f72e5761:/src/getargs.c diff --git a/src/getargs.c b/src/getargs.c index 515b8583..2b6fa0fb 100644 --- a/src/getargs.c +++ b/src/getargs.c @@ -103,11 +103,11 @@ static const int trace_types[] = trace_all }; +ARGMATCH_VERIFY (trace_args, trace_types); static void trace_argmatch (char *args) { - verify (trace_constraint, ARGMATCH_CONSTRAINT (trace_args, trace_types)); if (args) { args = strtok (args, ","); @@ -156,11 +156,11 @@ static const int report_types[] = report_all }; +ARGMATCH_VERIFY (report_args, report_types); static void report_argmatch (char *args) { - verify (report_constraint, ARGMATCH_CONSTRAINT (report_args, report_types)); args = strtok (args, ","); do { @@ -207,9 +207,10 @@ for the equivalent short option also. Similarly for optional arguments.\n"), fputs (_("\ Operation modes:\n\ - -h, --help display this help and exit\n\ - -V, --version output version information and exit\n\ - -y, --yacc emulate POSIX yacc\n"), stdout); + -h, --help display this help and exit\n\ + -V, --version output version information and exit\n\ + --print-localedir output directory containing locale-dependent data\n\ + -y, --yacc emulate POSIX yacc\n"), stdout); putc ('\n', stdout); fputs (_("\ @@ -284,19 +285,21 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ `----------------------*/ /* Shorts options. */ -const char *short_options = "yvegdhr:ltknVo:b:p:S:T::"; +static char const short_options[] = "yvegdhr:ltknVo:b:p:S:T::"; /* Values for long options that do not have single-letter equivalents. */ enum { - LOCATIONS_OPTION = CHAR_MAX + 1 + LOCATIONS_OPTION = CHAR_MAX + 1, + PRINT_LOCALEDIR_OPTION }; static struct option const long_options[] = { /* Operation modes. */ - { "help", no_argument, 0, 'h' }, - { "version", no_argument, 0, 'V' }, + { "help", no_argument, 0, 'h' }, + { "version", no_argument, 0, 'V' }, + { "print-localedir", no_argument, 0, PRINT_LOCALEDIR_OPTION }, /* Parser. */ { "name-prefix", required_argument, 0, 'p' }, @@ -364,6 +367,10 @@ getargs (int argc, char *argv[]) version (); exit (EXIT_SUCCESS); + case PRINT_LOCALEDIR_OPTION: + printf ("%s\n", LOCALEDIR); + exit (EXIT_SUCCESS); + case 'g': /* Here, the -g and --graph=FILE options are differentiated. */ graph_flag = true;