14/dae2f29a8bfe0ce8d5d1ef34b2559eeace877e

   1 Return-Path: <amthrax@drake.mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 0EE28431FBF\r
   6         for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 16:40:21 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id IkuDlD2B4gEE for <notmuch@notmuchmail.org>;\r
  16         Wed, 18 Jan 2012 16:40:20 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
  18         [18.7.68.37])\r
  19         by olra.theworths.org (Postfix) with ESMTP id EE7F2431FB6\r
  20         for <notmuch@notmuchmail.org>; Wed, 18 Jan 2012 16:40:19 -0800 (PST)\r
  21 X-AuditID: 12074425-b7f4a6d0000008e0-23-4f1766722b0c\r
  22 Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
  23         by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id C6.87.02272.276671F4; Wed, 18 Jan 2012 19:40:18 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q0J0eI4K014933; \r
  27         Wed, 18 Jan 2012 19:40:18 -0500\r
  28 Received: from drake.mit.edu\r
  29         (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [209.6.116.242]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q0J0eGm1016738\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Wed, 18 Jan 2012 19:40:17 -0500 (EST)\r
  35 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  36         (envelope-from <amthrax@drake.mit.edu>)\r
  37         id 1Rng36-0004Ym-CZ; Wed, 18 Jan 2012 19:40:16 -0500\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH 1/2] show: Handle read and write errors\r
  41 Date: Wed, 18 Jan 2012 19:40:10 -0500\r
  42 Message-Id: <1326933611-16898-2-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.7.7.3\r
  44 In-Reply-To: <1326933611-16898-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1326933611-16898-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsUixCmqrVuUJu5v8PitpMX1mzOZHRg9nq26\r
  48         xRzAGMVlk5Kak1mWWqRvl8CVcX3JVPaCQ5wVXZsmMDcwbmbvYuTkkBAwkfh+8gAzhC0mceHe\r
  49         erYuRi4OIYF9jBKn+y4xQzgbGCW+vfkM5dxnkmjYuxjKmc8osf7kCkaQfjYBDYlt+5eD2SIC\r
  50         0hI7785m7WLk4GAWUJP406UCEhYWMJc43LOHCcRmEVCVmHltGpjNK+AgMfFSK9RJChLnVp8D\r
  51         szkFHCWufjkKViMEVLPh0gqWCYz8CxgZVjHKpuRW6eYmZuYUpybrFicn5uWlFula6OVmluil\r
  52         ppRuYgSFDbuL6g7GCYeUDjEKcDAq8fBGiIj7C7EmlhVX5h5ilORgUhLlfZQKFOJLyk+pzEgs\r
  53         zogvKs1JLT7EKMHBrCTCu9MEKMebklhZlVqUD5OS5mBREufV1HrnJySQnliSmp2aWpBaBJOV\r
  54         4eBQkuA1BBkqWJSanlqRlplTgpBm4uAEGc4DNDwMpIa3uCAxtzgzHSJ/ilGX48vvtvOMQix5\r
  55         +XmpUuK820GKBECKMkrz4ObA4v0VozjQW8K80SBVPMBUATfpFdASJqAlHk1iIEtKEhFSUg2M\r
  56         Abtm8ob3Llqquy9yk8jps4cailVjGeQCFjdkhNw11GbyWSmZFs6TyRjxVEPLTtSDN93DUUpC\r
  57         zH0++9aFvKukHD3k5tleebJRquOO3pfy2eaaZsE7SnzjrnbrdK8J2dl/7BpbndMyPtbncdbv\r
  58         ta4+3eQc4vzbLqwunoFjv/jdpdO/tO3uLFRiKc5INNRiLipOBABeDbI80gIAAA==\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Thu, 19 Jan 2012 00:40:21 -0000\r
  72 \r
  73 For showing a message in raw format, rather than silently succeeding\r
  74 when a read or a write fails (or, probably, looping if a read fails),\r
  75 try to print an error message and exit with a non-zero status.\r
  76 \r
  77 This silences one of the buildbot warnings about unused resuls.  While\r
  78 my libc lacks the declarations that trigger these warnings, this can\r
  79 be tested by adding the following to notmuch.h:\r
  80 \r
  81 __attribute__((warn_unused_result))\r
  82 size_t fwrite(const void *ptr, size_t size, size_t nmemb, FILE *stream);\r
  83 ---\r
  84  notmuch-show.c |   12 +++++++++++-\r
  85  1 files changed, 11 insertions(+), 1 deletions(-)\r
  86 \r
  87 diff --git a/notmuch-show.c b/notmuch-show.c\r
  88 index d14dac9..c674e25 100644\r
  89 --- a/notmuch-show.c\r
  90 +++ b/notmuch-show.c\r
  91 @@ -883,7 +883,17 @@ do_show_single (void *ctx,\r
  92  \r
  93         while (!feof (file)) {\r
  94             size = fread (buf, 1, sizeof (buf), file);\r
  95 -           (void) fwrite (buf, size, 1, stdout);\r
  96 +           if (ferror (file)) {\r
  97 +               fprintf (stderr, "Error: Read failed from %s\n", filename);\r
  98 +               fclose (file);\r
  99 +               return 1;\r
 100 +           }\r
 101 +\r
 102 +           if (fwrite (buf, size, 1, stdout) != 1) {\r
 103 +               fprintf (stderr, "Error: Write failed\n");\r
 104 +               fclose (file);\r
 105 +               return 1;\r
 106 +           }\r
 107         }\r
 108  \r
 109         fclose (file);\r
 110 -- \r
 111 1.7.7.3\r
 112 \r