* tests/actions.at (Actions after errors): New test case.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 450a9fa8f5b60d3e124f851491f29d38dcf17867..92e9ef4ea3bd701c2e1178c8699adfc02db12d33 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -24,6 +24,7 @@
 #include "argmatch.h"
 #include "error.h"
 #include "complain.h"
+#include "struniq.h"
 #include "getargs.h"
 #include "files.h"
 
@@ -155,6 +156,8 @@ report_argmatch (char *args)
 | Display the help message and exit STATUS.  |
 `-------------------------------------------*/
 
+static void usage (int) ATTRIBUTE_NORETURN;
+
 static void
 usage (int status)
 {
@@ -281,18 +284,6 @@ static struct option const long_options[] =
   /* Hidden. */
   { "trace",         optional_argument,   0,     'T' },
 
-  /* FIXME: semantic parsers will output an `include' of an
-     output file: be sure that the naem included is indeed the name of
-     the output file.  */ /* FIXME Should we activate this options ?
-     */
-  { "output",      required_argument,     0, 'o' },
-  { "file-prefix", required_argument,     0, 'b' },
-  { "name-prefix", required_argument,     0, 'p' },
-
-  /*
-   * Percent and command line declarations.
-   */
-
   /* Output.  */
   { "defines",     optional_argument,   0,   'd' },
 
@@ -337,11 +328,11 @@ getargs (int argc, char *argv[])
        break;
 
       case 'h':
-       usage (0);
+       usage (EXIT_SUCCESS);
 
       case 'V':
        version ();
-       exit (0);
+       exit (EXIT_SUCCESS);
 
       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */
@@ -405,9 +396,7 @@ getargs (int argc, char *argv[])
        break;
 
       default:
-       fprintf (stderr, _("Try `%s --help' for more information.\n"),
-                program_name);
-       exit (1);
+       usage (EXIT_FAILURE);
       }
 
   if (argc - optind != 1)
@@ -419,5 +408,5 @@ getargs (int argc, char *argv[])
       usage (EXIT_FAILURE);
     }
 
-  infile = argv[optind];
+  current_file = grammar_file = struniq_new (argv[optind]);
 }