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