ntpd: default to FEATURE_NTP_AUTH=y

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

diff --git a/coreutils/sum.c b/coreutils/sum.c
index a75dd321da9fee58bab7c4608879c1829aa5e780..487e93f4acea7a5e5e4f41ed4bb8886bf6071bde 100644 (file)
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -10,10 +10,27 @@
  * Written by Kayvan Aghaiepour and David MacKenzie
  * Taken from coreutils and turned into a busybox applet by Mike Frysinger
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+//config:config SUM
+//config:      bool "sum (4.3 kb)"
+//config:      default y
+//config:      help
+//config:      checksum and count the blocks in a file
+
+//applet:IF_SUM(APPLET(sum, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_SUM) += sum.o
+
+//usage:#define sum_trivial_usage
+//usage:       "[-rs] [FILE]..."
+//usage:#define sum_full_usage "\n\n"
+//usage:       "Checksum and count the blocks in a file\n"
+//usage:     "\n       -r      Use BSD sum algorithm (1K blocks)"
+//usage:     "\n       -s      Use System V sum algorithm (512byte blocks)"
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
 
@@ -21,31 +38,29 @@ enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
    The checksum varies depending on sizeof (int). */
 /* SYSV: calculate and print the checksum and the size in 512-byte blocks */
 /* Return 1 if successful.  */
-static unsigned sum_file(const char *file, const unsigned type)
+static unsigned sum_file(const char *file, unsigned type)
 {
-#define buf bb_common_bufsiz1
        unsigned long long total_bytes = 0;
-       int fd = 0, r;
-
+       int fd, r;
        /* The sum of all the input bytes, modulo (UINT_MAX + 1).  */
        unsigned s = 0;
 
-       if (NOT_LONE_DASH(file)) {
-               fd = open(file, O_RDONLY);
-               if (fd == -1)
-                       goto ret_bad;
-       }
+#define buf bb_common_bufsiz1
+       setup_common_bufsiz();
+
+       fd = open_or_warn_stdin(file);
+       if (fd == -1)
+               return 0;
 
        while (1) {
-               size_t bytes_read = safe_read(fd, buf, BUFSIZ);
+               size_t bytes_read = safe_read(fd, buf, COMMON_BUFSIZE);
 
                if ((ssize_t)bytes_read <= 0) {
                        r = (fd && close(fd) != 0);
                        if (!bytes_read && !r)
                                /* no error */
                                break;
- ret_bad:
-                       bb_perror_msg(file);
+                       bb_simple_perror_msg(file);
                        return 0;
                }
 
@@ -67,34 +82,37 @@ static unsigned sum_file(const char *file, const unsigned type)
        if (type >= SUM_SYSV) {
                r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
                s = (r & 0xffff) + (r >> 16);
-               printf("%d %llu %s\n", s, (total_bytes + 511) / 512, file);
+               printf("%u %llu %s\n", s, (total_bytes + 511) / 512, file);
        } else
-               printf("%05d %5llu %s\n", s, (total_bytes + 1023) / 1024, file);
+               printf("%05u %5llu %s\n", s, (total_bytes + 1023) / 1024, file);
        return 1;
 #undef buf
 }
 
-int sum_main(int argc, char **argv);
-int sum_main(int argc, char **argv)
+int sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int sum_main(int argc UNUSED_PARAM, char **argv)
 {
        unsigned n;
        unsigned type = SUM_BSD;
 
        n = getopt32(argv, "sr");
+       argv += optind;
        if (n & 1) type = SUM_SYSV;
        /* give the bsd priority over sysv func */
        if (n & 2) type = SUM_BSD;
 
-       if (argc == optind) {
+       if (!argv[0]) {
                /* Do not print the name */
                n = sum_file("-", type);
        } else {
                /* Need to print the name if either
-                  - more than one file given
-                  - doing sysv */
-               type += argc - 1 > optind || type == SUM_SYSV;
-               for (n = 1; optind < argc; optind++)
-                       n &= sum_file(argv[optind], type);
+                * - more than one file given
+                * - doing sysv */
+               type += (argv[1] || type == SUM_SYSV);
+               n = 1;
+               do {
+                       n &= sum_file(*argv, type);
+               } while (*++argv);
        }
        return !n;
 }