From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/coreutils/head.c | 120 ++++++++++++++-------------- 1 file changed, 61 insertions(+), 59 deletions(-) (limited to 'release/src/router/busybox/coreutils/head.c') diff --git a/release/src/router/busybox/coreutils/head.c b/release/src/router/busybox/coreutils/head.c index dab4de11..ac476d09 100644 --- a/release/src/router/busybox/coreutils/head.c +++ b/release/src/router/busybox/coreutils/head.c @@ -4,51 +4,42 @@ * * Copyright (C) 2003 Manuel Novoa III * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ /* 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 -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" -static const char head_opts[] = +static const char head_opts[] ALIGN1 = "n:" -#ifdef CONFIG_FEATURE_FANCY_HEAD +#if ENABLE_FEATURE_FANCY_HEAD "c:qv" #endif ; -static const char header_fmt_str[] = "\n==> %s <==\n"; +#if ENABLE_FEATURE_FANCY_HEAD +static const struct suffix_mult head_suffixes[] = { + { "b", 512 }, + { "k", 1024 }, + { "m", 1024*1024 }, + { } +}; +#endif + +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; unsigned long i; -#ifdef CONFIG_FEATURE_FANCY_HEAD +#if ENABLE_FEATURE_FANCY_HEAD int count_bytes = 0; int header_threshhold = 1; #endif - FILE *fp; const char *fmt; char *p; @@ -56,53 +47,61 @@ int head_main(int argc, char **argv) int c; int retval = EXIT_SUCCESS; +#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; p = (*argv) + 1; goto GET_COUNT; } +#endif + /* No size benefit in converting this to getopt32 */ while ((opt = getopt(argc, argv, head_opts)) > 0) { - switch(opt) { -#ifdef CONFIG_FEATURE_FANCY_HEAD - case 'q': - header_threshhold = INT_MAX; - break; - case 'v': - header_threshhold = -1; - break; - case 'c': - count_bytes = 1; - /* fall through */ + 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 */ +#endif + case 'n': + p = optarg; +#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD + GET_COUNT: #endif - case 'n': - p = optarg; - GET_COUNT: - count = bb_xgetularg10(p); - break; - default: - bb_show_usage(); +#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; -#ifdef CONFIG_FEATURE_FANCY_HEAD - if (argc - optind <= header_threshhold) { +#if ENABLE_FEATURE_FANCY_HEAD + 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. */ @@ -111,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)) { @@ -125,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); } -- cgit v1.2.3-54-g00ecf