unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH 1/2] show: Handle read and write errors
Date: Wed, 18 Jan 2012 19:40:10 -0500	[thread overview]
Message-ID: <1326933611-16898-2-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1326933611-16898-1-git-send-email-amdragon@mit.edu>

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 resuls.  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);
---
 notmuch-show.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/notmuch-show.c b/notmuch-show.c
index d14dac9..c674e25 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);
-- 
1.7.7.3

  reply	other threads:[~2012-01-19  0:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-19  0:40 [PATCH 0/2] Fix or silence "unused result" warnings Austin Clements
2012-01-19  0:40 ` Austin Clements [this message]
2012-01-19  0:40 ` [PATCH 2/2] Silence buildbot warnings about unused results Austin Clements
2012-01-19  7:23   ` David Edmondson
2012-01-19 18:00     ` Austin Clements
2012-01-19 10:49 ` [PATCH 0/2] Fix or silence "unused result" warnings Jani Nikula
2012-01-19 18:01 ` [PATCH v2 1/2] show: Handle read and write errors Austin Clements
2012-01-19 18:01   ` [PATCH v2 2/2] Silence buildbot warnings about unused results Austin Clements
2012-01-19 22:29   ` [PATCH v3 0/2] Austin Clements
2012-01-19 22:29     ` [PATCH v3 1/2] show: Handle read and write errors Austin Clements
2012-01-20 13:59       ` Tomi Ollila
2012-01-21 13:12       ` David Bremner
2012-01-19 22:29     ` [PATCH v3 2/2] Silence buildbot warnings about unused results Austin Clements
2012-01-20 14:00       ` Tomi Ollila
2012-01-21 13:12       ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1326933611-16898-2-git-send-email-amdragon@mit.edu \
    --to=amdragon@mit.edu \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).