Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/fold.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/coreutils/fold.c (modified) (9 diffs)

branches/2.2.5/mindi-busybox/coreutils/fold.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* fold -- wrap each input line to fit in specified width.
 
@@ -10 +11 @@
 */
 
-#include <ctype.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
 static unsigned long flags;
@@ -45 +39 @@
 }
 
+int fold_main(int argc, char **argv);
 int fold_main(int argc, char **argv)
 {
+    char *line_out = NULL;
+    int allocated_out = 0;
     char *w_opt;
     int width = 80;
@@ -52 +49 @@
     int errs = 0;
 
-    if(!ENABLE_DEBUG_YANK_SUSv2) {
+    if (ENABLE_INCLUDE_SUSv2) {
         /* Turn any numeric options into -w options.  */
         for (i = 1; i < argc; i++) {
@@ -61 +58 @@
                     break;
                 if (isdigit(*a)) {
-                    argv[i] = bb_xasprintf("-w%s", a);
+                    argv[i] = xasprintf("-w%s", a);
                 }
             }
@@ -67 +64 @@
     }
 
-    flags = bb_getopt_ulflags(argc, argv, "bsw:", &w_opt);
+    flags = getopt32(argv, "bsw:", &w_opt);
     if (flags & FLAG_WIDTH)
-        width = bb_xgetlarg(w_opt, 10, 1, 10000);
+        width = xatoul_range(w_opt, 1, 10000);
 
     argv += optind;
     if (!*argv) {
-        *--argv = "-";
+        *--argv = (char*)"-";
     }
 
     do {
-        FILE *istream = bb_wfopen_input(*argv);
+        FILE *istream = fopen_or_warn_stdin(*argv);
         int c;
         int column = 0;     /* Screen column where next char will go. */
         int offset_out = 0; /* Index in `line_out' for next char. */
-        static char *line_out = NULL;
-        static int allocated_out = 0;
 
         if (istream == NULL) {
@@ -101 +96 @@
                 continue;
             }
-
-rescan:
+ rescan:
             column = adjust_column(column, c);
 
@@ -151 +145 @@
         }
 
-        if (ferror(istream) || bb_fclose_nonstdin(istream)) {
+        if (ferror(istream) || fclose_if_not_stdin(istream)) {
             bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */
             errs |= EXIT_FAILURE;
@@ -157 +151 @@
     } while (*++argv);
 
-    bb_fflush_stdout_and_exit(errs);
+    fflush_stdout_and_exit(errs);
 }
-/* vi: set sw=4 ts=4: */