Fix the previous test.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 0951e581e95fb5abc3baa08d80074b154dfffd1a..3a74ea1dc74405310d2993b5596d67a241495be3 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -34,7 +34,6 @@ int no_lines_flag = 0;
 int no_parser_flag = 0;
 int token_table_flag = 0;
 int verbose_flag = 0;
-int error_verbose_flag = 0;
 int yacc_flag = 0;     /* for -y */
 int graph_flag = 0;
 int trace_flag = 0;
@@ -131,12 +130,20 @@ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\
 | Process the options.  |
 `----------------------*/
 
+/* Under DOS, there is no difference on the case.  This can be
+   troublesome when looking for `.tab' etc.  */
+#ifdef MSDOS
+# define AS_FILE_NAME(File) (strlwr (File), (File))
+#else
+# define AS_FILE_NAME(File) (File)
+#endif
+
 void
 getargs (int argc, char *argv[])
 {
   int c;
 
-  create_long_option_table ();
+  struct option *longopts = long_option_table_new ();
   while ((c = getopt_long (argc, argv, shortopts, longopts, NULL)) != EOF)
     switch (c)
       {
@@ -159,29 +166,26 @@ getargs (int argc, char *argv[])
       case 'g':
        /* Here, the -g and --graph=FILE options are differentiated.  */
        graph_flag = 1;
-       spec_graph_file = optarg;
+       spec_graph_file = AS_FILE_NAME (optarg);
        break;
 
       case 'v':
        verbose_flag = 1;
        break;
 
-      case 'e':
-       error_verbose_flag = 1;
-       break;
-
       case 'S':
-       skeleton = optarg;
+       skeleton = AS_FILE_NAME (optarg);
        break;
 
       case 'I':
-       include = optarg;
+       include = AS_FILE_NAME (optarg);
        break;
 
       case 'd':
        /* Here, the -d and --defines options are differentiated.  */
        defines_flag = 1;
-       spec_defines_file = optarg;
+       if (optarg)
+         spec_defines_file = AS_FILE_NAME (optarg);
        break;
 
       case 'l':
@@ -205,11 +209,11 @@ getargs (int argc, char *argv[])
        break;
 
       case 'o':
-       spec_outfile = optarg;
+       spec_outfile = AS_FILE_NAME (optarg);
        break;
 
       case 'b':
-       spec_file_prefix = optarg;
+       spec_file_prefix = AS_FILE_NAME (optarg);
        break;
 
       case 'p':
@@ -222,7 +226,8 @@ getargs (int argc, char *argv[])
        exit (1);
       }
 
-  XFREE (longopts);
+  free (longopts);
+
   if (optind == argc)
     {
       fprintf (stderr, _("%s: no grammar file given\n"), program_name);