unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>,
	Rob Browning <rlb@defaultvalue.org>,
	notmuch@notmuchmail.org
Subject: [PATCH 2/2] cli/show: avoid empty write to stdout in format_part_raw
Date: Sat,  4 May 2019 21:10:27 -0300	[thread overview]
Message-ID: <20190505001027.28627-3-david@tethera.net> (raw)
In-Reply-To: <20190505001027.28627-1-david@tethera.net>

From: Rob Browning <rlb@defaultvalue.org>

Previously if the input was exactly a multiple of the internal buffer
size, notmuch would attempt to fwrite nothing to stdout, but still
expected fwrite to return 1, causing a failure that looked like this:

  $ notmuch show --format=raw id:87o96f1cya.fsf@codeaurora.org
    ...entire message shown as expected..
  Error: Write failed
  $ echo $?
  1

To fix the problem don't call fwrite at all when there's nothing to
write.
---
 notmuch-show.c   | 2 +-
 test/T210-raw.sh | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/notmuch-show.c b/notmuch-show.c
index c3a3783a..98b85352 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -851,7 +851,7 @@ format_part_raw (unused (const void *ctx), unused (sprinter_t *sp),
 		return NOTMUCH_STATUS_FILE_ERROR;
 	    }
 
-	    if (fwrite (buf, size, 1, stdout) != 1) {
+	    if (size > 0 && fwrite (buf, size, 1, stdout) != 1) {
 		fprintf (stderr, "Error: Write failed\n");
 		fclose (file);
 		return NOTMUCH_STATUS_FILE_ERROR;
diff --git a/test/T210-raw.sh b/test/T210-raw.sh
index 0d57deb5..93944491 100755
--- a/test/T210-raw.sh
+++ b/test/T210-raw.sh
@@ -61,7 +61,6 @@ for pow in $(seq 12 20); do
     notmuch show --format=raw subject:$size > OUTPUT
     test_expect_equal_file mail/size-$size OUTPUT
     test_begin_subtest "return value, message of size $size"
-    test_subtest_known_broken
     test_expect_success  "notmuch show --format=raw subject:$size > /dev/null"
 done
 
-- 
2.20.1

      parent reply	other threads:[~2019-05-05  0:10 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-27 21:07 [PATCH 1/1] cli/show: avoid empty write to stdout in format_part_raw Rob Browning
2019-04-28 16:29 ` v2 format_raw fix David Bremner
2019-04-28 16:29   ` [PATCH 1/2] test: notmuch show --format=raw for 4096 byte messages David Bremner
2019-05-01 19:55     ` Tomi Ollila
2019-05-01 20:12       ` David Bremner
2019-04-28 16:29   ` [PATCH 2/2] cli/show: avoid empty write to stdout in format_part_raw David Bremner
2019-05-05  0:10     ` v3 raw output of messages with size multiples of stdio buffer size David Bremner
2019-05-05  0:10       ` [PATCH 1/2] test/raw: add some messages likely to be multiples of " David Bremner
2019-05-05  9:18         ` Tomi Ollila
2019-05-05 10:06           ` Tomi Ollila
2019-05-05 10:49             ` David Bremner
2019-05-05 15:15               ` Daniel Kahn Gillmor
2019-05-05  0:10       ` David Bremner [this message]

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=20190505001027.28627-3-david@tethera.net \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    --cc=rlb@defaultvalue.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).