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

Simplify return & fshut() logic

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

7
tr.c
View File

@@ -174,6 +174,7 @@ main(int argc, char *argv[])
{
Rune r = 0, lastrune = 0;
size_t off1, off2, i, m;
int ret = 0;
ARGBEGIN {
case 'c':
@@ -204,8 +205,10 @@ main(int argc, char *argv[])
if (set2check && cflag && !dflag)
eprintf("set2 can't be imaged to from a complement.\n");
read:
if (!efgetrune(&r, stdin, "<stdin>"))
return !!(fshut(stdin, "<stdin>") + fshut(stdout, "<stdout>"));
if (!efgetrune(&r, stdin, "<stdin>")) {
ret |= fshut(stdin, "<stdin>") | fshut(stdout, "<stdout>");
return ret;
}
off1 = off2 = 0;
for (i = 0; i < set1ranges; i++) {
if (set1[i].start <= r && r <= set1[i].end) {