cksum: respect CONFIG_LFS=y. Adds 36 bytes in this case.

1 files changed, 13 insertions, 5 deletions

diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 598718486..546532c3c 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -13,7 +13,7 @@ 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;
 
@@ -44,11 +44,19 @@ int cksum_main(int argc UNUSED_PARAM, char **argv)
 
                 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);