More signed overflow fixes

[deliverable/binutils-gdb.git] / binutils / strings.c

diff --git a/binutils/strings.c b/binutils/strings.c
index fda63bdd004135ed0aa8cc54d56b6b43f57b77a7..8150c1181df3250ad2dc5de4f38cdbfad1b7fa71 100644 (file)
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -1,10 +1,9 @@
 /* strings -- print the strings of printable characters in files
 /* strings -- print the strings of printable characters in files

-   Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-   2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1993-2019 Free Software Foundation, Inc.

 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -22,7 +21,10 @@
    Options:
    --all
    -a
    Options:
    --all
    -a

-   -           Do not scan only the initialized data section of object files.
+   -           Scan each file in its entirety.
+
+   --data
+   -d          Scan only the initialized data section(s) of object files.

 
    --print-file-name
    -f          Print the name of the file before each string.
 
    --print-file-name
    -f          Print the name of the file before each string.


@@ -36,6 +38,10 @@
    -t {o,x,d}  Print the offset within the file before each string,
                in octal/hex/decimal.
 
    -t {o,x,d}  Print the offset within the file before each string,
                in octal/hex/decimal.
 

+  --include-all-whitespace
+  -w           By default tab and space are the only whitepace included in graphic
+               char sequences.  This option considers all of isspace() valid.
+

    -o          Like -to.  (Some other implementations have -o like -to,
                others like -td.  We chose one arbitrarily.)
 
    -o          Like -to.  (Some other implementations have -o like -to,
                others like -td.  We chose one arbitrarily.)
 


@@ -46,50 +52,36 @@
                littleendian 32-bit.
 
    --target=BFDNAME
                littleendian 32-bit.
 
    --target=BFDNAME

+   -T {bfdname}

                Specify a non-default object file format.
 
                Specify a non-default object file format.
 

+  --output-separator=sep_string
+  -s sep_string        String used to separate parsed strings in output.
+               Default is newline.
+

    --help
    -h          Print the usage message on the standard output.
 
    --version
    --help
    -h          Print the usage message on the standard output.
 
    --version

+   -V

    -v          Print the program version number.
 
    Written by Richard Stallman <rms@gnu.ai.mit.edu>
    and David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
    -v          Print the program version number.
 
    Written by Richard Stallman <rms@gnu.ai.mit.edu>
    and David MacKenzie <djm@gnu.ai.mit.edu>.  */
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "sysdep.h"

 #include "bfd.h"
 #include "bfd.h"

-#include <stdio.h>

 #include "getopt.h"
 #include "getopt.h"

-#include <errno.h>
-#include "bucomm.h"

 #include "libiberty.h"
 #include "safe-ctype.h"
 #include "libiberty.h"
 #include "safe-ctype.h"

-#include <sys/stat.h>
-
-/* Some platforms need to put stdin into binary mode, to read
-    binary files.  */
-#ifdef HAVE_SETMODE
-#ifndef O_BINARY
-#ifdef _O_BINARY
-#define O_BINARY _O_BINARY
-#define setmode _setmode
-#else
-#define O_BINARY 0
-#endif
-#endif
-#if O_BINARY
-#include <io.h>
-#define SET_BINARY(f) do { if (!isatty (f)) setmode (f,O_BINARY); } while (0)
-#endif
-#endif
+#include "bucomm.h"

 
 #define STRING_ISGRAPHIC(c) \
       (   (c) >= 0 \
        && (c) <= 255 \
 
 #define STRING_ISGRAPHIC(c) \
       (   (c) >= 0 \
        && (c) <= 255 \

-       && ((c) == '\t' || ISPRINT (c) || (encoding == 'S' && (c) > 127)))
+       && ((c) == '\t' || ISPRINT (c) || (encoding == 'S' && (c) > 127) \
+          || (include_all_whitespace && ISSPACE (c))) \
+      )

 
 #ifndef errno
 extern int errno;
 
 #ifndef errno
 extern int errno;


@@ -98,27 +90,15 @@ extern int errno;
 /* The BFD section flags that identify an initialized data section.  */
 #define DATA_FLAGS (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS)
 
 /* The BFD section flags that identify an initialized data section.  */
 #define DATA_FLAGS (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS)
 

-#ifdef HAVE_FOPEN64
-typedef off64_t file_off;
-#define file_open(s,m) fopen64(s, m)
-#else
-typedef off_t file_off;
-#define file_open(s,m) fopen(s, m)
-#endif
-#ifdef HAVE_STAT64
-typedef struct stat64 statbuf;
-#define file_stat(f,s) stat64(f, s)
-#else
-typedef struct stat statbuf;
-#define file_stat(f,s) stat(f, s)
-#endif
-

 /* Radix for printing addresses (must be 8, 10 or 16).  */
 static int address_radix;
 
 /* Minimum length of sequence of graphic chars to trigger output.  */
 static int string_min;
 
 /* Radix for printing addresses (must be 8, 10 or 16).  */
 static int address_radix;
 
 /* Minimum length of sequence of graphic chars to trigger output.  */
 static int string_min;
 

+/* Whether or not we include all whitespace as a graphic char.   */
+static bfd_boolean include_all_whitespace;
+

 /* TRUE means print address within file for each string.  */
 static bfd_boolean print_addresses;
 
 /* TRUE means print address within file for each string.  */
 static bfd_boolean print_addresses;
 


@@ -128,9 +108,6 @@ static bfd_boolean print_filenames;
 /* TRUE means for object files scan only the data section.  */
 static bfd_boolean datasection_only;
 
 /* TRUE means for object files scan only the data section.  */
 static bfd_boolean datasection_only;
 

-/* TRUE if we found an initialized data section in the current file.  */
-static bfd_boolean got_a_section;
-

 /* The BFD object file format.  */
 static char *target;
 
 /* The BFD object file format.  */
 static char *target;
 


@@ -138,26 +115,28 @@ static char *target;
 static char encoding;
 static int encoding_bytes;
 
 static char encoding;
 static int encoding_bytes;
 

+/* Output string used to separate parsed strings  */
+static char *output_separator;
+

 static struct option long_options[] =
 {
   {"all", no_argument, NULL, 'a'},
 static struct option long_options[] =
 {
   {"all", no_argument, NULL, 'a'},

+  {"data", no_argument, NULL, 'd'},

   {"print-file-name", no_argument, NULL, 'f'},
   {"bytes", required_argument, NULL, 'n'},
   {"radix", required_argument, NULL, 't'},
   {"print-file-name", no_argument, NULL, 'f'},
   {"bytes", required_argument, NULL, 'n'},
   {"radix", required_argument, NULL, 't'},

+  {"include-all-whitespace", no_argument, NULL, 'w'},

   {"encoding", required_argument, NULL, 'e'},
   {"target", required_argument, NULL, 'T'},
   {"encoding", required_argument, NULL, 'e'},
   {"target", required_argument, NULL, 'T'},

+  {"output-separator", required_argument, NULL, 's'},

   {"help", no_argument, NULL, 'h'},
   {"version", no_argument, NULL, 'v'},
   {NULL, 0, NULL, 0}
 };
 
   {"help", no_argument, NULL, 'h'},
   {"version", no_argument, NULL, 'v'},
   {NULL, 0, NULL, 0}
 };
 

-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 **);
+static bfd_boolean strings_file (char *);
+static void print_strings (const char *, FILE *, file_ptr, int, int, char *);
+static void usage (FILE *, int) ATTRIBUTE_NORETURN;

 \f
 int main (int, char **);
 
 \f
 int main (int, char **);
 


@@ -167,6 +146,8 @@ main (int argc, char **argv)
   int optc;
   int exit_status = 0;
   bfd_boolean files_given = FALSE;
   int optc;
   int exit_status = 0;
   bfd_boolean files_given = FALSE;

+  char *s;
+  int numeric_opt = 0;

 
 #if defined (HAVE_SETLOCALE)
   setlocale (LC_ALL, "");
 
 #if defined (HAVE_SETLOCALE)
   setlocale (LC_ALL, "");


@@ -176,14 +157,23 @@ main (int argc, char **argv)
 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);
 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);

-  string_min = -1;
+  bfd_set_error_program_name (program_name);
+
+  expandargv (&argc, &argv);
+
+  string_min = 4;
+  include_all_whitespace = FALSE;

   print_addresses = FALSE;
   print_filenames = FALSE;
   print_addresses = FALSE;
   print_filenames = FALSE;

-  datasection_only = TRUE;
+  if (DEFAULT_STRINGS_ALL)
+    datasection_only = FALSE;
+  else
+    datasection_only = TRUE;

   target = NULL;
   encoding = 's';
   target = NULL;
   encoding = 's';

+  output_separator = NULL;

 
 

-  while ((optc = getopt_long (argc, argv, "afhHn:ot:e:Vv0123456789",
+  while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:Vv0123456789",

                              long_options, (int *) 0)) != EOF)
     {
       switch (optc)
                              long_options, (int *) 0)) != EOF)
     {
       switch (optc)


@@ -192,6 +182,10 @@ main (int argc, char **argv)
          datasection_only = FALSE;
          break;
 
          datasection_only = FALSE;
          break;
 

+       case 'd':
+         datasection_only = TRUE;
+         break;
+

        case 'f':
          print_filenames = TRUE;
          break;
        case 'f':
          print_filenames = TRUE;
          break;


@@ -201,9 +195,13 @@ main (int argc, char **argv)
          usage (stdout, 0);
 
        case 'n':
          usage (stdout, 0);
 
        case 'n':

-         string_min = integer_arg (optarg);
-         if (string_min < 1)
-           fatal (_("invalid number %s"), optarg);
+         string_min = (int) strtoul (optarg, &s, 0);
+         if (s != NULL && *s != 0)
+           fatal (_("invalid integer argument %s"), optarg);
+         break;
+
+       case 'w':
+         include_all_whitespace = TRUE;

          break;
 
        case 'o':
          break;
 
        case 'o':


@@ -244,6 +242,10 @@ main (int argc, char **argv)
          encoding = optarg[0];
          break;
 
          encoding = optarg[0];
          break;
 

+       case 's':
+         output_separator = optarg;
+          break;
+

        case 'V':
        case 'v':
          print_version ("strings");
        case 'V':
        case 'v':
          print_version ("strings");


@@ -253,16 +255,19 @@ main (int argc, char **argv)
          usage (stderr, 1);
 
        default:
          usage (stderr, 1);
 
        default:

-         if (string_min < 0)
-           string_min = optc - '0';
-         else
-           string_min = string_min * 10 + optc - '0';
+         numeric_opt = optind;

          break;
        }
     }
 
          break;
        }
     }
 

-  if (string_min < 0)
-    string_min = 4;
+  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);

 
   switch (encoding)
     {
 
   switch (encoding)
     {


@@ -282,15 +287,14 @@ main (int argc, char **argv)
       usage (stderr, 1);
     }
 
       usage (stderr, 1);
     }
 

-  bfd_init ();
+  if (bfd_init () != BFD_INIT_MAGIC)
+    fatal (_("fatal error: libbfd ABI mismatch"));

   set_default_bfd_target ();
 
   if (optind >= argc)
     {
       datasection_only = FALSE;
   set_default_bfd_target ();
 
   if (optind >= argc)
     {
       datasection_only = FALSE;

-#ifdef SET_BINARY

       SET_BINARY (fileno (stdin));
       SET_BINARY (fileno (stdin));

-#endif

       print_strings ("{standard input}", stdin, 0, 0, 0, (char *) NULL);
       files_given = TRUE;
     }
       print_strings ("{standard input}", stdin, 0, 0, 0, (char *) NULL);
       files_given = TRUE;
     }


@@ -303,7 +307,7 @@ main (int argc, char **argv)
          else
            {
              files_given = TRUE;
          else
            {
              files_given = TRUE;

-             exit_status |= strings_file (argv[optind]) == FALSE;
+             exit_status |= !strings_file (argv[optind]);

            }
        }
     }
            }
        }
     }


@@ -314,27 +318,34 @@ main (int argc, char **argv)
   return (exit_status);
 }
 \f
   return (exit_status);
 }
 \f

-/* Scan section SECT of the file ABFD, whose printable name is FILE.
-   If it contains initialized data,
-   set `got_a_section' and print the strings in it.  */
+/* Scan section SECT of the file ABFD, whose printable name is
+   FILENAME.  If it contains initialized data set GOT_A_SECTION and
+   print the strings in it.  */

 
 static void
 
 static void

-strings_a_section (bfd *abfd, asection *sect, void *filearg)
+strings_a_section (bfd *abfd, asection *sect, const char *filename,
+                  bfd_boolean *got_a_section)

 {
 {

-  const char *file = (const char *) filearg;
+  bfd_size_type sectsize;
+  bfd_byte *mem;

 
 

-  if ((sect->flags & DATA_FLAGS) == DATA_FLAGS)
-    {
-      bfd_size_type sz = bfd_get_section_size (sect);
-      void *mem = xmalloc (sz);
+  if ((sect->flags & DATA_FLAGS) != DATA_FLAGS)
+    return;

 
 

-      if (bfd_get_section_contents (abfd, sect, mem, (file_ptr) 0, sz))
-       {
-         got_a_section = TRUE;
-         print_strings (file, (FILE *) NULL, sect->filepos, 0, sz, mem);
-       }
-      free (mem);
+  sectsize = bfd_section_size (sect);
+  if (sectsize == 0)
+    return;
+
+  if (!bfd_malloc_and_get_section (abfd, sect, &mem))
+    {
+      non_fatal (_("%s: Reading section %s failed: %s"),
+                filename, sect->name, bfd_errmsg (bfd_get_error ()));
+      return;

     }
     }

+
+  *got_a_section = TRUE;
+  print_strings (filename, NULL, sect->filepos, 0, sectsize, (char *) mem);
+  free (mem);

 }
 
 /* Scan all of the sections in FILE, and print the strings
 }
 
 /* Scan all of the sections in FILE, and print the strings


@@ -346,7 +357,11 @@ strings_a_section (bfd *abfd, asection *sect, void *filearg)
 static bfd_boolean
 strings_object_file (const char *file)
 {
 static bfd_boolean
 strings_object_file (const char *file)
 {

-  bfd *abfd = bfd_openr (file, target);
+  bfd *abfd;
+  asection *s;
+  bfd_boolean got_a_section;
+
+  abfd = bfd_openr (file, target);

 
   if (abfd == NULL)
     /* Treat the file as a non-object file.  */
 
   if (abfd == NULL)
     /* Treat the file as a non-object file.  */


@@ -362,7 +377,8 @@ strings_object_file (const char *file)
     }
 
   got_a_section = FALSE;
     }
 
   got_a_section = FALSE;

-  bfd_map_over_sections (abfd, strings_a_section, (void *) file);
+  for (s = abfd->sections; s != NULL; s = s->next)
+    strings_a_section (abfd, s, file, &got_a_section);

 
   if (!bfd_close (abfd))
     {
 
   if (!bfd_close (abfd))
     {


@@ -378,9 +394,11 @@ strings_object_file (const char *file)
 static bfd_boolean
 strings_file (char *file)
 {
 static bfd_boolean
 strings_file (char *file)
 {

-  statbuf st;
+  struct stat st;
+
+  /* get_file_size does not support non-S_ISREG files.  */

 
 

-  if (file_stat (file, &st) < 0)
+  if (stat (file, &st) < 0)

     {
       if (errno == ENOENT)
        non_fatal (_("'%s': No such file"), file);
     {
       if (errno == ENOENT)
        non_fatal (_("'%s': No such file"), file);


@@ -389,6 +407,11 @@ strings_file (char *file)
                   file, strerror (errno));
       return FALSE;
     }
                   file, strerror (errno));
       return FALSE;
     }

+  else if (S_ISDIR (st.st_mode))
+    {
+      non_fatal (_("Warning: '%s' is a directory"), file);
+      return FALSE;
+    }

 
   /* If we weren't told to scan the whole file,
      try to open it as an object file and only look at
 
   /* If we weren't told to scan the whole file,
      try to open it as an object file and only look at


@@ -398,7 +421,7 @@ strings_file (char *file)
     {
       FILE *stream;
 
     {
       FILE *stream;
 

-      stream = file_open (file, FOPEN_RB);
+      stream = fopen (file, FOPEN_RB);

       if (stream == NULL)
        {
          fprintf (stderr, "%s: ", program_name);
       if (stream == NULL)
        {
          fprintf (stderr, "%s: ", program_name);


@@ -406,7 +429,7 @@ strings_file (char *file)
          return FALSE;
        }
 
          return FALSE;
        }
 

-      print_strings (file, stream, (file_off) 0, 0, 0, (char *) 0);
+      print_strings (file, stream, (file_ptr) 0, 0, 0, (char *) 0);

 
       if (fclose (stream) == EOF)
        {
 
       if (fclose (stream) == EOF)
        {


@@ -430,11 +453,10 @@ strings_file (char *file)
    MAGICCOUNT is how many characters are in it.  */
 
 static long
    MAGICCOUNT is how many characters are in it.  */
 
 static long

-get_char (FILE *stream, file_off *address, int *magiccount, char **magic)
+get_char (FILE *stream, file_ptr *address, int *magiccount, char **magic)

 {
   int c, i;
 {
   int c, i;

-  long r = EOF;
-  unsigned char buf[4];
+  long r = 0;

 
   for (i = 0; i < encoding_bytes; i++)
     {
 
   for (i = 0; i < encoding_bytes; i++)
     {


@@ -462,36 +484,75 @@ get_char (FILE *stream, file_off *address, int *magiccount, char **magic)
        }
 
       (*address)++;
        }
 
       (*address)++;

-      buf[i] = c;
+      r = (r << 8) | (c & 0xff);

     }
 
   switch (encoding)
     {
     }
 
   switch (encoding)
     {

-    case 'S':
-    case 's':
-      r = buf[0];
-      break;
-    case 'b':
-      r = (buf[0] << 8) | buf[1];
+    default:

       break;
     case 'l':
       break;
     case 'l':

-      r = buf[0] | (buf[1] << 8);
-      break;
-    case 'B':
-      r = ((long) buf[0] << 24) | ((long) buf[1] << 16) |
-       ((long) buf[2] << 8) | buf[3];
+      r = ((r & 0xff) << 8) | ((r & 0xff00) >> 8);

       break;
     case 'L':
       break;
     case 'L':

-      r = buf[0] | ((long) buf[1] << 8) | ((long) buf[2] << 16) |
-       ((long) buf[3] << 24);
+      r = (((r & 0xff) << 24) | ((r & 0xff00) << 8)
+          | ((r & 0xff0000) >> 8) | ((r & 0xff000000) >> 24));

       break;
     }
 
       break;
     }
 

-  if (r == EOF)
-    return 0;
-

   return r;
 }
   return r;
 }

+
+/* Throw away one byte of a (possibly) multi-byte char C, updating
+   address and buffer to suit.  */
+
+static void
+unget_part_char (long c, file_ptr *address, int *magiccount, char **magic)
+{
+  static char tmp[4];
+
+  if (encoding_bytes > 1)
+    {
+      *address -= encoding_bytes - 1;
+
+      if (*magiccount == 0)
+       {
+         /* If no magic buffer exists, use temp buffer.  */
+         switch (encoding)
+           {
+           default:
+             break;
+           case 'b':
+             tmp[0] = c & 0xff;
+             *magiccount = 1;
+             break;
+           case 'l':
+             tmp[0] = (c >> 8) & 0xff;
+             *magiccount = 1;
+             break;
+           case 'B':
+             tmp[0] = (c >> 16) & 0xff;
+             tmp[1] = (c >> 8) & 0xff;
+             tmp[2] = c & 0xff;
+             *magiccount = 3;
+             break;
+           case 'L':
+             tmp[0] = (c >> 8) & 0xff;
+             tmp[1] = (c >> 16) & 0xff;
+             tmp[2] = (c >> 24) & 0xff;
+             *magiccount = 3;
+             break;
+           }
+         *magic = tmp;
+       }
+      else
+       {
+         /* If magic buffer exists, rewind.  */
+         *magic -= encoding_bytes - 1;
+         *magiccount += encoding_bytes - 1;
+       }
+    }
+}

 \f
 /* Find the strings in file FILENAME, read from STREAM.
    Assume that STREAM is positioned so that the next byte read
 \f
 /* Find the strings in file FILENAME, read from STREAM.
    Assume that STREAM is positioned so that the next byte read


@@ -506,14 +567,14 @@ get_char (FILE *stream, file_off *address, int *magiccount, char **magic)
    Those characters come at address ADDRESS and the data in STREAM follow.  */
 
 static void
    Those characters come at address ADDRESS and the data in STREAM follow.  */
 
 static void

-print_strings (const char *filename, FILE *stream, file_off address,
+print_strings (const char *filename, FILE *stream, file_ptr address,

               int stop_point, int magiccount, char *magic)
 {
   char *buf = (char *) xmalloc (sizeof (char) * (string_min + 1));
 
   while (1)
     {
               int stop_point, int magiccount, char *magic)
 {
   char *buf = (char *) xmalloc (sizeof (char) * (string_min + 1));
 
   while (1)
     {

-      file_off start;
+      file_ptr start;

       int i;
       long c;
 
       int i;
       long c;
 


@@ -526,10 +587,17 @@ print_strings (const char *filename, FILE *stream, file_off address,
        {
          c = get_char (stream, &address, &magiccount, &magic);
          if (c == EOF)
        {
          c = get_char (stream, &address, &magiccount, &magic);
          if (c == EOF)

-           return;
+           {
+             free (buf);
+             return;
+           }
+

          if (! STRING_ISGRAPHIC (c))
          if (! STRING_ISGRAPHIC (c))

-           /* Found a non-graphic.  Try again starting with next char.  */
-           goto tryline;
+           {
+             /* Found a non-graphic.  Try again starting with next byte.  */
+             unget_part_char (c, &address, &magiccount, &magic);
+             goto tryline;
+           }

          buf[i] = c;
        }
 
          buf[i] = c;
        }
 


@@ -542,49 +610,61 @@ print_strings (const char *filename, FILE *stream, file_off address,
        switch (address_radix)
          {
          case 8:
        switch (address_radix)
          {
          case 8:

-#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
+#ifdef HAVE_LONG_LONG

            if (sizeof (start) > sizeof (long))
            if (sizeof (start) > sizeof (long))

-             printf ("%7Lo ", (unsigned long long) start);
-           else
-#else
-# if !BFD_HOST_64BIT_LONG
-           if (start != (unsigned long) start)
-             printf ("++%7lo ", (unsigned long) start);
-           else
+             {
+# ifndef __MSVCRT__
+               printf ("%7llo ", (unsigned long long) start);
+# else
+               printf ("%7I64o ", (unsigned long long) start);

 # endif
 # endif

+             }
+           else
+#elif !BFD_HOST_64BIT_LONG
+             if (start != (unsigned long) start)
+               printf ("++%7lo ", (unsigned long) start);
+             else

 #endif
 #endif

-             printf ("%7lo ", (unsigned long) start);
+               printf ("%7lo ", (unsigned long) start);

            break;
 
          case 10:
            break;
 
          case 10:

-#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
+#ifdef HAVE_LONG_LONG

            if (sizeof (start) > sizeof (long))
            if (sizeof (start) > sizeof (long))

-             printf ("%7Ld ", (unsigned long long) start);
-           else
-#else
-# if !BFD_HOST_64BIT_LONG
-           if (start != (unsigned long) start)
-             printf ("++%7ld ", (unsigned long) start);
-           else
+             {
+# ifndef __MSVCRT__
+               printf ("%7llu ", (unsigned long long) start);
+# else
+               printf ("%7I64d ", (unsigned long long) start);

 # endif
 # endif

+             }
+           else
+#elif !BFD_HOST_64BIT_LONG
+             if (start != (unsigned long) start)
+               printf ("++%7lu ", (unsigned long) start);
+             else

 #endif
 #endif

-             printf ("%7ld ", (long) start);
+               printf ("%7ld ", (long) start);

            break;
 
          case 16:
            break;
 
          case 16:

-#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2)
+#ifdef HAVE_LONG_LONG

            if (sizeof (start) > sizeof (long))
            if (sizeof (start) > sizeof (long))

-             printf ("%7Lx ", (unsigned long long) start);
-           else
-#else
-# if !BFD_HOST_64BIT_LONG
-           if (start != (unsigned long) start)
-             printf ("%lx%8.8lx ", (unsigned long) (start >> 32),
-                     (unsigned long) (start & 0xffffffff));
-           else
+             {
+# ifndef __MSVCRT__
+               printf ("%7llx ", (unsigned long long) start);
+# else
+               printf ("%7I64x ", (unsigned long long) start);

 # endif
 # endif

+             }
+           else
+#elif !BFD_HOST_64BIT_LONG
+             if (start != (unsigned long) start)
+               printf ("%lx%8.8lx ", (unsigned long) (start >> 32),
+                       (unsigned long) (start & 0xffffffff));
+             else

 #endif
 #endif

-             printf ("%7lx ", (unsigned long) start);
+               printf ("%7lx ", (unsigned long) start);

            break;
          }
 
            break;
          }
 


@@ -597,78 +677,53 @@ print_strings (const char *filename, FILE *stream, file_off address,
          if (c == EOF)
            break;
          if (! STRING_ISGRAPHIC (c))
          if (c == EOF)
            break;
          if (! STRING_ISGRAPHIC (c))

-           break;
+           {
+             unget_part_char (c, &address, &magiccount, &magic);
+             break;
+           }

          putchar (c);
        }
 
          putchar (c);
        }
 

-      putchar ('\n');
-    }
-}
-\f
-/* 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';
+      if (output_separator)
+       fputs (output_separator, stdout);

       else
       else

-       value += (c & ~40) - 'A';
+       putchar ('\n');

     }
     }

-
-  if (c == 'b')
-    value *= 512;
-  else if (c == 'B')
-    value *= 1024;
-  else
-    p--;
-
-  if (*p)
-    fatal (_("invalid integer argument %s"), s);
-
-  return value;
+  free (buf);

 }
 }

-
+\f

 static void
 usage (FILE *stream, int status)
 {
   fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
   fprintf (stream, _(" Display printable strings in [file(s)] (stdin by default)\n"));
 static void
 usage (FILE *stream, int status)
 {
   fprintf (stream, _("Usage: %s [option(s)] [file(s)]\n"), program_name);
   fprintf (stream, _(" Display printable strings in [file(s)] (stdin by default)\n"));

-  fprintf (stream, _(" The options are:\n\
+  fprintf (stream, _(" The options are:\n"));
+
+  if (DEFAULT_STRINGS_ALL)
+    fprintf (stream, _("\
+  -a - --all                Scan the entire file, not just the data section [default]\n\
+  -d --data                 Only scan the data sections in the file\n"));
+  else
+    fprintf (stream, _("\

   -a - --all                Scan the entire file, not just the data section\n\
   -a - --all                Scan the entire file, not just the data section\n\

+  -d --data                 Only scan the data sections in the file [default]\n"));
+
+  fprintf (stream, _("\

   -f --print-file-name      Print the name of the file before each string\n\
   -n --bytes=[number]       Locate & print any NUL-terminated sequence of at\n\
   -f --print-file-name      Print the name of the file before each string\n\
   -n --bytes=[number]       Locate & print any NUL-terminated sequence of at\n\

-  -<number>                 least [number] characters (default 4).\n\
+  -<number>                   least [number] characters (default 4).\n\

   -t --radix={o,d,x}        Print the location of the string in base 8, 10 or 16\n\
   -t --radix={o,d,x}        Print the location of the string in base 8, 10 or 16\n\

+  -w --include-all-whitespace Include all whitespace as valid string characters\n\

   -o                        An alias for --radix=o\n\
   -T --target=<BFDNAME>     Specify the binary file format\n\
   -e --encoding={s,S,b,l,B,L} Select character size and endianness:\n\
                             s = 7-bit, S = 8-bit, {b,l} = 16-bit, {B,L} = 32-bit\n\
   -o                        An alias for --radix=o\n\
   -T --target=<BFDNAME>     Specify the binary file format\n\
   -e --encoding={s,S,b,l,B,L} Select character size and endianness:\n\
                             s = 7-bit, S = 8-bit, {b,l} = 16-bit, {B,L} = 32-bit\n\

+  -s --output-separator=<string> String used to separate strings in output.\n\
+  @<file>                   Read options from <file>\n\

   -h --help                 Display this information\n\
   -h --help                 Display this information\n\

-  -v --version              Print the program's version number\n"));
+  -v -V --version           Print the program's version number\n"));

   list_supported_targets (program_name, stream);
   list_supported_targets (program_name, stream);

-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)

     fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
   exit (status);
 }
     fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
   exit (status);
 }