rpm2cpio: handle bz2 too; code shrink

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

diff --git a/coreutils/sum.c b/coreutils/sum.c
index df5804899ccce6682d4f75e0364cee7dbb140550..60f3b30073d8d18288db988f3c528adad86f1ca3 100644 (file)
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -13,29 +13,25 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
-enum { sysv_sum, bsd_sum };
+enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
 
 /* BSD: calculate and print the rotated checksum and the size in 1K blocks
    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 int sum_file(const char *file, int type, int print_name)
+static unsigned sum_file(const char *file, unsigned type)
 {
 #define buf bb_common_bufsiz1
-       int r, fd;
-       uintmax_t total_bytes = 0;
-
+       unsigned long long total_bytes = 0;
+       int fd, r;
        /* The sum of all the input bytes, modulo (UINT_MAX + 1).  */
        unsigned s = 0;
 
-       fd = 0;
-       if (NOT_LONE_DASH(file)) {
-               fd = open(file, O_RDONLY);
-               if (fd == -1)
-                       goto ret_bad;
-       }
+       fd = open_or_warn_stdin(file);
+       if (fd == -1)
+               return 0;
 
        while (1) {
                size_t bytes_read = safe_read(fd, buf, BUFSIZ);
@@ -45,13 +41,12 @@ static int sum_file(const char *file, int type, int print_name)
                        if (!bytes_read && !r)
                                /* no error */
                                break;
- ret_bad:
                        bb_perror_msg(file);
                        return 0;
                }
 
                total_bytes += bytes_read;
-               if (type == sysv_sum) {
+               if (type >= SUM_SYSV) {
                        do s += buf[--bytes_read]; while (bytes_read);
                } else {
                        r = 0;
@@ -63,32 +58,42 @@ static int sum_file(const char *file, int type, int print_name)
                }
        }
 
-       if (!print_name) file = "";
-       if (type == sysv_sum) {
+       if (type < PRINT_NAME)
+               file = "";
+       if (type >= SUM_SYSV) {
                r = (s & 0xffff) + ((s & 0xffffffff) >> 16);
                s = (r & 0xffff) + (r >> 16);
-               printf("%d %ju %s\n", s, (total_bytes+511)/512, file);
+               printf("%d %llu %s\n", s, (total_bytes + 511) / 512, file);
        } else
-               printf("%05d %5ju %s\n", s, (total_bytes+1023)/1024, file);
+               printf("%05d %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) MAIN_EXTERNALLY_VISIBLE;
+int sum_main(int argc UNUSED_PARAM, char **argv)
 {
-       int n;
-       int type = bsd_sum;
+       unsigned n;
+       unsigned type = SUM_BSD;
 
-       n = getopt32(argc, argv, "sr");
-       if (n & 1) type = sysv_sum;
+       n = getopt32(argv, "sr");
+       argv += optind;
+       if (n & 1) type = SUM_SYSV;
        /* give the bsd priority over sysv func */
-       if (n & 2) type = bsd_sum;
-
-       if (argc == optind)
-               n = sum_file("-", type, 0);
-       else
-               for (n = 1; optind < argc; optind++)
-                       n &= sum_file(argv[optind], type, 1);
+       if (n & 2) type = SUM_BSD;
 
+       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 += (argv[1] || type == SUM_SYSV);
+               n = 1;
+               do {
+                       n &= sum_file(*argv, type);
+               } while (*++argv);
+       }
        return !n;
 }