Simplify return & fshut() logic

Get rid of the !!()-constructs and use ret where available (or introduce it).

In some cases, there would be an "abort" on the first fshut-error, but we want
to close all files and report all warnings and then quit, not just the warning
for the first file.
This commit is contained in:
FRIGN
2015-05-25 01:33:19 +02:00
committed by sin
parent e8a4f37884
commit d23cc72490
34 changed files with 142 additions and 72 deletions

6
tail.c
View File

@@ -47,7 +47,7 @@ taketail(FILE *fp, const char *str, size_t n)
ring = ecalloc(n, sizeof(*ring));
size = ecalloc(n, sizeof(*size));
for (i = j = 0; getline(&ring[i], &size[i], fp) > 0; )
for (i = j = 0; getline(ring + i, size + i, fp) > 0; )
i = j = (i + 1) % n;
} else {
r = ecalloc(n, sizeof(*r));
@@ -157,5 +157,7 @@ main(int argc, char *argv[])
}
}
return !!(fshut(stdin, "<stdin>") + fshut(stdout, "<stdout>")) || ret;
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
return ret;
}