From: Alan Modra <amodra@gmail.com>
Date: Thu, 4 Jun 2009 08:27:54 +0000 (+0000)
Subject: 	* strings.c (main): Delay parsing of decimal digits.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e36aef42209e57273a78919b81cc7ae62d32107a;p=binutils-gdb.git

	* strings.c (main): Delay parsing of decimal digits.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 74ff09eee1c..dc4f09b8b84 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-04  Alan Modra  <amodra@bigpond.net.au>
+
+	* strings.c (main): Delay parsing of decimal digits.
+
 2009-06-04  Alan Modra  <amodra@bigpond.net.au>
 
 	* dep-in.sed: Don't use \n in replacement part of s command.
diff --git a/binutils/strings.c b/binutils/strings.c
index dc582f56d00..06fd8e995b7 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -158,6 +158,7 @@ main (int argc, char **argv)
   int exit_status = 0;
   bfd_boolean files_given = FALSE;
   char *s;
+  int numeric_opt = 0;
 
 #if defined (HAVE_SETLOCALE)
   setlocale (LC_ALL, "");
@@ -247,13 +248,17 @@ main (int argc, char **argv)
 	  usage (stderr, 1);
 
 	default:
-	  string_min = (int) strtoul (argv[optind - 1] + 1, &s, 0);
-	  if (s != NULL && *s != 0)
-	    fatal (_("invalid integer argument %s"), argv[optind - 1] + 1);
+	  numeric_opt = optind;
 	  break;
 	}
     }
 
+  if (numeric_opt != 0)
+    {
+      string_min = (int) strtoul (argv[numeric_opt - 1] + 1, &s, 0);
+      if (s != NULL && *s != 0)
+	fatal (_("invalid integer argument %s"), argv[numeric_opt - 1] + 1);
+    }
   if (string_min < 1)
     fatal (_("invalid minimum string length %d"), string_min);