X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fhead.c;h=75189eda8b25ec60286b346fecfbf1bbae8322b7;hb=1abc07dcca237e6b5c98fea740e59d59c801c9e2;hp=060febcf716fcfcd7ceea830e567ff75ed76b0b7;hpb=1385899416a4396385ad421ae1f532be7103738a;p=oweals%2Fbusybox.git

diff --git a/coreutils/head.c b/coreutils/head.c
index 060febcf7..75189eda8 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -11,26 +11,25 @@
 /* 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[] =
+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";
+static const char header_fmt_str[] ALIGN1 = "\n==> %s <==\n";
 
+int head_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int head_main(int argc, char **argv)
 {
 	unsigned long count = 10;
@@ -39,7 +38,6 @@ int head_main(int argc, char **argv)
 	int count_bytes = 0;
 	int header_threshhold = 1;
 #endif
-
 	FILE *fp;
 	const char *fmt;
 	char *p;
@@ -47,11 +45,10 @@ int head_main(int argc, char **argv)
 	int c;
 	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 (argv[1] && argv[1][0] == '-'
+	 && isdigit(argv[1][1])
 	) {
 		--argc;
 		++argv;
@@ -76,34 +73,29 @@ int head_main(int argc, char **argv)
 #endif
 		case 'n':
 			p = optarg;
-#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
-		GET_COUNT:
+#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) {
-		*--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. */
@@ -112,12 +104,13 @@ int head_main(int argc, char **argv)
 #endif
 
 	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;
 			while (i && ((c = getc(fp)) != EOF)) {
@@ -126,14 +119,16 @@ int head_main(int argc, char **argv)
 				}
 				putchar(c);
 			}
-			if (bb_fclose_nonstdin(fp)) {
-				bb_perror_msg("%s", *argv);	/* Avoid multibyte problems. */
+			if (fclose_if_not_stdin(fp)) {
+				bb_simple_perror_msg(*argv);
 				retval = EXIT_FAILURE;
 			}
-			xferror_stdout();
+			die_if_ferror_stdout();
+		} else {
+			retval = EXIT_FAILURE;
 		}
 		fmt = header_fmt_str;
 	} while (*++argv);
 
-	bb_fflush_stdout_and_exit(retval);
+	fflush_stdout_and_exit(retval);
 }