Attachment 296030 Details for Bug 435078 – correct the bug when using "-0" and use strtoul() in replace integer_arg() to fix "-n hexnumber"

[patch] correct the bug when using "-0" and use strtoul() in replace integer_arg() to fix "-n hexnumber"

strings.patch (text/plain), 2.32 KB, created by chuli on 2008-02-27 08:14:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: chuli

Created: 2008-02-27 08:14:53 UTC

Size: 2.32 KB

patch

obsolete

>--- binutils/strings.c.orig	2009-03-05 03:44:09.000000000 +0800
>+++ binutils/strings.c	2009-03-05 03:53:06.000000000 +0800
>@@ -164,7 +164,6 @@ typedef struct
> static void strings_a_section (bfd *, asection *, void *);
> static bfd_boolean strings_object_file (const char *);
> static bfd_boolean strings_file (char *file);
>-static int integer_arg (char *s);
> static void print_strings (const char *, FILE *, file_off, int, int, char *);
> static void usage (FILE *, int);
> static long get_char (FILE *, file_off *, int *, char **);
>@@ -189,7 +188,7 @@ main (int argc, char **argv)
> 
>   expandargv (&argc, &argv);
> 
>-  string_min = -1;
>+  string_min = 4;
>   print_addresses = FALSE;
>   print_filenames = FALSE;
>   datasection_only = TRUE;
>@@ -214,9 +213,7 @@ main (int argc, char **argv)
> 	  usage (stdout, 0);
> 
> 	case 'n':
>-	  string_min = integer_arg (optarg);
>-	  if (string_min < 1)
>-	    fatal (_("invalid number %s"), optarg);
>+	  string_min = (int) strtoul (optarg, NULL, 0);
> 	  break;
> 
> 	case 'o':
>@@ -266,16 +263,13 @@ main (int argc, char **argv)
> 	  usage (stderr, 1);
> 
> 	default:
>-	  if (string_min < 0)
>-	    string_min = optc - '0';
>-	  else
>-	    string_min = string_min * 10 + optc - '0';
>+	  string_min = (int) strtoul (argv[optind-1] + 1, NULL, 0);
> 	  break;
> 	}
>     }
> 
>-  if (string_min < 0)
>-    string_min = 4;
>+  if (string_min < 1)
>+	fatal (_("invalid minimum string length %d"), string_min);
> 
>   switch (encoding)
>     {
>@@ -657,51 +651,6 @@ print_strings (const char *filename, FIL
>       putchar ('\n');
>     }
> }
>-
>-/* Parse string S as an integer, using decimal radix by default,
>-   but allowing octal and hex numbers as in C.  */
>-
>-static int
>-integer_arg (char *s)
>-{
>-  int value;
>-  int radix = 10;
>-  char *p = s;
>-  int c;
>-
>-  if (*p != '0')
>-    radix = 10;
>-  else if (*++p == 'x')
>-    {
>-      radix = 16;
>-      p++;
>-    }
>-  else
>-    radix = 8;
>-
>-  value = 0;
>-  while (((c = *p++) >= '0' && c <= '9')
>-	 || (radix == 16 && (c & ~40) >= 'A' && (c & ~40) <= 'Z'))
>-    {
>-      value *= radix;
>-      if (c >= '0' && c <= '9')
>-	value += c - '0';
>-      else
>-	value += (c & ~40) - 'A';
>-    }
>-
>-  if (c == 'b')
>-    value *= 512;
>-  else if (c == 'B')
>-    value *= 1024;
>-  else
>-    p--;
>-
>-  if (*p)
>-    fatal (_("invalid integer argument %s"), s);
>-
>-  return value;
>-}
> 
> static void
> usage (FILE *stream, int status)

Actions: View | Diff

Attachments on bug 435078: 296030 | 302600 | 302601