From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id D1ED7431FDA for ; Thu, 23 May 2013 11:06:17 -0700 (PDT) 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 xJ5LVa+ZQT5L for ; Thu, 23 May 2013 11:06:11 -0700 (PDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id 853B1431FAF for ; Thu, 23 May 2013 11:06:11 -0700 (PDT) Received: by guru.guru-group.fi (Postfix, from userid 501) id A77761002C4; Thu, 23 May 2013 21:06:07 +0300 (EEST) From: Tomi Ollila To: notmuch@notmuchmail.org Subject: [PATCH 1/4] cli: add global option --stderr=FILE Date: Thu, 23 May 2013 21:05:59 +0300 Message-Id: <1369332362-4719-1-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.8.0 Cc: tomi.ollila@iki.fi 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: Thu, 23 May 2013 18:06:18 -0000 With this option all writes to stderr are redirected to the spesified FILE (or to stdout on case FILE is '-'). This is immediately useful in emacs interface as some of its exec intefaces do not provide separation of stdout and stderr. --- notmuch-client.h | 1 + notmuch.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/notmuch-client.h b/notmuch-client.h index 45749a6..4a3c7ac 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -54,6 +54,7 @@ typedef GMimeCipherContext notmuch_crypto_context_t; #include #include #include +#include #include #include #include diff --git a/notmuch.c b/notmuch.c index f51a84f..77b5282 100644 --- a/notmuch.c +++ b/notmuch.c @@ -251,6 +251,31 @@ notmuch_command (notmuch_config_t *config, return 0; } +static int redirect_stderr (const char * stderr_file) +{ + if (strcmp (stderr_file, "-") == 0) { + if (dup2 (STDOUT_FILENO, STDERR_FILENO) < 0) { + perror ("dup2"); + return 1; + } + } else { + int fd = open (stderr_file, O_WRONLY|O_CREAT|O_APPEND, 0644); + if (fd < 0) { + fprintf (stderr, "Error: Cannot redirect stderr to '%s': %s\n", + stderr_file, strerror (errno)); + return 1; + } + if (fd != STDERR_FILENO) { + if (dup2 (fd, STDERR_FILENO) < 0) { + perror ("dup2"); + return 1; + } + close (fd); + } + } + return 0; +} + int main (int argc, char *argv[]) { @@ -259,6 +284,7 @@ main (int argc, char *argv[]) const char *command_name = NULL; command_t *command; char *config_file_name = NULL; + char *stderr_file = NULL; notmuch_config_t *config; notmuch_bool_t print_help=FALSE, print_version=FALSE; int opt_index; @@ -268,6 +294,7 @@ main (int argc, char *argv[]) { NOTMUCH_OPT_BOOLEAN, &print_help, "help", 'h', 0 }, { NOTMUCH_OPT_BOOLEAN, &print_version, "version", 'v', 0 }, { NOTMUCH_OPT_STRING, &config_file_name, "config", 'c', 0 }, + { NOTMUCH_OPT_STRING, &stderr_file, "stderr", '\0', 0 }, { 0, 0, 0, 0, 0 } }; @@ -287,6 +314,10 @@ main (int argc, char *argv[]) return 1; } + if (stderr_file && redirect_stderr (stderr_file) != 0) { + /* error already printed */ + return 1; + } if (print_help) return notmuch_help_command (NULL, argc - 1, &argv[1]); -- 1.8.1.4