1 Return-Path: <bremner@tethera.net>
\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 3B480431FB6
\r
6 for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 13:58:58 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 FFsvqXYfwYM2 for <notmuch@notmuchmail.org>;
\r
16 Wed, 26 Dec 2012 13:58:57 -0800 (PST)
\r
17 Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])
\r
18 (using TLSv1 with cipher AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id ACEEF429E28
\r
21 for <notmuch@notmuchmail.org>; Wed, 26 Dec 2012 13:58:51 -0800 (PST)
\r
22 Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net
\r
23 ([156.34.82.78] helo=zancas.localnet)
\r
24 by tesseract.cs.unb.ca with esmtpsa
\r
25 (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)
\r
26 (envelope-from <bremner@tethera.net>)
\r
27 id 1Tnyzv-0002wg-Pv; Wed, 26 Dec 2012 17:58:47 -0400
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.80)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1Tnyzq-0002Xq-9y; Wed, 26 Dec 2012 17:58:42 -0400
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [Patch v2 1/4] CLI: add talloc leak report,
\r
34 controlled by an environment variable.
\r
35 Date: Wed, 26 Dec 2012 17:58:28 -0400
\r
36 Message-Id: <1356559111-9447-2-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.10.4
\r
38 In-Reply-To: <1356559111-9447-1-git-send-email-david@tethera.net>
\r
39 References: <1356559111-9447-1-git-send-email-david@tethera.net>
\r
41 Cc: David Bremner <bremner@debian.org>
\r
42 X-BeenThere: notmuch@notmuchmail.org
\r
43 X-Mailman-Version: 2.1.13
\r
45 List-Id: "Use and development of the notmuch mail system."
\r
46 <notmuch.notmuchmail.org>
\r
47 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
48 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
49 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
50 List-Post: <mailto:notmuch@notmuchmail.org>
\r
51 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
52 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
53 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
54 X-List-Received-Date: Wed, 26 Dec 2012 21:58:58 -0000
\r
56 From: David Bremner <bremner@debian.org>
\r
58 The argument handling in notmuch.c seems due for an overhaul, but
\r
59 until then use an environment variable to specify a location to write
\r
60 the talloc leak report to. This is only enabled for the (interesting)
\r
61 case where some notmuch subcommand is invoked.
\r
63 notmuch.c | 24 ++++++++++++++++++++++--
\r
64 1 file changed, 22 insertions(+), 2 deletions(-)
\r
66 diff --git a/notmuch.c b/notmuch.c
\r
67 index ee2892e..6b7aae8 100644
\r
70 @@ -321,8 +321,28 @@ main (int argc, char *argv[])
\r
71 for (i = 0; i < ARRAY_SIZE (commands); i++) {
\r
72 command = &commands[i];
\r
74 - if (strcmp (argv[1], command->name) == 0)
\r
75 - return (command->function)(local, argc - 1, &argv[1]);
\r
76 + if (strcmp (argv[1], command->name) == 0) {
\r
78 + char *talloc_report;
\r
80 + ret = (command->function)(local, argc - 1, &argv[1]);
\r
82 + /* in the future support for this environment variable may
\r
83 + * be supplemented or replaced by command line arguments
\r
84 + * --leak-report and/or --leak-report-full */
\r
86 + talloc_report = getenv ("NOTMUCH_TALLOC_REPORT");
\r
88 + /* this relies on the previous call to
\r
89 + * talloc_enable_null_tracking */
\r
91 + if (talloc_report && strcmp (talloc_report, "") != 0) {
\r
92 + FILE *report = fopen (talloc_report, "w");
\r
93 + talloc_report_full (NULL, report);
\r
100 fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
\r