flashcp: pad output to BUFSIZE. Hopefully closes 5882

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

diff --git a/miscutils/strings.c b/miscutils/strings.c
index e9f335ebda5ec4698591f5873cd8b614bd46bbc2..9f5018244445a2b9f6504794afa89e3d677897e1 100644 (file)
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -2,86 +2,91 @@
 /*
  * 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 "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <ctype.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"
 
-#define WHOLE_FILE             1
-#define PRINT_NAME             2
-#define PRINT_OFFSET   4
-#define SIZE                   8
+#include "libbb.h"
 
-int strings_main(int argc, char **argv)
+#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 UNUSED_PARAM, char **argv)
 {
-       int n, c, i = 0, status = EXIT_SUCCESS;
-       unsigned long opt;
-       unsigned long count;
-       FILE *file = stdin;
+       int n, c, status = EXIT_SUCCESS;
+       unsigned count;
+       off_t offset;
+       FILE *file;
        char *string;
        const char *fmt = "%s: ";
-       char *n_arg = "4";
+       const char *n_arg = "4";
 
-       opt = bb_getopt_ulflags(argc, argv, "afon:", &n_arg);
+       getopt32(argv, "afon:", &n_arg);
        /* -a is our default behaviour */
-
-       argc -= optind;
+       /*argc -= optind;*/
        argv += optind;
 
-       n = bb_xgetlarg(n_arg, 10, 1, INT_MAX);
+       n = xatou_range(n_arg, 1, INT_MAX);
        string = xzalloc(n + 1);
        n--;
 
-       if (argc == 0) {
+       if (!*argv) {
                fmt = "{%s}: ";
-               *argv = (char *)bb_msg_standard_input;
-               goto PIPE;
+               *--argv = (char *)bb_msg_standard_input;
        }
 
        do {
-               if ((file = bb_wfopen(*argv, "r"))) {
-PIPE:
-                       count = 0;
-                       do {
-                               c = fgetc(file);
-                               if (isprint(c) || c == '\t') {
-                                       if (i <= n) {
-                                               string[i] = c;
-                                       } else {
-                                               putchar(c);
-                                       }
-                                       if (i == n) {
-                                               if (opt & PRINT_NAME) {
+               file = fopen_or_warn_stdin(*argv);
+               if (!file) {
+                       status = EXIT_FAILURE;
+                       continue;
+               }
+               offset = 0;
+               count = 0;
+               do {
+                       c = fgetc(file);
+                       if (isprint_asciionly(c) || c == '\t') {
+                               if (count > n) {
+                                       bb_putchar(c);
+                               } else {
+                                       string[count] = c;
+                                       if (count == n) {
+                                               if (option_mask32 & PRINT_NAME) {
                                                        printf(fmt, *argv);
                                                }
-                                               if (opt & PRINT_OFFSET) {
-                                                       printf("%7lo ", count - n);
+                                               if (option_mask32 & PRINT_OFFSET) {
+                                                       printf("%7"OFF_FMT"o ", offset - n);
                                                }
-                                               printf("%s", string);
+                                               fputs(string, stdout);
                                        }
-                                       i++;
-                               } else {
-                                       if (i > n) {
-                                               putchar('\n');
-                                       }
-                                       i = 0;
+                                       count++;
                                }
-                               count++;
-                       } while (c != EOF);
-                       bb_fclose_nonstdin(file);
-               } else {
-                       status = EXIT_FAILURE;
-               }
-       } while (--argc > 0);
+                       } else {
+                               if (count > n) {
+                                       bb_putchar('\n');
+                               }
+                               count = 0;
+                       }
+                       offset++;
+               } while (c != EOF);
+               fclose_if_not_stdin(file);
+       } while (*++argv);
 
        if (ENABLE_FEATURE_CLEAN_UP)
                free(string);
 
-       bb_fflush_stdout_and_exit(status);
+       fflush_stdout_and_exit(status);
 }