Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/coreutils/sum.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/coreutils/sum.c (modified) (4 diffs)

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

@@ -22 +22 @@
 
 #include "libbb.h"
+#include "common_bufsiz.h"
 
 enum { SUM_BSD, PRINT_NAME, SUM_SYSV };
@@ -31 +32 @@
 static unsigned sum_file(const char *file, unsigned type)
 {
-#define buf bb_common_bufsiz1
     unsigned long long total_bytes = 0;
     int fd, r;
     /* The sum of all the input bytes, modulo (UINT_MAX + 1).  */
     unsigned s = 0;
+
+#define buf bb_common_bufsiz1
+    setup_common_bufsiz();
 
     fd = open_or_warn_stdin(file);
@@ -42 +45 @@
 
     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) {
@@ -71 +74 @@
         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