X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fhead.c;h=669aae8193eb276dfd7e7eead3ae9049948b9926;hb=982aa263a0cef10ee4f4c06084a87af736c449ac;hp=ed1d01d52a4e430cbf84c8d56877c4a7117256b9;hpb=06af2165288cd6516b89001ec9e24992619230e0;p=oweals%2Fbusybox.git

diff --git a/coreutils/head.c b/coreutils/head.c
index ed1d01d52..669aae819 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -4,34 +4,34 @@
  *
  * 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.
  */
 
 /* BB_AUDIT SUSv3 compliant */
 /* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/head.html */
 
-#include "busybox.h"
+#include "libbb.h"
 
-static const char head_opts[] =
+/* This is a NOEXEC applet. Be very careful! */
+
+static const char head_opts[] ALIGN1 =
 	"n:"
 #if ENABLE_FEATURE_FANCY_HEAD
 	"c:qv"
 #endif
 	;
 
-#if ENABLE_FEATURE_FANCY_HEAD
 static const struct suffix_mult head_suffixes[] = {
 	{ "b", 512 },
 	{ "k", 1024 },
 	{ "m", 1024*1024 },
-	{ NULL, 0 }
+	{ "", 0 }
 };
-#endif
 
-static const char header_fmt_str[] = "\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)
 {
 	unsigned long count = 10;
@@ -40,7 +40,6 @@ int head_main(int argc, char **argv)
 	int count_bytes = 0;
 	int header_threshhold = 1;
 #endif
-
 	FILE *fp;
 	const char *fmt;
 	char *p;
@@ -50,7 +49,7 @@ int head_main(int argc, char **argv)
 
 #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])
 	) {
 		--argc;
@@ -79,31 +78,26 @@ int head_main(int argc, char **argv)
 #if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
  GET_COUNT:
 #endif
-
-#if !ENABLE_FEATURE_FANCY_HEAD
-			count = xatoul(p);
-#else
 			count = xatoul_sfx(p, head_suffixes);
-#endif
 			break;
 		default:
 			bb_show_usage();
 		}
 	}
 
+	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.
 	 * These should optimize out of the if conditions below. */
@@ -128,10 +122,12 @@ int head_main(int argc, char **argv)
 				putchar(c);
 			}
 			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;
 	} while (*++argv);