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

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

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -14 +14 @@
 #include "libbb.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 static const char head_opts[] ALIGN1 =
     "n:"
@@ -21 +23 @@
     ;
 
-#if ENABLE_FEATURE_FANCY_HEAD
 static const struct suffix_mult head_suffixes[] = {
     { "b", 512 },
     { "k", 1024 },
     { "m", 1024*1024 },
-    { }
+    { "", 0 }
 };
-#endif
 
-static const char header_fmt_str[] ALIGN1 = "\n==> %s <==\n";
+#define header_fmt_str "\n==> %s <==\n"
 
-int head_main(int argc, char **argv);
+int head_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int head_main(int argc, char **argv)
 {
@@ -41 +41 @@
     int header_threshhold = 1;
 #endif
-
     FILE *fp;
     const char *fmt;
@@ -51 +50 @@
 #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
     /* Allow legacy syntax of an initial numeric option without -n. */
-    if (argc > 1 && argv[1][0] == '-'
+    if (argv[1] && argv[1][0] == '-'
      && isdigit(argv[1][1])
     ) {
@@ -80 +79 @@
  GET_COUNT:
 #endif
-
-#if !ENABLE_FEATURE_FANCY_HEAD
-            count = xatoul(p);
-#else
             count = xatoul_sfx(p, head_suffixes);
-#endif
             break;
         default:
@@ -92 +86 @@
     }
 
+    argc -= optind;
     argv += optind;
-    if (!*argv) {
+    if (!*argv)
         *--argv = (char*)"-";
-    }
 
     fmt = header_fmt_str + 1;
 #if ENABLE_FEATURE_FANCY_HEAD
-    if (argc - optind <= header_threshhold) {
+    if (argc <= header_threshhold) {
         header_threshhold = 0;
     }
 #else
-    if (argc <= optind + 1) {
-        fmt += 11;
+    if (argc <= 1) {
+        fmt += 11; /* "" */
     }
     /* Now define some things here to avoid #ifdefs in the code below.
@@ -129 +123 @@
             }
             if (fclose_if_not_stdin(fp)) {
-                bb_perror_msg("%s", *argv); /* Avoid multibyte problems. */
+                bb_simple_perror_msg(*argv);
                 retval = EXIT_FAILURE;
             }
             die_if_ferror_stdout();
+        } else {
+            retval = EXIT_FAILURE;
         }
         fmt = header_fmt_str;