From: Austin Clements <amdragon@MIT.EDU>
Date: Thu, 19 Jan 2012 22:29:18 +0000 (-0500)
Subject: show: Handle read and write errors
X-Git-Tag: debian/0.12_rc1-1~186
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=18947b95cd1668d1b98f7ea4196e97b050599f7d;p=notmuch.git

show: Handle read and write errors

For showing a message in raw format, rather than silently succeeding
when a read or a write fails (or, probably, looping if a read fails),
try to print an error message and exit with a non-zero status.

This silences one of the buildbot warnings about unused results.  While
my libc lacks the declarations that trigger these warnings, this can
be tested by adding the following to notmuch.h:

__attribute__((warn_unused_result))
size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);
---

diff --git a/notmuch-show.c b/notmuch-show.c
index d14dac97..c674e250 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -883,7 +883,17 @@ do_show_single (void *ctx,
 
 	while (!feof (file)) {
 	    size = fread (buf, 1, sizeof (buf), file);
-	    (void) fwrite (buf, size, 1, stdout);
+	    if (ferror (file)) {
+		fprintf (stderr, "Error: Read failed from %s\n", filename);
+		fclose (file);
+		return 1;
+	    }
+
+	    if (fwrite (buf, size, 1, stdout) != 1) {
+		fprintf (stderr, "Error: Write failed\n");
+		fclose (file);
+		return 1;
+	    }
 	}
 
 	fclose (file);