pointless whitespace/comment fixes, no code changes

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

diff --git a/miscutils/strings.c b/miscutils/strings.c
index 835880214b02ac876683a906aa6ccbaa080809e7..fea9edbed57f6ddf5de9f62b1fbf3149f67fa27e 100644 (file)
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -2,13 +2,11 @@
 /*
  * 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.
  */
 
-#include <getopt.h>
-
 #include "libbb.h"
 
 #define WHOLE_FILE             1
@@ -16,19 +14,18 @@
 #define PRINT_OFFSET   4
 #define SIZE                   8
 
-int strings_main(int argc, char **argv);
-int strings_main(int argc, char **argv)
+int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+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 +37,28 @@ int strings_main(int argc, 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 (count > n) {
-                                       putchar(c);
+                                       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);
@@ -72,7 +67,7 @@ int strings_main(int argc, char **argv)
                                }
                        } else {
                                if (count > n) {
-                                       putchar('\n');
+                                       bb_putchar('\n');
                                }
                                count = 0;
                        }