X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=binutils%2Fstrings.c;h=58b7e8ab13d4ed03ab774cde22d79a895c73b9d3;hb=128e85e3ab36b8e30f6612fb50de3cbb4ede6824;hp=bb00d41b8862b2ea66a9cf24c76fc3a65c27bd46;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git diff --git a/binutils/strings.c b/binutils/strings.c index bb00d41b88..58b7e8ab13 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-2014 Free Software Foundation, Inc. + Copyright (C) 1993-2016 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 @@ -21,7 +21,10 @@ 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. @@ -35,6 +38,10 @@ -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.) @@ -48,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. @@ -68,7 +79,9 @@ #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 == TRUE && ISSPACE (c))) \ + ) #ifndef errno extern int errno; @@ -83,6 +96,9 @@ 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; @@ -102,14 +118,20 @@ 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'}, + {"data", no_argument, NULL, 'd'}, {"print-file-name", no_argument, NULL, 'f'}, {"bytes", required_argument, NULL, 'n'}, {"radix", required_argument, NULL, 't'}, + {"include-all-whitespace", required_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} @@ -124,12 +146,9 @@ typedef struct 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 *file); +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 **); @@ -150,17 +169,23 @@ 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); string_min = 4; + include_all_whitespace = 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'; + output_separator = NULL; - while ((optc = getopt_long (argc, argv, "afhHn:ot:e:T:Vv0123456789", + while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:Vv0123456789", long_options, (int *) 0)) != EOF) { switch (optc) @@ -169,6 +194,10 @@ main (int argc, char **argv) datasection_only = FALSE; break; + case 'd': + datasection_only = TRUE; + break; + case 'f': print_filenames = TRUE; break; @@ -183,6 +212,10 @@ main (int argc, char **argv) fatal (_("invalid integer argument %s"), optarg); break; + case 'w': + include_all_whitespace = TRUE; + break; + case 'o': print_addresses = TRUE; address_radix = 8; @@ -221,6 +254,10 @@ main (int argc, char **argv) encoding = optarg[0]; break; + case 's': + output_separator = optarg; + break; + case 'V': case 'v': print_version ("strings"); @@ -307,12 +344,12 @@ strings_a_section (bfd *abfd, asection *sect, void *arg) bfd_size_type *filesizep; bfd_size_type sectsize; void *mem; - + if ((sect->flags & DATA_FLAGS) != DATA_FLAGS) return; sectsize = bfd_get_section_size (sect); - + if (sectsize <= 0) return; @@ -323,7 +360,7 @@ strings_a_section (bfd *abfd, asection *sect, void *arg) if (*filesizep == 0) { struct stat st; - + if (bfd_stat (abfd, &st)) return; @@ -552,14 +589,14 @@ print_strings (const char *filename, FILE *stream, file_ptr address, switch (address_radix) { case 8: -#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2) +#ifdef HAVE_LONG_LONG if (sizeof (start) > sizeof (long)) { -#ifndef __MSVCRT__ +# ifndef __MSVCRT__ printf ("%7llo ", (unsigned long long) start); -#else +# else printf ("%7I64o ", (unsigned long long) start); -#endif +# endif } else #elif !BFD_HOST_64BIT_LONG @@ -571,14 +608,14 @@ print_strings (const char *filename, FILE *stream, file_ptr address, break; case 10: -#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2) +#ifdef HAVE_LONG_LONG if (sizeof (start) > sizeof (long)) { -#ifndef __MSVCRT__ +# ifndef __MSVCRT__ printf ("%7lld ", (unsigned long long) start); -#else +# else printf ("%7I64d ", (unsigned long long) start); -#endif +# endif } else #elif !BFD_HOST_64BIT_LONG @@ -590,14 +627,14 @@ print_strings (const char *filename, FILE *stream, file_ptr address, break; case 16: -#if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2) +#ifdef HAVE_LONG_LONG if (sizeof (start) > sizeof (long)) { -#ifndef __MSVCRT__ +# ifndef __MSVCRT__ printf ("%7llx ", (unsigned long long) start); -#else +# else printf ("%7I64x ", (unsigned long long) start); -#endif +# endif } else #elif !BFD_HOST_64BIT_LONG @@ -623,7 +660,10 @@ print_strings (const char *filename, FILE *stream, file_ptr address, putchar (c); } - putchar ('\n'); + if (output_separator) + fputs (output_separator, stdout); + else + putchar ('\n'); } free (buf); } @@ -633,16 +673,28 @@ 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\ + -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\ - 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= 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"));