Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/sum.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/sum.c (modified) (6 diffs)

branches/2.2.9/mindi-busybox/coreutils/sum.c

@@ -11 +11 @@
  * 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.
  */
 
@@ -22 +22 @@
 /* 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
-    uintmax_t total_bytes = 0;
-    int fd = 0, r;
-
+    unsigned long long total_bytes = 0;
+    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;
-    }
+    fd = open_or_warn_stdin(file);
+    if (fd == -1)
+        return 0;
 
     while (1) {
@@ -45 +42 @@
                 /* no error */
                 break;
- ret_bad:
-            bb_perror_msg(file);
+            bb_simple_perror_msg(file);
             return 0;
         }
@@ -68 +64 @@
         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)
+int sum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int sum_main(int argc UNUSED_PARAM, char **argv)
 {
     unsigned n;
@@ -82 +78 @@
 
     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);
@@ -93 +90 @@
            - 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);
+        type += (argv[1] || type == SUM_SYSV);
+        n = 1;
+        do {
+            n &= sum_file(*argv, type);
+        } while (*++argv);
     }
     return !n;