[hackers] [sbase] cksum: Skip files with read errors and continue || Wolfgang Corcoran-Mathe

From: <git_AT_suckless.org>
Date: Sat, 13 Jun 2015 11:39:58 +0200 (CEST)

commit c5f8294f632c909140732add5c7a2f4f40b8063c
Author: Wolfgang Corcoran-Mathe <first.lord.of.teal_AT_gmail.com>
Date: Thu Jun 11 13:58:13 2015 -0400

    cksum: Skip files with read errors and continue
    
    Previously, 'cksum *' exited early if * contained a directory or
    other file causing an fread() error.
    
    Exit status is set to indicate an error has occurred.

diff --git a/cksum.c b/cksum.c
index 3355b4c..570ca81 100644
--- a/cksum.c
+++ b/cksum.c
_AT_@ -5,6 +5,7 @@
 
 #include "util.h"
 
+static int ret = 0;
 static const unsigned long crctab[] = { 0x00000000,
 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
_AT_@ -71,8 +72,11 @@ cksum(FILE *fp, const char *s)
                         ck = (ck << 8) ^ crctab[(ck >> 24) ^ buf[i]];
                 len += n;
         }
- if (ferror(fp))
- eprintf("fread %s:", s ? s : "<stdin>");
+ if (ferror(fp)) {
+ weprintf("fread %s:", s ? s : "<stdin>");
+ ret = 1;
+ return;
+ }
 
         for (i = len; i; i >>= 8)
                 ck = (ck << 8) ^ crctab[(ck >> 24) ^ (i & 0xFF)];
_AT_@ -89,7 +93,6 @@ int
 main(int argc, char *argv[])
 {
         FILE *fp;
- int ret = 0;
 
         argv0 = argv[0], argc--, argv++;
 
Received on Sat Jun 13 2015 - 11:39:58 CEST