ls: add support for -H

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

diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 074d068118e82ea2663e8bfa6ea19f77cba70a22..7a37e6add62d569622b871c5f31b90e1175f4f74 100644 (file)
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -4,18 +4,20 @@
  *
  * Copyright (C) 2006 by Rob Sullivan, with ideas from code by Walter Harms
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */
-
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
 #include "libbb.h"
 
+/* This is a NOEXEC applet. Be very careful! */
+
 int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cksum_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int cksum_main(int argc UNUSED_PARAM, char **argv)
 {
        uint32_t *crc32_table = crc32_filltable(NULL, 1);
        uint32_t crc;
-       long length, filesize;
+       off_t length, filesize;
        int bytes_read;
-       uint8_t *cp;
+       int exit_code = EXIT_SUCCESS;
 
 #if ENABLE_DESKTOP
        getopt32(argv, ""); /* coreutils 6.9 compat */
@@ -27,30 +29,36 @@ int cksum_main(int argc ATTRIBUTE_UNUSED, char **argv)
        do {
                int fd = open_or_warn_stdin(*argv ? *argv : bb_msg_standard_input);
 
-               if (fd < 0)
+               if (fd < 0) {
+                       exit_code = EXIT_FAILURE;
                        continue;
+               }
                crc = 0;
                length = 0;
 
 #define read_buf bb_common_bufsiz1
                while ((bytes_read = safe_read(fd, read_buf, sizeof(read_buf))) > 0) {
-                       cp = (uint8_t *) read_buf;
-                       length += bytes_read;
-                       do {
-                               crc = (crc << 8) ^ crc32_table[(crc >> 24) ^ *cp++];
-                       } while (--bytes_read);
+                       crc = crc32_block_endian1(crc, read_buf, bytes_read, crc32_table);
                }
                close(fd);
 
                filesize = length;
 
-               for (; length; length >>= 8)
-                       crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ length) & 0xff];
-               crc ^= 0xffffffffL;
+               while (length) {
+                       crc = (crc << 8) ^ crc32_table[(uint8_t)(crc >> 24) ^ (uint8_t)length];
+                       /* must ensure that shift is unsigned! */
+                       if (sizeof(length) <= sizeof(unsigned))
+                               length = (unsigned)length >> 8;
+                       else if (sizeof(length) <= sizeof(unsigned long))
+                               length = (unsigned long)length >> 8;
+                       else
+                               length = (unsigned long long)length >> 8;
+               }
+               crc = ~crc;
 
-               printf((*argv ? "%" PRIu32 " %li %s\n" : "%" PRIu32 " %li\n"),
+               printf((*argv ? "%"PRIu32" %"OFF_FMT"i %s\n" : "%"PRIu32" %"OFF_FMT"i\n"),
                                crc, filesize, *argv);
        } while (*argv && *++argv);
 
-       fflush_stdout_and_exit(EXIT_SUCCESS);
+       fflush_stdout_and_exit(exit_code);
 }