maint: be compilable with GCC 4.0

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index 1185e40944a157013c0720c0e10bdd0b3c09ae0c..649056943d99bb5653a04aedab25fa0473e977d3 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -49,7 +49,7 @@
 #include "quote.h"
 #include "uniqstr.h"
 
 #include "quote.h"
 #include "uniqstr.h"
 

-bool debug_flag;
+bool debug;

 bool defines_flag;
 bool graph_flag;
 bool xml_flag;
 bool defines_flag;
 bool graph_flag;
 bool xml_flag;


@@ -311,10 +311,11 @@ Parser:\n\
   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for debugging\n\
       --locations                  enable location support\n\
   -S, --skeleton=FILE              specify the skeleton to use\n\
   -t, --debug                      instrument the parser for debugging\n\
       --locations                  enable location support\n\

-  -D, --define=NAME[=VALUE]        similar to `%define NAME \"VALUE\"'\n\
-  -F, --force-define=NAME[=VALUE]  override `%define NAME \"VALUE\"'\n\
+  -D, --define=NAME[=VALUE]        similar to '%define NAME \"VALUE\"'\n\
+  -F, --force-define=NAME[=VALUE]  override '%define NAME \"VALUE\"'\n\

   -p, --name-prefix=PREFIX         prepend PREFIX to the external symbols\n\
   -p, --name-prefix=PREFIX         prepend PREFIX to the external symbols\n\

-  -l, --no-lines                   don't generate `#line' directives\n\
+                                   deprecated by '-Dapi.prefix=PREFIX'\n\
+  -l, --no-lines                   don't generate '#line' directives\n\

   -k, --token-table                include a table of token names\n\
 \n\
 "), stdout);
   -k, --token-table                include a table of token names\n\
 \n\
 "), stdout);


@@ -360,7 +361,25 @@ THINGS is a list of comma separated words that can include:\n\
   `none'         disable the report\n\
 "), stdout);
 
   `none'         disable the report\n\
 "), stdout);
 

-      printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      putc ('\n', stdout);
+      printf (_("Report bugs to <%s>.\n"), PACKAGE_BUGREPORT);
+      printf (_("%s home page: <%s>.\n"), PACKAGE_NAME, PACKAGE_URL);
+      fputs (_("General help using GNU software: "
+               "<http://www.gnu.org/gethelp/>.\n"),
+             stdout);
+      /* Don't output this redundant message for English locales.
+         Note we still output for 'C' so that it gets included in the
+         man page.  */
+      const char *lc_messages = setlocale (LC_MESSAGES, NULL);
+      if (lc_messages && strcmp (lc_messages, "en_"))
+        /* TRANSLATORS: Replace LANG_CODE in this URL with your language
+           code <http://translationproject.org/team/LANG_CODE.html> to
+           form one of the URLs at http://translationproject.org/team/.
+           Otherwise, replace the entire URL with your translation team's
+           email address.  */
+        fputs (_("Report translation bugs to "
+                 "<http://translationproject.org/team/>.\n"), stdout);
+      fputs (_("For complete documentation, run: info bison.\n"), stdout);

     }
 
   exit (status);
     }
 
   exit (status);


@@ -606,13 +625,19 @@ getargs (int argc, char *argv[])
         /* Here, the -d and --defines options are differentiated.  */
         defines_flag = true;
         if (optarg)
         /* Here, the -d and --defines options are differentiated.  */
         defines_flag = true;
         if (optarg)

-          spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+          {
+            free (spec_defines_file);
+            spec_defines_file = xstrdup (AS_FILE_NAME (optarg));
+          }

         break;
 
       case 'g':
        graph_flag = true;
        if (optarg)
         break;
 
       case 'g':
        graph_flag = true;
        if (optarg)

-         spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+          {
+            free (spec_graph_file);
+            spec_graph_file = xstrdup (AS_FILE_NAME (optarg));
+          }

        break;
 
       case 'h':
        break;
 
       case 'h':


@@ -639,7 +664,7 @@ getargs (int argc, char *argv[])
        break;
 
       case 't':
        break;
 
       case 't':

-       debug_flag = true;
+       debug = true;

        break;
 
       case 'v':
        break;
 
       case 'v':


@@ -649,7 +674,10 @@ getargs (int argc, char *argv[])
       case 'x':
        xml_flag = true;
        if (optarg)
       case 'x':
        xml_flag = true;
        if (optarg)

-         spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+          {
+            free (spec_xml_file);
+            spec_xml_file = xstrdup (AS_FILE_NAME (optarg));
+          }

        break;
 
       case 'y':
        break;
 
       case 'y':


@@ -669,6 +697,7 @@ getargs (int argc, char *argv[])
        exit (EXIT_SUCCESS);
 
       case REPORT_FILE_OPTION:
        exit (EXIT_SUCCESS);
 
       case REPORT_FILE_OPTION:

+        free (spec_verbose_file);

        spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
        break;
 
        spec_verbose_file = xstrdup (AS_FILE_NAME (optarg));
        break;