X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fstrings.c;h=8150c1181df3250ad2dc5de4f38cdbfad1b7fa71;hb=4762fe621e84347b6e1ad1f2d16d2bc6cd28495e;hp=77d89eb98125591208e6e6e7d52891bbbb80128a;hpb=0e158763b0c5671cd40cdd2faee48d6659489ddd;p=deliverable%2Fbinutils-gdb.git

diff --git a/binutils/strings.c b/binutils/strings.c
index 77d89eb981..8150c1181d 100644
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -1,5 +1,5 @@
 /* strings -- print the strings of printable characters in files
-   Copyright (C) 1993-2017 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
@@ -108,9 +108,6 @@ static bfd_boolean print_filenames;
 /* 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;
 
@@ -128,7 +125,7 @@ static struct option long_options[] =
   {"print-file-name", no_argument, NULL, 'f'},
   {"bytes", required_argument, NULL, 'n'},
   {"radix", required_argument, NULL, 't'},
-  {"include-all-whitespace", required_argument, NULL, 'w'},
+  {"include-all-whitespace", no_argument, NULL, 'w'},
   {"encoding", required_argument, NULL, 'e'},
   {"target", required_argument, NULL, 'T'},
   {"output-separator", required_argument, NULL, 's'},
@@ -137,15 +134,6 @@ static struct option long_options[] =
   {NULL, 0, NULL, 0}
 };
 
-/* Records the size of a named file so that we
-   do not repeatedly run bfd_stat() on it.  */
-
-typedef struct
-{
-  const char *  filename;
-  bfd_size_type filesize;
-} filename_and_size_t;
-
 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;
@@ -299,7 +287,8 @@ main (int argc, char **argv)
       usage (stderr, 1);
     }
 
-  bfd_init ();
+  if (bfd_init () != BFD_INIT_MAGIC)
+    fatal (_("fatal error: libbfd ABI mismatch"));
   set_default_bfd_target ();
 
   if (optind >= argc)
@@ -329,61 +318,33 @@ main (int argc, char **argv)
   return (exit_status);
 }
 
-/* Scan section SECT of the file ABFD, whose printable name is in
-   ARG->filename and whose size might be in ARG->filesize.  If it
-   contains initialized data set `got_a_section' and print the
-   strings in it.
-
-   FIXME: We ought to be able to return error codes/messages for
-   certain conditions.  */
+/* 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
-strings_a_section (bfd *abfd, asection *sect, void *arg)
+strings_a_section (bfd *abfd, asection *sect, const char *filename,
+		   bfd_boolean *got_a_section)
 {
-  filename_and_size_t * filename_and_sizep;
-  bfd_size_type *filesizep;
   bfd_size_type sectsize;
-  void *mem;
+  bfd_byte *mem;
 
   if ((sect->flags & DATA_FLAGS) != DATA_FLAGS)
     return;
 
-  sectsize = bfd_get_section_size (sect);
-
-  if (sectsize <= 0)
-    return;
-
-  /* Get the size of the file.  This might have been cached for us.  */
-  filename_and_sizep = (filename_and_size_t *) arg;
-  filesizep = & filename_and_sizep->filesize;
-
-  if (*filesizep == 0)
-    {
-      struct stat st;
-
-      if (bfd_stat (abfd, &st))
-	return;
-
-      /* Cache the result so that we do not repeatedly stat this file.  */
-      *filesizep = st.st_size;
-    }
-
-  /* Compare the size of the section against the size of the file.
-     If the section is bigger then the file must be corrupt and
-     we should not try dumping it.  */
-  if (sectsize >= *filesizep)
+  sectsize = bfd_section_size (sect);
+  if (sectsize == 0)
     return;
 
-  mem = xmalloc (sectsize);
-
-  if (bfd_get_section_contents (abfd, sect, mem, (file_ptr) 0, sectsize))
+  if (!bfd_malloc_and_get_section (abfd, sect, &mem))
     {
-      got_a_section = TRUE;
-
-      print_strings (filename_and_sizep->filename, NULL, sect->filepos,
-		     0, sectsize, (char *) 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);
 }
 
@@ -396,8 +357,9 @@ strings_a_section (bfd *abfd, asection *sect, void *arg)
 static bfd_boolean
 strings_object_file (const char *file)
 {
-  filename_and_size_t filename_and_size;
   bfd *abfd;
+  asection *s;
+  bfd_boolean got_a_section;
 
   abfd = bfd_openr (file, target);
 
@@ -415,9 +377,8 @@ strings_object_file (const char *file)
     }
 
   got_a_section = FALSE;
-  filename_and_size.filename = file;
-  filename_and_size.filesize = 0;
-  bfd_map_over_sections (abfd, strings_a_section, & filename_and_size);
+  for (s = abfd->sections; s != NULL; s = s->next)
+    strings_a_section (abfd, s, file, &got_a_section);
 
   if (!bfd_close (abfd))
     {
@@ -541,6 +502,57 @@ get_char (FILE *stream, file_ptr *address, int *magiccount, char **magic)
 
   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;
+	}
+    }
+}
 
 /* Find the strings in file FILENAME, read from STREAM.
    Assume that STREAM is positioned so that the next byte read
@@ -579,9 +591,13 @@ print_strings (const char *filename, FILE *stream, file_ptr address,
 	      free (buf);
 	      return;
 	    }
+
 	  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;
 	}
 
@@ -598,18 +614,18 @@ print_strings (const char *filename, FILE *stream, file_ptr address,
 	    if (sizeof (start) > sizeof (long))
 	      {
 # ifndef __MSVCRT__
-	        printf ("%7llo ", (unsigned long long) start);
+		printf ("%7llo ", (unsigned long long) start);
 # else
-	        printf ("%7I64o ", (unsigned long long) start);
+		printf ("%7I64o ", (unsigned long long) start);
 # endif
 	      }
 	    else
 #elif !BFD_HOST_64BIT_LONG
-	    if (start != (unsigned long) start)
-	      printf ("++%7lo ", (unsigned long) start);
-	    else
+	      if (start != (unsigned long) start)
+		printf ("++%7lo ", (unsigned long) start);
+	      else
 #endif
-	      printf ("%7lo ", (unsigned long) start);
+		printf ("%7lo ", (unsigned long) start);
 	    break;
 
 	  case 10:
@@ -617,18 +633,18 @@ print_strings (const char *filename, FILE *stream, file_ptr address,
 	    if (sizeof (start) > sizeof (long))
 	      {
 # ifndef __MSVCRT__
-	        printf ("%7lld ", (unsigned long long) start);
+		printf ("%7llu ", (unsigned long long) start);
 # else
-	        printf ("%7I64d ", (unsigned long long) start);
+		printf ("%7I64d ", (unsigned long long) start);
 # endif
 	      }
 	    else
 #elif !BFD_HOST_64BIT_LONG
-	    if (start != (unsigned long) start)
-	      printf ("++%7ld ", (unsigned long) start);
-	    else
+	      if (start != (unsigned long) start)
+		printf ("++%7lu ", (unsigned long) start);
+	      else
 #endif
-	      printf ("%7ld ", (long) start);
+		printf ("%7ld ", (long) start);
 	    break;
 
 	  case 16:
@@ -636,19 +652,19 @@ print_strings (const char *filename, FILE *stream, file_ptr address,
 	    if (sizeof (start) > sizeof (long))
 	      {
 # ifndef __MSVCRT__
-	        printf ("%7llx ", (unsigned long long) start);
+		printf ("%7llx ", (unsigned long long) start);
 # else
-	        printf ("%7I64x ", (unsigned long long) start);
+		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
+	      if (start != (unsigned long) start)
+		printf ("%lx%8.8lx ", (unsigned long) (start >> 32),
+			(unsigned long) (start & 0xffffffff));
+	      else
 #endif
-	      printf ("%7lx ", (unsigned long) start);
+		printf ("%7lx ", (unsigned long) start);
 	    break;
 	  }
 
@@ -661,14 +677,17 @@ print_strings (const char *filename, FILE *stream, file_ptr address,
 	  if (c == EOF)
 	    break;
 	  if (! STRING_ISGRAPHIC (c))
-	    break;
+	    {
+	      unget_part_char (c, &address, &magiccount, &magic);
+	      break;
+	    }
 	  putchar (c);
 	}
 
       if (output_separator)
-        fputs (output_separator, stdout);
+	fputs (output_separator, stdout);
       else
-        putchar ('\n');
+	putchar ('\n');
     }
   free (buf);
 }