fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cksum: Skip files with read errors and continue

Browse Source 
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.
This commit is contained in:
Wolfgang Corcoran-Mathe 2015-06-11 13:58:13 -04:00 committed by sin
parent a6f8f66ac1
commit c5f8294f63
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cksum.c
View File

@ -5,6 +5,7 @@
#include "util.h" #include "util.h"
static int ret = 0;
static const unsigned long crctab[] = { 0x00000000, static const unsigned long crctab[] = { 0x00000000,
0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b,
0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6,
@ -71,8 +72,11 @@ cksum(FILE *fp, const char *s)
ck = (ck << 8) ^ crctab[(ck >> 24) ^ buf[i]]; ck = (ck << 8) ^ crctab[(ck >> 24) ^ buf[i]];
len += n; len += n;
} }
if (ferror(fp)) if (ferror(fp)) {
eprintf("fread %s:", s ? s : "<stdin>"); weprintf("fread %s:", s ? s : "<stdin>");
ret = 1;
return;
}
for (i = len; i; i >>= 8) for (i = len; i; i >>= 8)
ck = (ck << 8) ^ crctab[(ck >> 24) ^ (i & 0xFF)]; ck = (ck << 8) ^ crctab[(ck >> 24) ^ (i & 0xFF)];
@ -89,7 +93,6 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
FILE *fp; FILE *fp;
int ret = 0;
argv0 = argv[0], argc--, argv++; argv0 = argv[0], argc--, argv++;