diff options
author | Hiltjo Posthuma <hiltjo@codemadness.org> | 2022-03-14 19:22:42 +0100 |
---|---|---|
committer | Hiltjo Posthuma <hiltjo@codemadness.org> | 2022-03-15 14:46:46 +0100 |
commit | fad48ffa27af96ee0d9489ded88f80c1eeb238dc (patch) | |
tree | dbd19eb13b389eb230325049d576c600bde606fa /sfeed_gopher.c | |
parent | 813a96b517ae96716fb018ff93ab2d6a4bbcda95 (diff) |
stricter error checking in file streams (input, output)
This also makes the programs exit with a non-zero status when a read or write
error occurs.
This makes checking the exit status more reliable in scripts.
A simple example to simulate a disk with no space left:
curl -s 'https://codemadness.org/atom.xml' | sfeed > f
/mnt/test: write failed, file system is full
echo $?
0
Which now produces:
curl -s 'https://codemadness.org/atom.xml' | sfeed > f
/mnt/test: write failed, file system is full
write error: <stdout>
echo $?
1
Tested with a small mfs on OpenBSD, fstab entry:
swap /mnt/test mfs rw,nodev,nosuid,-s=1M 0 0
Diffstat (limited to 'sfeed_gopher.c')
-rw-r--r-- | sfeed_gopher.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sfeed_gopher.c b/sfeed_gopher.c index 0b95b3d..7da41f6 100644 --- a/sfeed_gopher.c +++ b/sfeed_gopher.c @@ -50,7 +50,8 @@ printfeed(FILE *fpitems, FILE *fpin, struct feed *f) fprintf(fpitems, "i\t\t%s\t%s\r\n", host, port); } - while ((linelen = getline(&line, &linesize, fpin)) > 0) { + while ((linelen = getline(&line, &linesize, fpin)) > 0 && + !ferror(fpitems)) { if (line[linelen - 1] == '\n') line[--linelen] = '\0'; parseline(line, fields); @@ -150,6 +151,8 @@ main(int argc, char *argv[]) if (argc == 1) { f.name = ""; printfeed(stdout, stdin, &f); + checkfileerror(stdin, "<stdin>", 'r'); + checkfileerror(stdout, "<stdout>", 'w'); } else { if ((p = getenv("SFEED_GOPHER_PATH"))) prefixpath = p; @@ -172,8 +175,8 @@ main(int argc, char *argv[]) if (!(fpitems = fopen(path, "wb"))) err(1, "fopen"); printfeed(fpitems, fp, &f); - if (ferror(fp)) - err(1, "ferror: %s", argv[i]); + checkfileerror(fp, argv[i], 'r'); + checkfileerror(fpitems, path, 'w'); fclose(fp); fclose(fpitems); @@ -186,6 +189,7 @@ main(int argc, char *argv[]) fprintf(fpindex, "\t%s\t%s\r\n", host, port); } fputs(".\r\n", fpindex); + checkfileerror(fpindex, "index", 'w'); fclose(fpindex); } |