Handle CRLF when reading XML on Windows

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

diff --git a/binutils/strings.c b/binutils/strings.c
index c6cf10ddca63d6956080d717ce1da770ad618476..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
-   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,


@@ -14,15 +13,18 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 \f
 /* Usage: strings [options] file...
 
    Options:
    --all
    -a
 \f
 /* Usage: strings [options] file...
 
    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,52 +38,50 @@
    -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.)
 

-   --encoding={s,b,l,B,L}
-   -e {s,b,l,B,L}
-               Select character encoding: single-byte, bigendian 16-bit,
-               littleendian 16-bit, bigendian 32-bit, littleendian 32-bit
+   --encoding={s,S,b,l,B,L}
+   -e {s,S,b,l,B,L}
+               Select character encoding: 7-bit-character, 8-bit-character,
+               bigendian 16-bit, littleendian 16-bit, bigendian 32-bit,
+               littleendian 32-bit.

 
    --target=BFDNAME
 
    --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>.  */
 

+#include "sysdep.h"

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

-#include <stdio.h>
-#include <getopt.h>
-#include <errno.h>
-#include "bucomm.h"
+#include "getopt.h"

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

+#include "bucomm.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
-
-#define isgraphic(c) (ISPRINT (c) || (c) == '\t')
+#define STRING_ISGRAPHIC(c) \
+      (   (c) >= 0 \
+       && (c) <= 255 \
+       && ((c) == '\t' || ISPRINT (c) || (encoding == 'S' && (c) > 127) \
+          || (include_all_whitespace && ISSPACE (c))) \
+      )

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


@@ -96,17 +96,17 @@ static int address_radix;
 /* Minimum length of sequence of graphic chars to trigger output.  */
 static int string_min;
 
 /* Minimum length of sequence of graphic chars to trigger output.  */
 static int string_min;
 

-/* true means print address within file for each string.  */
-static boolean print_addresses;
+/* Whether or not we include all whitespace as a graphic char.   */
+static bfd_boolean include_all_whitespace;

 
 

-/* true means print filename for each string.  */
-static boolean print_filenames;
+/* TRUE means print address within file for each string.  */
+static bfd_boolean print_addresses;

 
 

-/* true means for object files scan only the data section.  */
-static boolean datasection_only;
+/* TRUE means print filename for each string.  */
+static bfd_boolean print_filenames;

 
 

-/* true if we found an initialized data section in the current file.  */
-static boolean got_a_section;
+/* TRUE means for object files scan only the data section.  */
+static bfd_boolean datasection_only;

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


@@ -115,36 +115,39 @@ 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 PARAMS ((bfd *, asection *, PTR));
-static boolean strings_object_file PARAMS ((const char *));
-static boolean strings_file PARAMS ((char *file));
-static int integer_arg PARAMS ((char *s));
-static void print_strings PARAMS ((const char *filename, FILE *stream,
-                                 file_ptr address, int stop_point,
-                                 int magiccount, char *magic));
-static void usage PARAMS ((FILE *stream, int status));
+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
 \f

+int main (int, char **);
+

 int
 int

-main (argc, argv)
-     int argc;
-     char **argv;
+main (int argc, char **argv)

 {
   int optc;
   int exit_status = 0;
 {
   int optc;
   int exit_status = 0;

-  boolean files_given = false;
+  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, "");


@@ -154,44 +157,60 @@ main (argc, argv)
 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);
 
   program_name = argv[0];
   xmalloc_set_program_name (program_name);

-  string_min = -1;
-  print_addresses = false;
-  print_filenames = false;
-  datasection_only = true;
+  bfd_set_error_program_name (program_name);
+
+  expandargv (&argc, &argv);
+
+  string_min = 4;
+  include_all_whitespace = FALSE;
+  print_addresses = FALSE;
+  print_filenames = FALSE;
+  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, "afn:ot:e:v0123456789",
+  while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:Vv0123456789",

                              long_options, (int *) 0)) != EOF)
     {
       switch (optc)
        {
        case 'a':
                              long_options, (int *) 0)) != EOF)
     {
       switch (optc)
        {
        case 'a':

-         datasection_only = false;
+         datasection_only = FALSE;
+         break;
+
+       case 'd':
+         datasection_only = TRUE;

          break;
 
        case 'f':
          break;
 
        case 'f':

-         print_filenames = true;
+         print_filenames = TRUE;

          break;
 
          break;
 

+       case 'H':

        case 'h':
          usage (stdout, 0);
 
        case 'n':
        case 'h':
          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':

-         print_addresses = true;
+         print_addresses = TRUE;

          address_radix = 8;
          break;
 
        case 't':
          address_radix = 8;
          break;
 
        case 't':

-         print_addresses = true;
+         print_addresses = TRUE;

          if (optarg[1] != '\0')
            usage (stderr, 1);
          switch (optarg[0])
          if (optarg[1] != '\0')
            usage (stderr, 1);
          switch (optarg[0])


@@ -223,6 +242,11 @@ main (argc, argv)
          encoding = optarg[0];
          break;
 
          encoding = optarg[0];
          break;
 

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

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


@@ -231,19 +255,23 @@ main (argc, 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)
     {

+    case 'S':

     case 's':
       encoding_bytes = 1;
       break;
     case 's':
       encoding_bytes = 1;
       break;


@@ -259,108 +287,132 @@ main (argc, 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)
     {
   set_default_bfd_target ();
 
   if (optind >= argc)
     {

-      datasection_only = false;
-#ifdef SET_BINARY
+      datasection_only = FALSE;

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

-#endif

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

-      files_given = true;
+      files_given = TRUE;

     }
   else
     {
       for (; optind < argc; ++optind)
        {
          if (strcmp (argv[optind], "-") == 0)
     }
   else
     {
       for (; optind < argc; ++optind)
        {
          if (strcmp (argv[optind], "-") == 0)

-           datasection_only = false;
+           datasection_only = FALSE;

          else
            {
          else
            {

-             files_given = true;
-             exit_status |= (strings_file (argv[optind]) == false);
+             files_given = TRUE;
+             exit_status |= !strings_file (argv[optind]);

            }
        }
     }
 
            }
        }
     }
 

-  if (files_given == false)
+  if (!files_given)

     usage (stderr, 1);
 
   return (exit_status);
 }
 \f
     usage (stderr, 1);
 
   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 (abfd, sect, filearg)
-     bfd *abfd;
-     asection *sect;
-     PTR 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)
+  if ((sect->flags & DATA_FLAGS) != DATA_FLAGS)
+    return;
+
+  sectsize = bfd_section_size (sect);
+  if (sectsize == 0)
+    return;
+
+  if (!bfd_malloc_and_get_section (abfd, sect, &mem))

     {
     {

-      bfd_size_type sz = bfd_get_section_size_before_reloc (sect);
-      PTR mem = xmalloc (sz);
-      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);
+      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
    in the initialized data section(s).
 
 }
 
 /* Scan all of the sections in FILE, and print the strings
    in the initialized data section(s).
 

-   Return true if successful,
-   false if not (such as if FILE is not an object file).  */
+   Return TRUE if successful,
+   FALSE if not (such as if FILE is not an object file).  */

 
 

-static boolean
-strings_object_file (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)
 
   if (abfd == NULL)

-    {
-      /* Treat the file as a non-object file.  */
-      return false;
-    }
+    /* Treat the file as a non-object file.  */
+    return FALSE;

 
   /* This call is mainly for its side effect of reading in the sections.
      We follow the traditional behavior of `strings' in that we don't
      complain if we don't recognize a file to be an object file.  */
 
   /* This call is mainly for its side effect of reading in the sections.
      We follow the traditional behavior of `strings' in that we don't
      complain if we don't recognize a file to be an object file.  */

-  if (bfd_check_format (abfd, bfd_object) == false)
+  if (!bfd_check_format (abfd, bfd_object))

     {
       bfd_close (abfd);
     {
       bfd_close (abfd);

-      return false;
+      return FALSE;

     }
 
     }
 

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

 
   if (!bfd_close (abfd))
     {
       bfd_nonfatal (file);
 
   if (!bfd_close (abfd))
     {
       bfd_nonfatal (file);

-      return false;
+      return FALSE;

     }
 
   return got_a_section;
 }
 
     }
 
   return got_a_section;
 }
 

-/* Print the strings in FILE.  Return true if ok, false if an error occurs.  */
+/* Print the strings in FILE.  Return TRUE if ok, FALSE if an error occurs.  */

 
 

-static boolean
-strings_file (file)
-     char *file;
+static bfd_boolean
+strings_file (char *file)

 {
 {

+  struct stat st;
+
+  /* get_file_size does not support non-S_ISREG files.  */
+
+  if (stat (file, &st) < 0)
+    {
+      if (errno == ENOENT)
+       non_fatal (_("'%s': No such file"), file);
+      else
+       non_fatal (_("Warning: could not locate '%s'.  reason: %s"),
+                  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
      initialized data sections.  If that fails, fall back to the
   /* If we weren't told to scan the whole file,
      try to open it as an object file and only look at
      initialized data sections.  If that fails, fall back to the


@@ -369,15 +421,12 @@ strings_file (file)
     {
       FILE *stream;
 
     {
       FILE *stream;
 

-      stream = fopen (file, "rb");
-      /* Not all systems permit "rb", so try "r" if it failed.  */
-      if (stream == NULL)
-       stream = fopen (file, "r");
+      stream = fopen (file, FOPEN_RB);

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

-         return false;
+         return FALSE;

        }
 
       print_strings (file, stream, (file_ptr) 0, 0, 0, (char *) 0);
        }
 
       print_strings (file, stream, (file_ptr) 0, 0, 0, (char *) 0);


@@ -386,11 +435,11 @@ strings_file (file)
        {
          fprintf (stderr, "%s: ", program_name);
          perror (file);
        {
          fprintf (stderr, "%s: ", program_name);
          perror (file);

-         return false;
+         return FALSE;

        }
     }
 
        }
     }
 

-  return true;
+  return TRUE;

 }
 \f
 /* Read the next character, return EOF if none available.
 }
 \f
 /* Read the next character, return EOF if none available.


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

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

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

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

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


@@ -425,41 +469,90 @@ get_char (stream, address, magiccount, magic)
        {
          if (stream == NULL)
            return EOF;
        {
          if (stream == NULL)
            return EOF;

+
+         /* Only use getc_unlocked if we found a declaration for it.
+            Otherwise, libc is not thread safe by default, and we
+            should not use it.  */
+
+#if defined(HAVE_GETC_UNLOCKED) && HAVE_DECL_GETC_UNLOCKED
+         c = getc_unlocked (stream);
+#else

          c = getc (stream);
          c = getc (stream);

+#endif

          if (c == EOF)
            return EOF;
        }
 
       (*address)++;
          if (c == EOF)
            return EOF;
        }
 
       (*address)++;

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

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

-    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


@@ -474,13 +567,8 @@ get_char (stream, address, magiccount, 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 (filename, stream, address, stop_point, magiccount, magic)
-     const char *filename;
-     FILE *stream;
-     file_ptr address;
-     int stop_point;
-     int magiccount;
-     char *magic;
+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));
 
 {
   char *buf = (char *) xmalloc (sizeof (char) * (string_min + 1));
 


@@ -499,15 +587,22 @@ print_strings (filename, stream, address, stop_point, magiccount, magic)
        {
          c = get_char (stream, &address, &magiccount, &magic);
          if (c == EOF)
        {
          c = get_char (stream, &address, &magiccount, &magic);
          if (c == EOF)

-           return;
-         if (c > 255 || c < 0 || !isgraphic (c))
-           /* Found a non-graphic.  Try again starting with next char.  */
-           goto tryline;
+           {
+             free (buf);
+             return;
+           }
+
+         if (! STRING_ISGRAPHIC (c))
+           {
+             /* Found a non-graphic.  Try again starting with next byte.  */
+             unget_part_char (c, &address, &magiccount, &magic);
+             goto tryline;
+           }

          buf[i] = c;
        }
 
       /* We found a run of `string_min' graphic characters.  Print up
          buf[i] = c;
        }
 
       /* We found a run of `string_min' graphic characters.  Print up

-         to the next non-graphic character.  */
+        to the next non-graphic character.  */

 
       if (print_filenames)
        printf ("%s: ", filename);
 
       if (print_filenames)
        printf ("%s: ", filename);


@@ -515,15 +610,61 @@ print_strings (filename, stream, address, stop_point, magiccount, magic)
        switch (address_radix)
          {
          case 8:
        switch (address_radix)
          {
          case 8:

-           printf ("%7lo ", (unsigned long) start);
+#ifdef HAVE_LONG_LONG
+           if (sizeof (start) > sizeof (long))
+             {
+# ifndef __MSVCRT__
+               printf ("%7llo ", (unsigned long long) start);
+# else
+               printf ("%7I64o ", (unsigned long long) start);
+# endif
+             }
+           else
+#elif !BFD_HOST_64BIT_LONG
+             if (start != (unsigned long) start)
+               printf ("++%7lo ", (unsigned long) start);
+             else
+#endif
+               printf ("%7lo ", (unsigned long) start);

            break;
 
          case 10:
            break;
 
          case 10:

-           printf ("%7ld ", (long) start);
+#ifdef HAVE_LONG_LONG
+           if (sizeof (start) > sizeof (long))
+             {
+# ifndef __MSVCRT__
+               printf ("%7llu ", (unsigned long long) start);
+# else
+               printf ("%7I64d ", (unsigned long long) start);
+# endif
+             }
+           else
+#elif !BFD_HOST_64BIT_LONG
+             if (start != (unsigned long) start)
+               printf ("++%7lu ", (unsigned long) start);
+             else
+#endif
+               printf ("%7ld ", (long) start);

            break;
 
          case 16:
            break;
 
          case 16:

-           printf ("%7lx ", (unsigned long) start);
+#ifdef HAVE_LONG_LONG
+           if (sizeof (start) > sizeof (long))
+             {
+# ifndef __MSVCRT__
+               printf ("%7llx ", (unsigned long long) start);
+# else
+               printf ("%7I64x ", (unsigned long long) start);
+# 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
+               printf ("%7lx ", (unsigned long) start);

            break;
          }
 
            break;
          }
 


@@ -535,74 +676,54 @@ print_strings (filename, stream, address, stop_point, magiccount, magic)
          c = get_char (stream, &address, &magiccount, &magic);
          if (c == EOF)
            break;
          c = get_char (stream, &address, &magiccount, &magic);
          if (c == EOF)
            break;

-         if (c > 255 || c < 0 || !isgraphic (c))
-           break;
+         if (! STRING_ISGRAPHIC (c))
+           {
+             unget_part_char (c, &address, &magiccount, &magic);
+             break;
+           }

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

-      putchar ('\n');
+      if (output_separator)
+       fputs (output_separator, stdout);
+      else
+       putchar ('\n');

     }
     }

+  free (buf);

 }
 \f
 }
 \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 (s)
-     char *s;
+static void
+usage (FILE *stream, int status)

 {
 {

-  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;
+  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"));
+
+  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
   else

-    p--;
+    fprintf (stream, _("\
+  -a - --all                Scan the entire file, not just the data section\n\
+  -d --data                 Only scan the data sections in the file [default]\n"));

 
 

-  if (*p)
-    {
-      fatal (_("invalid integer argument %s"), s);
-    }
-  return value;
-}
-
-static void
-usage (stream, status)
-     FILE *stream;
-     int status;
-{

   fprintf (stream, _("\
   fprintf (stream, _("\

-Usage: %s [-afov] [-n min-len] [-min-len] [-t {o,x,d}] [-e {s,b,l,B,L}]\n\
-       [-] [--all] [--print-file-name] [--bytes=min-len] [--radix={o,x,d}]\n\
-       [--target=bfdname] [--encoding {s,b,l,B,L}] [--help] [--version] file...\n"),
-          program_name);
+  -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\
+  -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\
+  -s --output-separator=<string> String used to separate strings in output.\n\
+  @<file>                   Read options from <file>\n\
+  -h --help                 Display this information\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);
 }