X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=binutils%2Fstrings.c;h=dc42a6f2f904a75aa41313ab0e8fc71391101945;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=8f215e52a4072455c9c5755134ff520aeb3efcd0;hpb=b90efa5b79ac1524ec260f8eb89d1be37e0219a7;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/strings.c b/binutils/strings.c index 8f215e52a4..dc42a6f2f9 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-2015 Free Software Foundation, Inc. + Copyright (C) 1993-2020 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 @@ -55,6 +55,10 @@ -T {bfdname} 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. @@ -76,7 +80,7 @@ ( (c) >= 0 \ && (c) <= 255 \ && ((c) == '\t' || ISPRINT (c) || (encoding == 'S' && (c) > 127) \ - || (include_all_whitespace == TRUE && ISSPACE (c))) \ + || (include_all_whitespace && ISSPACE (c))) \ ) #ifndef errno @@ -104,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; @@ -114,6 +115,9 @@ static char *target; 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'}, @@ -121,29 +125,18 @@ 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'}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'v'}, {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 void strings_a_section (bfd *, asection *, void *); -static bfd_boolean strings_object_file (const char *); static bfd_boolean strings_file (char *); static void print_strings (const char *, FILE *, file_ptr, int, int, char *); -static void usage (FILE *, int); -static long get_char (FILE *, file_ptr *, int *, char **); +static void usage (FILE *, int) ATTRIBUTE_NORETURN; int main (int, char **); @@ -164,6 +157,7 @@ main (int argc, char **argv) program_name = argv[0]; xmalloc_set_program_name (program_name); + bfd_set_error_program_name (program_name); expandargv (&argc, &argv); @@ -177,8 +171,9 @@ main (int argc, char **argv) datasection_only = TRUE; target = NULL; encoding = 's'; + output_separator = NULL; - while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:Vv0123456789", + while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:Vv0123456789", long_options, (int *) 0)) != EOF) { switch (optc) @@ -247,6 +242,10 @@ main (int argc, char **argv) encoding = optarg[0]; break; + case 's': + output_separator = optarg; + break; + case 'V': case 'v': print_version ("strings"); @@ -288,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) @@ -307,7 +307,7 @@ main (int argc, char **argv) else { files_given = TRUE; - exit_status |= strings_file (argv[optind]) == FALSE; + exit_status |= !strings_file (argv[optind]); } } } @@ -318,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) + sectsize = bfd_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) + if (!bfd_malloc_and_get_section (abfd, sect, &mem)) { - 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) - return; - - mem = xmalloc (sectsize); - - if (bfd_get_section_contents (abfd, sect, mem, (file_ptr) 0, sectsize)) - { - 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); } @@ -385,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); @@ -404,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)) { @@ -435,6 +407,11 @@ strings_file (char *file) 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 @@ -525,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 @@ -563,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; } @@ -582,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: @@ -601,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: @@ -620,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; } @@ -645,11 +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); } - putchar ('\n'); + if (output_separator) + fputs (output_separator, stdout); + else + putchar ('\n'); } free (buf); } @@ -680,6 +718,7 @@ usage (FILE *stream, int status) -T --target= 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 used to separate strings in output.\n\ @ Read options from \n\ -h --help Display this information\n\ -v -V --version Print the program's version number\n"));