From 7a98d47cf7832ce369db72c587b9ed0d48f21755 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 30 Aug 2005 16:19:15 +0000 Subject: [PATCH] re PR libgcj/23549 (gij swallows args after -ea) 2005-08-29 Thomas Fitzsimmons PR libgcj/23549 * gij.cc (main): Don't expect arguments to -enableassertions, -ea, -disableassertions and -da. From-SVN: r103642 --- libjava/ChangeLog | 6 ++++++ libjava/gij.cc | 14 +++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c810ce23347..0c6f6509505 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2005-08-29 Thomas Fitzsimmons + + PR libgcj/23549 + * gij.cc (main): Don't expect arguments to -enableassertions, -ea, + -disableassertions and -da. + 2005-08-29 Andrew Pinski * configure.ac: Replace "*-*-darwin[0-7].*" with diff --git a/libjava/gij.cc b/libjava/gij.cc index 60d5b34817d..7c8d8b4222b 100644 --- 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")