[PATCH 2/2] CLI: add simple error handling for talloc logging

diff --git a/d5/0dd7a5492270a764c7e0fd1493a67d22f452ba b/d5/0dd7a5492270a764c7e0fd1493a67d22f452ba
new file mode 100644 (file)
index 0000000..e9e1290
--- /dev/null
+++ b/d5/0dd7a5492270a764c7e0fd1493a67d22f452ba
@@ -0,0 +1,96 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id D049D431FDA\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Jan 2013 04:14:03 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id RXLzKFxSVQhq for <notmuch@notmuchmail.org>;\r
+       Tue, 29 Jan 2013 04:14:03 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 69884431FD7\r
+       for <notmuch@notmuchmail.org>; Tue, 29 Jan 2013 04:14:01 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1U0A4e-0008Lg-9I; Tue, 29 Jan 2013 08:14:00 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1U0A4Y-0000UQ-OF; Tue, 29 Jan 2013 08:13:54 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] CLI: add simple error handling for talloc logging\r
+Date: Tue, 29 Jan 2013 08:13:40 -0400\r
+Message-Id: <1359461620-1716-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1359461620-1716-1-git-send-email-david@tethera.net>\r
+References: <1359461620-1716-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 29 Jan 2013 12:14:04 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This really should have been there before. I think it's better to do\r
+the actual operation and then possibly fail writing the memory log,\r
+but it would not be too hard to change it to abort earlier.\r
+---\r
+ notmuch.c |   12 +++++++-----\r
+ 1 file changed, 7 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/notmuch.c b/notmuch.c\r
+index a674481..cfb009b 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -294,10 +294,6 @@ main (int argc, char *argv[])\r
+ \r
+           ret = (command->function)(local, argc - opt_index, argv + opt_index);\r
+ \r
+-          /* in the future support for this environment variable may\r
+-           * be supplemented or replaced by command line arguments\r
+-           * --leak-report and/or --leak-report-full */\r
+-\r
+           talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");\r
+ \r
+           /* this relies on the previous call to\r
+@@ -305,7 +301,13 @@ main (int argc, char *argv[])\r
+ \r
+           if (talloc_report && strcmp (talloc_report, "") != 0) {\r
+               FILE *report = fopen (talloc_report, "w");\r
+-              talloc_report_full (NULL, report);\r
++              if (report) {\r
++                  talloc_report_full (NULL, report);\r
++              } else {\r
++                  ret = 1;\r
++                  fprintf (stderr, "ERROR: unable to write talloc log. ");\r
++                  perror (talloc_report);\r
++              }\r
+           }\r
+ \r
+           return ret;\r
+-- \r
+1.7.10.4\r
+\r