find:: get rid of nested function (it's a gcc-ism)

[oweals/busybox.git] / miscutils / strings.c

diff --git a/miscutils/strings.c b/miscutils/strings.c
index 57a2c0a17274b47a8e52621d0a7fc88b7658bee3..9f5018244445a2b9f6504794afa89e3d677897e1 100644 (file)
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -2,33 +2,39 @@
 /*
  * strings implementation for busybox
  *
- * Copyright Tito Ragusa <farmatito@tiscali.it>
+ * Copyright 2003 Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <getopt.h>
+//usage:#define strings_trivial_usage
+//usage:       "[-afo] [-n LEN] [FILE]..."
+//usage:#define strings_full_usage "\n\n"
+//usage:       "Display printable strings in a binary file\n"
+//usage:     "\n       -a      Scan whole file (default)"
+//usage:     "\n       -f      Precede strings with filenames"
+//usage:     "\n       -n LEN  At least LEN characters form a string (default 4)"
+//usage:     "\n       -o      Precede strings with decimal offsets"
 
 #include "libbb.h"
 
-#define WHOLE_FILE             1
-#define PRINT_NAME             2
-#define PRINT_OFFSET   4
-#define SIZE                   8
+#define WHOLE_FILE    1
+#define PRINT_NAME    2
+#define PRINT_OFFSET  4
+#define SIZE          8
 
 int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int strings_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int strings_main(int argc UNUSED_PARAM, char **argv)
 {
        int n, c, status = EXIT_SUCCESS;
-       unsigned opt;
        unsigned count;
        off_t offset;
-       FILE *file = stdin;
+       FILE *file;
        char *string;
        const char *fmt = "%s: ";
        const char *n_arg = "4";
 
-       opt = getopt32(argv, "afon:", &n_arg);
+       getopt32(argv, "afon:", &n_arg);
        /* -a is our default behaviour */
        /*argc -= optind;*/
        argv += optind;
@@ -40,30 +46,28 @@ int strings_main(int argc ATTRIBUTE_UNUSED, char **argv)
        if (!*argv) {
                fmt = "{%s}: ";
                *--argv = (char *)bb_msg_standard_input;
-               goto PIPE;
        }
 
        do {
-               file = fopen_or_warn(*argv, "r");
+               file = fopen_or_warn_stdin(*argv);
                if (!file) {
                        status = EXIT_FAILURE;
                        continue;
                }
- PIPE:
                offset = 0;
                count = 0;
                do {
                        c = fgetc(file);
-                       if (isprint(c) || c == '\t') {
+                       if (isprint_asciionly(c) || c == '\t') {
                                if (count > n) {
                                        bb_putchar(c);
                                } else {
                                        string[count] = c;
                                        if (count == n) {
-                                               if (opt & PRINT_NAME) {
+                                               if (option_mask32 & PRINT_NAME) {
                                                        printf(fmt, *argv);
                                                }
-                                               if (opt & PRINT_OFFSET) {
+                                               if (option_mask32 & PRINT_OFFSET) {
                                                        printf("%7"OFF_FMT"o ", offset - n);
                                                }
                                                fputs(string, stdout);