[un]expand: account for different character widths. +16 bytes.

[oweals/busybox.git] / coreutils / head.c

diff --git a/coreutils/head.c b/coreutils/head.c
index 59b4d552c44102d4535ce1397c9849706eee3217..75189eda8b25ec60286b346fecfbf1bbae8322b7 100644 (file)
--- 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;
@@ -49,7 +47,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;
@@ -78,31 +76,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. */
@@ -127,10 +120,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);