From c4a2d787277b96307cf35f3ab582695a61c3aade Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 23 Apr 2012 00:27:47 +2000 Subject: [PATCH] [PATCH v2 3/4] new: Print final fatal error message to stderr --- 97/fdfdbb58a89944dae65f492e01ccd392d44a7a | 99 +++++++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 97/fdfdbb58a89944dae65f492e01ccd392d44a7a diff --git a/97/fdfdbb58a89944dae65f492e01ccd392d44a7a b/97/fdfdbb58a89944dae65f492e01ccd392d44a7a new file mode 100644 index 000000000..f1a96f118 --- /dev/null +++ b/97/fdfdbb58a89944dae65f492e01ccd392d44a7a @@ -0,0 +1,99 @@ +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 D9232431FD0 + for ; Sat, 21 Apr 2012 21:27:56 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 16U6jN45K1Zo for ; + Sat, 21 Apr 2012 21:27:56 -0700 (PDT) +Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU + [18.7.68.34]) + by olra.theworths.org (Postfix) with ESMTP id 0F861431FBD + for ; Sat, 21 Apr 2012 21:27:56 -0700 (PDT) +X-AuditID: 12074422-b7fd66d0000008f9-e3-4f9388cbf627 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP + id 92.74.02297.BC8839F4; Sun, 22 Apr 2012 00:27:55 -0400 (EDT) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id q3M4Rs2Z022159; + Sun, 22 Apr 2012 00:27:54 -0400 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q3M4RrCG011061 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sun, 22 Apr 2012 00:27:54 -0400 (EDT) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1SLoOv-0003IC-IA; Sun, 22 Apr 2012 00:27:53 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 3/4] new: Print final fatal error message to stderr +Date: Sun, 22 Apr 2012 00:27:47 -0400 +Message-Id: <1335068868-12593-4-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: <1335068868-12593-1-git-send-email-amdragon@mit.edu> +References: <1330357759-1337-1-git-send-email-amdragon@mit.edu> + <1335068868-12593-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFlrPIsWRmVeSWpSXmKPExsUixG6nonu6Y7K/wan1yhbXb85kdmD0eLbq + FnMAYxSXTUpqTmZZapG+XQJXxoz761gL1rBVfN64k62BsZ21i5GTQ0LAROLUrQZ2CFtM4sK9 + 9WwgtpDAPkaJRVtyuhi5gOwNjBJnPncxQzj3mSRuvVnIBFE1n1Hi+L0qEJtNQENi2/7ljCC2 + iIC0xM67s4E2cHAwC6hJ/OlSAQkLC7hJfN+xjgUkzCKgKjF9GlgFr4CDxKK1cRAnKEg8W3cc + bDingKPE4pfHGSEWlUk0vVzGOIGRfwEjwypG2ZTcKt3cxMyc4tRk3eLkxLy81CJdU73czBK9 + 1JTSTYzgcHFR2sH486DSIUYBDkYlHt5XJpP9hVgTy4orcw8xSnIwKYny6lcChfiS8lMqMxKL + M+KLSnNSiw8xSnAwK4nwfhYByvGmJFZWpRblw6SkOViUxHnVtd75CQmkJ5akZqemFqQWwWRl + ODiUJHidgHEhJFiUmp5akZaZU4KQZuLgBBnOAzT8eTvI8OKCxNzizHSI/ClGRSlxXhGQZgGQ + REZpHlwvLJ5fMYoDvSLMawRSxQNMBXDdr4AGMwENToiZBDK4JBEhJdXA6D9F+plxC5virVob + 9VPbz6xU0py7ZE7sXTfFG3Kzns+ZcWvXJOEPfKI/Z9ksnPdgU8LSxC37BU4/322UcqEltM3r + 5v+C4/LdnoZztugcDRFctPfHspiDbglvmtdYS1pcsLu3RqpI5LtfccXBd4Fzj0d9X+qQZbHf + TvG3c00w/8u17AGPJ7K0qCqxFGckGmoxFxUnAgCcUuHjwgIAAA== +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: Sun, 22 Apr 2012 04:27:57 -0000 + +This was going to stdout. I removed the newline at the beginning of +printing the fatal error message because it wouldn't make sense if you +were only looking at the stderr stream (e.g., you had redirected +stdout to /dev/null). +--- + notmuch-new.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/notmuch-new.c b/notmuch-new.c +index 92e0489..2103b18 100644 +--- a/notmuch-new.c ++++ b/notmuch-new.c +@@ -1035,8 +1035,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[]) + printf ("\n"); + + if (ret) +- printf ("\nNote: A fatal error was encountered: %s\n", +- notmuch_status_to_string (ret)); ++ fprintf (stderr, "Note: A fatal error was encountered: %s\n", ++ notmuch_status_to_string (ret)); + + notmuch_database_close (notmuch); + +-- +1.7.9.1 + -- 2.26.2