re PR libgcj/23549 (gij swallows args after -ea)

2005-08-29  Thomas Fitzsimmons  <fitzsim@redhat.com>

	PR libgcj/23549
	* gij.cc (main): Don't expect arguments to -enableassertions, -ea,
	-disableassertions and -da.

From-SVN: r103642

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c810ce23347947d9f9a820d5fab6776019ef87d6..0c6f65095055d17e7fa0072683b4b26ec0bdfee4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-29  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+       PR libgcj/23549
+       * gij.cc (main): Don't expect arguments to -enableassertions, -ea,
+       -disableassertions and -da.
+
 2005-08-29  Andrew Pinski  <pinskia@physics.uc.edu>
 
        * configure.ac: Replace "*-*-darwin[0-7].*" with

diff --git a/libjava/gij.cc b/libjava/gij.cc
index 60d5b34817d9fe2b42e84e00529016829851eb9e..7c8d8b4222b45c71e23d14f070cecd17d5c3f74d 100644 (file)
--- a/libjava/gij.cc
+++ b/libjava/gij.cc
@@ -155,20 +155,16 @@ main (int argc, char const** argv)
       // Ignore 32/64-bit JIT options
       else if (! strcmp (arg, "-d32") || ! strcmp (arg, "-d64"))
         continue;
-      else if (! strcmp (arg, "-enableassertions") || ! strcmp (arg, "-ea"))
+      else if (! strncmp (arg, "-enableassertions", sizeof ("-enableassertions") - 1)
+               || ! strncmp (arg, "-ea", sizeof ("-ea") - 1))
         {
-          if (i >= argc - 1)
-            goto no_arg;
           // FIXME: hook up assertion support
-          ++i;
           continue;
         }
-      else if (! strcmp (arg, "-disableassertions") || ! strcmp (arg, "-da"))
+      else if (! strncmp (arg, "-disableassertions", sizeof ("-disableassertions") - 1)
+               || ! strncmp (arg, "-da", sizeof ("-da") - 1))
         {
-          if (i >= argc - 1)
-            goto no_arg;
-          // FIXME
-          ++i;
+          // FIXME: hook up assertion support
           continue;
         }
       else if (! strcmp (arg, "-enablesystemassertions")