Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/miscutils/strings.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/miscutils/strings.c (modified) (2 diffs)

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

@@ -3 +3 @@
  * strings implementation for busybox
  *
- * Copyright (c) 1980, 1987
- *  The Regents of the University of California.  All rights reserved.
+ * Copyright Tito Ragusa <farmatito@tiscali.it>
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- *
- * Original copyright notice is retained at the end of this file.
- *
- * Modified for BusyBox by Erik Andersen <andersen@codepoet.org>
- * Badly hacked by Tito Ragusa <farmatito@tiscali.it>
  */
 
-#include "busybox.h"
-#include <stdio.h>
-#include <stdlib.h>
 #include <getopt.h>
-#include <ctype.h>
+
+#include "libbb.h"
 
 #define WHOLE_FILE      1
@@ -25 +17 @@
 #define SIZE            8
 
+int strings_main(int argc, char **argv);
 int strings_main(int argc, char **argv)
 {
-    int n, c, i = 0, status = EXIT_SUCCESS;
-    unsigned long opt;
-    unsigned long count;
+    int n, c, status = EXIT_SUCCESS;
+    unsigned opt;
+    unsigned count;
+    off_t offset;
     FILE *file = stdin;
     char *string;
     const char *fmt = "%s: ";
-    char *n_arg = "4";
+    const char *n_arg = "4";
 
-    opt = bb_getopt_ulflags(argc, argv, "afon:", &n_arg);
+    opt = 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;
+        *--argv = (char *)bb_msg_standard_input;
         goto PIPE;
     }
 
     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) {
+        file = fopen_or_warn(*argv, "r");
+        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);
+                } else {
+                    string[count] = c;
+                    if (count == n) {
                         if (opt & PRINT_NAME) {
                             printf(fmt, *argv);
                         }
                         if (opt & PRINT_OFFSET) {
-                            printf("%7lo ", count - n);
+                            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) {
+                    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);
 }
-
-/*
- * Copyright (c) 1980, 1987
- *  The Regents of the University of California.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- *      ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
- *
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */