[PATCH 5/7] CLI: add --leak-report top level option

diff --git a/d2/5299d7ee5459cd0b604f42bc7c6b03d757f953 b/d2/5299d7ee5459cd0b604f42bc7c6b03d757f953
new file mode 100644 (file)
index 0000000..62ef534
--- /dev/null
+++ b/d2/5299d7ee5459cd0b604f42bc7c6b03d757f953
@@ -0,0 +1,131 @@
+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 421AC431FCF\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 10:26:43 -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 9GP82TeDpERI for <notmuch@notmuchmail.org>;\r
+       Sat, 19 Jan 2013 10:26:42 -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 C0377431FD0\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 10:26:11 -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 1Twd7J-0007xL-7c; Sat, 19 Jan 2013 14:26:09 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Twd7D-0005au-L9; Sat, 19 Jan 2013 14:26:03 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 5/7] CLI: add --leak-report top level option\r
+Date: Sat, 19 Jan 2013 14:25:56 -0400\r
+Message-Id: <1358619958-21209-6-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1358619958-21209-1-git-send-email-david@tethera.net>\r
+References: <1358619958-21209-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: Sat, 19 Jan 2013 18:26:43 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This roughly mimics the samba4 argument. The presence of the command\r
+line argument overrides any value of NOTMUCH_TALLOC_REPORT in the\r
+environment.\r
+---\r
+ man/man1/notmuch.1 |    8 ++++++++\r
+ notmuch.c          |   18 +++++++-----------\r
+ 2 files changed, 15 insertions(+), 11 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1\r
+index 6bf9b2e..5c58c41 100644\r
+--- a/man/man1/notmuch.1\r
++++ b/man/man1/notmuch.1\r
+@@ -70,6 +70,14 @@ Print a synopsis of available commands and exit.\r
+ Print the installed version of notmuch, and exit.\r
+ .RE\r
+ \r
++.RS 4\r
++.TP 4\r
++.BI \-\-leak-report= path\r
++\r
++Write a detailed report of all memory allocated via talloc to\r
++.I path\r
++.RE\r
++\r
+ .SH COMMANDS\r
+ \r
+ \r
+diff --git a/notmuch.c b/notmuch.c\r
+index a674481..f8d4b35 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -250,11 +250,13 @@ main (int argc, char *argv[])\r
+     command_t *command;\r
+     unsigned int i;\r
+     notmuch_bool_t print_help=FALSE, print_version=FALSE;\r
++    const char* leak_report=NULL;\r
+     int opt_index;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+       { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 },\r
++      { NOTMUCH_OPT_STRING, &leak_report, "leak-report", 'l', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -290,21 +292,15 @@ main (int argc, char *argv[])\r
+ \r
+       if (strcmp (argv[opt_index], command->name) == 0) {\r
+           int ret;\r
+-          char *talloc_report;\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
+-           * talloc_enable_null_tracking */\r
++          if (leak_report == NULL) {\r
++              leak_report = getenv ("NOTMUCH_TALLOC_REPORT");\r
++          }\r
+ \r
+-          if (talloc_report && strcmp (talloc_report, "") != 0) {\r
+-              FILE *report = fopen (talloc_report, "w");\r
++          if (leak_report && (strcmp (leak_report, "") != 0)) {\r
++              FILE *report = fopen (leak_report, "w");\r
+               talloc_report_full (NULL, report);\r
+           }\r
+ \r
+-- \r
+1.7.10.4\r
+\r