typedef ulong Sumfn(ulong, void*, uvlong);
extern Sumfn sumr, sum5, sum32;
-char *sumfile(char*, Sumfn*);
+void sumfile(char*, Sumfn*);
+
+static char exitstr[ERRMAX];
void
usage(void)
main(int argc, char **argv)
{
Sumfn *fn = sum32;
- char *exitstr=0, *s;
ARGBEGIN{
case 'r':
}ARGEND
if(*argv){
while(*argv)
- if(s = sumfile(*argv++, fn)) /* assign = */
- exitstr = s;
+ sumfile(*argv++, fn);
}else
- exitstr = sumfile(0, fn);
+ sumfile(0, fn);
exits(exitstr);
}
-char*
+void
sumfile(char *file, Sumfn *fn)
{
int fd;
if(file){
if((fd = open(file, OREAD)) < 0){
- errstr(buf, sizeof buf);
- fprint(2, "%s: %s: %s\n", argv0, file, buf);
- return "can't open";
+ snprint(exitstr, sizeof(exitstr), "can't open %s: %r", file);
+ fprint(2, "%s: %s\n", argv0, exitstr);
+ return;
}
}else
fd = 0;
sum = (*fn)(sum, buf, n);
}
if(n < 0){
- errstr(buf, sizeof buf);
- fprint(2, "%s: %s: read error: %s\n", argv0, file? file:"<stdin>", buf);
+ snprint(exitstr, sizeof(exitstr), "reading %s: %r", file? file:"<stdin>");
+ fprint(2, "%s: %s\n", argv0, exitstr);
+
if(file)
close(fd);
- return "read error";
+ return;
}
if(file)
close(fd);
if(file)
print(" %s", file);
print("\n");
- return 0;
}
#define VBSIZE 512 /* system v */