(set_goto_map): Do not subtract from the returned value of malloc.

[bison.git] / src / getargs.c

diff --git a/src/getargs.c b/src/getargs.c
index b9a30698e5db7ffbec5d7dae978bd027433e4920..de468e556d2ef3d856ccd9ae211de71a8d5e9761 100644 (file)
--- a/src/getargs.c
+++ b/src/getargs.c
@@ -1,4 +1,5 @@
-/* Parse command line arguments for bison.
+/* Parse command line arguments for Bison.
+
    Copyright (C) 1984, 1986, 1989, 1992, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
@@ -20,13 +21,15 @@
    02111-1307, USA.  */
 
 #include "system.h"
-#include "getopt.h"
-#include "argmatch.h"
-#include "error.h"
+
+#include <argmatch.h>
+#include <error.h>
+#include <getopt.h>
+
 #include "complain.h"
-#include "struniq.h"
-#include "getargs.h"
 #include "files.h"
+#include "getargs.h"
+#include "uniqstr.h"
 
 int debug_flag = 0;
 int defines_flag = 0;
@@ -318,7 +321,8 @@ getargs (int argc, char *argv[])
 {
   int c;
 
-  while ((c = getopt_long (argc, argv, short_options, long_options, NULL)) != EOF)
+  while ((c = getopt_long (argc, argv, short_options, long_options, NULL))
+        != -1)
     switch (c)
       {
       case 0:
@@ -410,5 +414,5 @@ getargs (int argc, char *argv[])
       usage (EXIT_FAILURE);
     }
 
-  current_file = grammar_file = struniq_new (argv[optind]);
+  current_file = grammar_file = uniqstr_new (argv[optind]);
 }