X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fhead.c;h=0fab8a8ae75d2db3aafc6d647b39b89b46739a61;hb=8d680b51148b9cbe7dd3afd37022f3390dd999ef;hp=184e8161cef2d2d748758242d991fbd1c846ba3b;hpb=e75b41d9905d91b388b18d4395dae72ab17d31b7;p=oweals%2Fbusybox.git

diff --git a/coreutils/head.c b/coreutils/head.c
index 184e8161c..0fab8a8ae 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -11,14 +11,9 @@
 /* BB_AUDIT GNU compatible -c, -q, and -v options in 'fancy' configuration. */
 /* 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
 	"c:qv"
@@ -30,12 +25,13 @@ 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;
@@ -44,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;
@@ -52,11 +47,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;
@@ -65,52 +59,49 @@ int head_main(int argc, char **argv)
 	}
 #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();
 		}
 	}
 
+	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. */
@@ -119,12 +110,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)) {
@@ -133,14 +125,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;
 			}
-			bb_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);
 }