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

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

@@ -12 +12 @@
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <ctype.h>
-#include <unistd.h>
-#include "busybox.h"
+#include "libbb.h"
 
-static const char head_opts[] =
+static const char head_opts[] ALIGN1 =
     "n:"
 #if ENABLE_FEATURE_FANCY_HEAD
@@ -31 +26 @@
     { "k", 1024 },
     { "m", 1024*1024 },
-    { NULL, 0 }
+    { }
 };
 #endif
-                                        
-static const char header_fmt_str[] = "\n==> %s <==\n";
 
+static const char header_fmt_str[] ALIGN1 = "\n==> %s <==\n";
+
+int head_main(int argc, char **argv);
 int head_main(int argc, char **argv)
 {
@@ -53 +49 @@
     int retval = EXIT_SUCCESS;
 
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
     /* Allow legacy syntax of an initial numeric option without -n. */
-    if ((argc > 1) && (argv[1][0] == '-')
-        /* && (isdigit)(argv[1][1]) */
-        && (((unsigned int)(argv[1][1] - '0')) <= 9)
+    if (argc > 1 && argv[1][0] == '-'
+     && isdigit(argv[1][1])
     ) {
         --argc;
@@ -66 +61 @@
 #endif
 
-    /* No size benefit in converting this to bb_getopt_ulflags */
+    /* No size benefit in converting this to getopt32 */
     while ((opt = getopt(argc, argv, head_opts)) > 0) {
-        switch(opt) {
+        switch (opt) {
 #if ENABLE_FEATURE_FANCY_HEAD
-            case 'q':
-                header_threshhold = INT_MAX;
-                break;
-            case 'v':
-                header_threshhold = -1;
-                break;
-            case 'c':
-                count_bytes = 1;
-                /* fall through */
+        case 'q':
+            header_threshhold = INT_MAX;
+            break;
+        case 'v':
+            header_threshhold = -1;
+            break;
+        case 'c':
+            count_bytes = 1;
+            /* fall through */
 #endif
-            case 'n':
-                p = optarg;
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
-            GET_COUNT:
+        case 'n':
+            p = optarg;
+#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
+ GET_COUNT:
 #endif
 
 #if !ENABLE_FEATURE_FANCY_HEAD
-                count = bb_xgetularg10(p);
+            count = xatoul(p);
 #else
-                count = bb_xgetularg_bnd_sfx(p, 10, 
-                                0, ULONG_MAX, 
-                                head_suffixes);
+            count = xatoul_sfx(p, head_suffixes);
 #endif
-                break;
-            default:
-                bb_show_usage();
+            break;
+        default:
+            bb_show_usage();
         }
     }
@@ -101 +94 @@
     argv += optind;
     if (!*argv) {
-        *--argv = "-";
+        *--argv = (char*)"-";
     }
 
@@ -120 +113 @@
 
     do {
-        if ((fp = bb_wfopen_input(*argv)) != NULL) {
+        fp = fopen_or_warn_stdin(*argv);
+        if (fp) {
             if (fp == stdin) {
                 *argv = (char *) bb_msg_standard_input;
             }
             if (header_threshhold) {
-                bb_printf(fmt, *argv);
+                printf(fmt, *argv);
             }
             i = count;
@@ -134 +128 @@
                 putchar(c);
             }
-            if (bb_fclose_nonstdin(fp)) {
+            if (fclose_if_not_stdin(fp)) {
                 bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */
                 retval = EXIT_FAILURE;
             }
-            bb_xferror_stdout();
+            die_if_ferror_stdout();
         }
         fmt = header_fmt_str;
     } while (*++argv);
 
-    bb_fflush_stdout_and_exit(retval);
+    fflush_stdout_and_exit(retval);
 }