5b/bd7452772cd67fda54330adb07f3657682e25a

   1 Return-Path: <amdragon@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 4CF70431FBD\r
   6         for <notmuch@notmuchmail.org>; Sun, 23 Mar 2014 14:22:42 -0700 (PDT)\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 D-lP+0xdV0kc for <notmuch@notmuchmail.org>;\r
  16         Sun, 23 Mar 2014 14:22:36 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-1.mit.edu (dmz-mailsec-scanner-1.mit.edu\r
  18         [18.9.25.12])\r
  19         (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id DA89F431FB6\r
  22         for <notmuch@notmuchmail.org>; Sun, 23 Mar 2014 14:22:35 -0700 (PDT)\r
  23 X-AuditID: 1209190c-f794a6d000000c27-68-532f509a83e8\r
  24 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  25         (using TLS with cipher AES256-SHA (256/256 bits))\r
  26         (Client did not present a certificate)\r
  27         by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
  28         id 19.8E.03111.A905F235; Sun, 23 Mar 2014 17:22:34 -0400 (EDT)\r
  29 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  30         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s2NLMWxo019930; \r
  31         Sun, 23 Mar 2014 17:22:33 -0400\r
  32 Received: from drake.dyndns.org\r
  33         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  34         [216.15.114.40]) (authenticated bits=0)\r
  35         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  36         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s2NLMV4e016139\r
  37         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  38         Sun, 23 Mar 2014 17:22:32 -0400\r
  39 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  40         (envelope-from <amdragon@mit.edu>)\r
  41         id 1WRpqh-0006yu-2S; Sun, 23 Mar 2014 17:22:31 -0400\r
  42 From: Austin Clements <amdragon@MIT.EDU>\r
  43 To: notmuch@notmuchmail.org\r
  44 Subject: [PATCH] cli: Flush stdout before fork()ing to run hooks\r
  45 Date: Sun, 23 Mar 2014 17:22:26 -0400\r
  46 Message-Id: <1395609746-26801-1-git-send-email-amdragon@mit.edu>\r
  47 X-Mailer: git-send-email 1.8.4.rc3\r
  48 X-Brightmail-Tracker:\r
  49  H4sIAAAAAAAAA+NgFprNIsWRmVeSWpSXmKPExsUixG6nrjsrQD/Y4O1KI4vrN2cyOzB6PFt1\r
  50         izmAMYrLJiU1J7MstUjfLoErY8m5pWwFf1krZlw/z9bAeIKli5GTQ0LARKLtwlwoW0ziwr31\r
  51         bF2MXBxCArOZJH40TWaEcDYySrze9Y0dwrnDJHHi4ApWCGcuo0TTn2XMIP1sAhoS2/YvZwSx\r
  52         RQSkJXbenQ1UxMHBLKAm8adLBSQsLOAgcXvrS7ByFgFViYa/E9lBbF6g+MS2k2wQZyhJLDy1\r
  53         jXUCI+8CRoZVjLIpuVW6uYmZOcWpybrFyYl5ealFuoZ6uZkleqkppZsYQWHAKcmzg/HNQaVD\r
  54         jAIcjEo8vC+t9IOFWBPLiitzDzFKcjApifL+dgcK8SXlp1RmJBZnxBeV5qQWH2KU4GBWEuGN\r
  55         dAXK8aYkVlalFuXDpKQ5WJTEeeU5tIOFBNITS1KzU1MLUotgsjIcHEoSvOf9gRoFi1LTUyvS\r
  56         MnNKENJMHJwgw3mAhu8EqeEtLkjMLc5Mh8ifYlSUEuf9CJIQAElklObB9cLi9BWjONArwrz7\r
  57         Qap4gDEO1/0KaDAT0ODwJj2QwSWJCCmpBsaSHytud/hapggdl51ndOfGN+U1aU8vr9CYNaWs\r
  58         rnRWb/drU4HDqWfbH94MM2sT2Kxj9LCKx35f7onw+kNzE96sPuosxsPOtP5f1wtnpxvWk4R2\r
  59         TfZbu2Fdu4SIRt2rlUJLDle8PzDH1tlv2sI01VmeZVof1jL2aTx1ZRao3KAtfYzjqcz9NVuV\r
  60         WIozEg21mIuKEwE6B/xxrgIAAA==\r
  61 X-BeenThere: notmuch@notmuchmail.org\r
  62 X-Mailman-Version: 2.1.13\r
  63 Precedence: list\r
  64 List-Id: "Use and development of the notmuch mail system."\r
  65         <notmuch.notmuchmail.org>\r
  66 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  67         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  68 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  69 List-Post: <mailto:notmuch@notmuchmail.org>\r
  70 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  71 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  72         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  73 X-List-Received-Date: Sun, 23 Mar 2014 21:22:42 -0000\r
  74 \r
  75 Without this flush, if stdout is block buffered (which will happen if\r
  76 it's a pipe or a file, for example) and the hook also writes to\r
  77 stdout, then notmuch new's output will appear *after* the hook output.\r
  78 \r
  79 This situation may be a little esoteric, but it's good practice to\r
  80 flush before you fork anyway.\r
  81 ---\r
  82  hooks.c | 3 +++\r
  83  1 file changed, 3 insertions(+)\r
  84 \r
  85 diff --git a/hooks.c b/hooks.c\r
  86 index 44ee419..662629a 100644\r
  87 --- a/hooks.c\r
  88 +++ b/hooks.c\r
  89 @@ -50,6 +50,9 @@ notmuch_run_hook (const char *db_path, const char *hook)\r
  90         goto DONE;\r
  91      }\r
  92  \r
  93 +    /* Flush any buffered output before forking. */\r
  94 +    fflush (stdout);\r
  95 +\r
  96      pid = fork();\r
  97      if (pid == -1) {\r
  98         fprintf (stderr, "Error: %s hook fork failed: %s\n", hook,\r
  99 -- \r
 100 1.8.4.rc3\r
 101 \r