Header cleanup on two more networking files (move libbb.h to the top and

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

diff --git a/coreutils/head.c b/coreutils/head.c
index dab4de11b16555514da7eff3bcc194bb86fd29d5..184e8161cef2d2d748758242d991fbd1c846ba3b 100644 (file)
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -4,20 +4,7 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * 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 */
@@ -33,18 +20,27 @@
 
 static const char head_opts[] =
        "n:"
-#ifdef CONFIG_FEATURE_FANCY_HEAD
+#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 }
+};
+#endif
+                                        
 static const char header_fmt_str[] = "\n==> %s <==\n";
 
 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
@@ -56,6 +52,7 @@ int head_main(int argc, char **argv)
        int c;
        int retval = EXIT_SUCCESS;
 
+#if !ENABLE_DEBUG_YANK_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]) */
@@ -66,10 +63,12 @@ int head_main(int argc, char **argv)
                p = (*argv) + 1;
                goto GET_COUNT;
        }
+#endif
 
+       /* No size benefit in converting this to bb_getopt_ulflags */
        while ((opt = getopt(argc, argv, head_opts)) > 0) {
                switch(opt) {
-#ifdef CONFIG_FEATURE_FANCY_HEAD
+#if ENABLE_FEATURE_FANCY_HEAD
                        case 'q':
                                header_threshhold = INT_MAX;
                                break;
@@ -82,8 +81,17 @@ int head_main(int argc, char **argv)
 #endif
                        case 'n':
                                p = optarg;
+#if !ENABLE_DEBUG_YANK_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
                        GET_COUNT:
+#endif
+
+#if !ENABLE_FEATURE_FANCY_HEAD
                                count = bb_xgetularg10(p);
+#else
+                               count = bb_xgetularg_bnd_sfx(p, 10, 
+                                                               0, ULONG_MAX, 
+                                                               head_suffixes);
+#endif
                                break;
                        default:
                                bb_show_usage();
@@ -96,7 +104,7 @@ int head_main(int argc, char **argv)
        }
 
        fmt = header_fmt_str + 1;
-#ifdef CONFIG_FEATURE_FANCY_HEAD
+#if ENABLE_FEATURE_FANCY_HEAD
        if (argc - optind <= header_threshhold) {
                header_threshhold = 0;
        }