Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/miscutils/strings.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/miscutils/strings.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/miscutils/strings.c

@@ -3 +3 @@
  * 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>
 
 #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);
-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;*/
@@ -41 +38 @@
         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) {
-                    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);
                         }
@@ -73 +68 @@
             } else {
                 if (count > n) {
-                    putchar('\n');
+                    bb_putchar('\n');
                 }
                 count = 0;