diff options
Diffstat (limited to 'sfeed_plain.c')
| -rw-r--r-- | sfeed_plain.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sfeed_plain.c b/sfeed_plain.c index 45785e7..c954eff 100644 --- a/sfeed_plain.c +++ b/sfeed_plain.c @@ -19,7 +19,8 @@ printfeed(FILE *fp, const char *feedname) time_t parsedtime; ssize_t linelen; - while ((linelen = getline(&line, &linesize, fp)) > 0) { + while ((linelen = getline(&line, &linesize, fp)) > 0 && + !ferror(stdout)) { if (line[linelen - 1] == '\n') line[--linelen] = '\0'; parseline(line, fields); @@ -69,17 +70,18 @@ main(int argc, char *argv[]) if (argc == 1) { printfeed(stdin, ""); + checkfileerror(stdin, "<stdin>", 'r'); } else { for (i = 1; i < argc; i++) { if (!(fp = fopen(argv[i], "r"))) err(1, "fopen: %s", argv[i]); name = ((name = strrchr(argv[i], '/'))) ? name + 1 : argv[i]; printfeed(fp, name); - if (ferror(fp)) - err(1, "ferror: %s", argv[i]); + checkfileerror(fp, argv[i], 'r'); fclose(fp); } } + checkfileerror(stdout, "<stdout>", 'w'); return 0; } |