X-Git-Url: https://oss.titaniummirror.com/gitweb?p=msp430-binutils.git;a=blobdiff_plain;f=binutils%2Fstrings.c;fp=binutils%2Fstrings.c;h=dc2d8f242199914dc9e54070c29bb365aa7d5b5e;hp=11e76089425bf378bae08ca21d99a0baa3194efc;hb=88750007d7869f178f0ba528f41efd3b74c424cf;hpb=6df9443a374e2b81278c61b8afc0a1eef7db280b diff --git a/binutils/strings.c b/binutils/strings.c index 11e7608..dc2d8f2 100644 --- a/binutils/strings.c +++ b/binutils/strings.c @@ -1,6 +1,7 @@ /* strings -- print the strings of printable characters in files Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + 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 @@ -53,6 +54,7 @@ -h Print the usage message on the standard output. --version + -V -v Print the program version number. Written by Richard Stallman @@ -66,23 +68,6 @@ #include #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 -#define SET_BINARY(f) do { if (!isatty (f)) setmode (f,O_BINARY); } while (0) -#endif -#endif - #define STRING_ISGRAPHIC(c) \ ( (c) >= 0 \ && (c) <= 255 \ @@ -160,7 +145,6 @@ typedef struct 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 **); @@ -173,6 +157,8 @@ main (int argc, char **argv) int optc; int exit_status = 0; bfd_boolean files_given = FALSE; + char *s; + int numeric_opt = 0; #if defined (HAVE_SETLOCALE) setlocale (LC_ALL, ""); @@ -185,7 +171,7 @@ main (int argc, char **argv) expandargv (&argc, &argv); - string_min = -1; + string_min = 4; print_addresses = FALSE; print_filenames = FALSE; datasection_only = TRUE; @@ -210,9 +196,9 @@ main (int argc, char **argv) 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 'o': @@ -262,16 +248,19 @@ main (int argc, char **argv) usage (stderr, 1); default: - if (string_min < 0) - string_min = optc - '0'; - else - string_min = string_min * 10 + optc - '0'; + numeric_opt = optind; 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) { @@ -297,9 +286,7 @@ main (int argc, char **argv) if (optind >= argc) { datasection_only = FALSE; -#ifdef SET_BINARY SET_BINARY (fileno (stdin)); -#endif print_strings ("{standard input}", stdin, 0, 0, 0, (char *) NULL); files_given = TRUE; } @@ -375,7 +362,7 @@ strings_a_section (bfd *abfd, asection *sect, void *arg) got_a_section = TRUE; print_strings (filename_and_sizep->filename, NULL, sect->filepos, - 0, sectsize, mem); + 0, sectsize, (char *) mem); } free (mem); @@ -593,14 +580,18 @@ print_strings (const char *filename, FILE *stream, file_off address, case 8: #if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2) if (sizeof (start) > sizeof (long)) - printf ("%7Lo ", (unsigned long long) start); - else + { +#ifndef __MSVCRT__ + printf ("%7llo ", (unsigned long long) start); #else -# if !BFD_HOST_64BIT_LONG + 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 #endif printf ("%7lo ", (unsigned long) start); break; @@ -608,14 +599,18 @@ print_strings (const char *filename, FILE *stream, file_off address, case 10: #if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2) if (sizeof (start) > sizeof (long)) - printf ("%7Ld ", (unsigned long long) start); - else + { +#ifndef __MSVCRT__ + printf ("%7lld ", (unsigned long long) start); #else -# if !BFD_HOST_64BIT_LONG + printf ("%7I64d ", (unsigned long long) start); +#endif + } + else +#elif !BFD_HOST_64BIT_LONG if (start != (unsigned long) start) printf ("++%7ld ", (unsigned long) start); else -# endif #endif printf ("%7ld ", (long) start); break; @@ -623,15 +618,19 @@ print_strings (const char *filename, FILE *stream, file_off address, case 16: #if __STDC_VERSION__ >= 199901L || (defined(__GNUC__) && __GNUC__ >= 2) if (sizeof (start) > sizeof (long)) - printf ("%7Lx ", (unsigned long long) start); - else + { +#ifndef __MSVCRT__ + printf ("%7llx ", (unsigned long long) start); #else -# if !BFD_HOST_64BIT_LONG + 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 #endif printf ("%7lx ", (unsigned long) start); break; @@ -654,51 +653,6 @@ print_strings (const char *filename, FILE *stream, file_off address, } } -/* 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'; - else - value += (c & ~40) - 'A'; - } - - if (c == 'b') - value *= 512; - else if (c == 'B') - value *= 1024; - else - p--; - - if (*p) - fatal (_("invalid integer argument %s"), s); - - return value; -} - static void usage (FILE *stream, int status) { @@ -708,7 +662,7 @@ usage (FILE *stream, int status) -a - --all Scan the entire file, not just the data section\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\ - - least [number] characters (default 4).\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\ -o An alias for --radix=o\n\ -T --target= Specify the binary file format\n\ @@ -716,7 +670,7 @@ usage (FILE *stream, int status) s = 7-bit, S = 8-bit, {b,l} = 16-bit, {B,L} = 32-bit\n\ @ Read options from \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); if (REPORT_BUGS_TO[0] && status == 0) fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);