95/2e63d5833875b64d19a25926acb6031a4df8f0

   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 BA4E1429E26\r
   6         for <notmuch@notmuchmail.org>; Thu, 22 Dec 2011 12:15:58 -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 gizdJPwgd3Gf for <notmuch@notmuchmail.org>;\r
  16         Thu, 22 Dec 2011 12:15:58 -0800 (PST)\r
  17 Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
  18         [18.9.25.13])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 4E94A429E25\r
  20         for <notmuch@notmuchmail.org>; Thu, 22 Dec 2011 12:15:58 -0800 (PST)\r
  21 X-AuditID: 1209190d-b7f576d0000008c4-5b-4ef38ffd525c\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 0F.1E.02244.DFF83FE4; Thu, 22 Dec 2011 15:15:57 -0500 (EST)\r
  25 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id pBMKFvXe013394; \r
  27         Thu, 22 Dec 2011 15:15:57 -0500\r
  28 Received: from drake.mit.edu (c-76-21-105-205.hsd1.ca.comcast.net\r
  29         [76.21.105.205]) (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id pBMKFtUn006046\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Thu, 22 Dec 2011 15:15:57 -0500 (EST)\r
  34 Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
  35         (envelope-from <amthrax@drake.mit.edu>)\r
  36         id 1Rdp3T-00025t-0S; Thu, 22 Dec 2011 15:15:55 -0500\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH] Properly handle short writes in sigint handlers\r
  40 Date: Thu, 22 Dec 2011 15:15:48 -0500\r
  41 Message-Id: <1324584948-8009-1-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.7.7.3\r
  43 In-Reply-To: <20111222201553.GK10376@mit.edu>\r
  44 References: <20111222201553.GK10376@mit.edu>\r
  45 X-Brightmail-Tracker:\r
  46  H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrPu3/7OfwY7/BhbXb85kdmD0eLbq\r
  47         FnMAYxSXTUpqTmZZapG+XQJXxvvXh9kKjnBVzDvxkrGB8QV7FyMnh4SAicTGs8cZIWwxiQv3\r
  48         1rN1MXJxCAnsY5RoPP2SBSQhJLCBUeLuFQOIxDkmiQ0be6Cq5jNKvDqwlQ2kik1AQ2Lb/uVg\r
  49         o0QEpCV23p3N2sXIwcEsoCbxp0sFxBQWcJA4cScTpIJFQFVi8b9JzCA2r4C9xKruR8wQRyhI\r
  50         nFt9Duw4TgFdiVsHe5ggbtCRWHj6MvMERv4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz8lKLdI30\r
  51         cjNL9FJTSjcxgkNGkncH47uDSocYBTgYlXh4K4s++wmxJpYVV+YeYpTkYFIS5dXpAwrxJeWn\r
  52         VGYkFmfEF5XmpBYfYpTgYFYS4a1gBMrxpiRWVqUW5cOkpDlYlMR5VbXe+QkJpCeWpGanphak\r
  53         FsFkZTg4lCR4U4GxISRYlJqeWpGWmVOCkGbi4AQZzgM0PAKkhre4IDG3ODMdIn+KUVFKnNcN\r
  54         JCEAksgozYPrhcX0K0ZxoFeEeeNBqniA6QCu+xXQYCagwducP4AMLklESEk1MJqKrZBIu3f6\r
  55         gYDFadu6J9NSdlkvjFwTLL8ou1xnnaxlomTG7HX7iwv2z7C0XC546bFp0rQswSNmRif/PXIT\r
  56         60nMlWFg2dKwmTvC4c7DpVptrmo3DmqUcchmSckn/DAJYKqbwzJtqsRy5Z872NsnHTH48Kfe\r
  57         f5eQ+PbU8+Ls9q9OcXrv02h0UWIpzkg01GIuKk4EAP/VS+vEAgAA\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Thu, 22 Dec 2011 20:15:58 -0000\r
  71 \r
  72 Even if we don't care about errors from write(2), it's still necessary\r
  73 to handle short writes in order to use write correctly.  Some versions\r
  74 of glibc even mark write as warn_unused_result because of this, so our\r
  75 previous usage would trigger compiler warnings.\r
  76 ---\r
  77  notmuch-new.c |    5 ++++-\r
  78  notmuch-tag.c |    6 +++++-\r
  79  2 files changed, 9 insertions(+), 2 deletions(-)\r
  80 \r
  81 diff --git a/notmuch-new.c b/notmuch-new.c\r
  82 index 3512de7..fc09bbb 100644\r
  83 --- a/notmuch-new.c\r
  84 +++ b/notmuch-new.c\r
  85 @@ -66,8 +66,11 @@ static void\r
  86  handle_sigint (unused (int sig))\r
  87  {\r
  88      static char msg[] = "Stopping...         \n";\r
  89 +    const char *pos = msg, *end = msg + sizeof (msg) - 1;\r
  90 +    ssize_t c = 0;\r
  91  \r
  92 -    (void) write(2, msg, sizeof(msg)-1);\r
  93 +    for (; pos < end && c >= 0; pos += c)\r
  94 +       c = write (2, pos, end - pos);\r
  95      interrupted = 1;\r
  96  }\r
  97  \r
  98 diff --git a/notmuch-tag.c b/notmuch-tag.c\r
  99 index 292c5da..0d4873d 100644\r
 100 --- a/notmuch-tag.c\r
 101 +++ b/notmuch-tag.c\r
 102 @@ -26,7 +26,11 @@ static void\r
 103  handle_sigint (unused (int sig))\r
 104  {\r
 105      static char msg[] = "Stopping...         \n";\r
 106 -    (void) write(2, msg, sizeof(msg)-1);\r
 107 +    const char *pos = msg, *end = msg + sizeof (msg) - 1;\r
 108 +    ssize_t c = 0;\r
 109 +\r
 110 +    for (; pos < end && c >= 0; pos += c)\r
 111 +       c = write (2, pos, end - pos);\r
 112      interrupted = 1;\r
 113  }\r
 114  \r
 115 -- \r
 116 1.7.7.3\r
 117 \r