From: Tomi Ollila <tomi.ollila@iki.fi>
To: notmuch@notmuchmail.org
Cc: tomi.ollila@iki.fi
Subject: [PATCH v3 1/4] cli: add global option --stderr=FILE
Date: Tue, 28 May 2013 21:38:52 +0300 [thread overview]
Message-ID: <1369766335-26733-2-git-send-email-tomi.ollila@iki.fi> (raw)
In-Reply-To: <1369766335-26733-1-git-send-email-tomi.ollila@iki.fi>
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 | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 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 <sys/stat.h>
#include <sys/time.h>
#include <unistd.h>
+#include <fcntl.h>
#include <dirent.h>
#include <errno.h>
#include <signal.h>
diff --git a/notmuch.c b/notmuch.c
index f51a84f..15e90c8 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -251,6 +251,32 @@ 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_TRUNC, 0666);
+ 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 +285,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 +295,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 +315,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
next prev parent reply other threads:[~2013-05-28 18:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-28 18:38 v3 of --stderr=FILE patches Tomi Ollila
2013-05-28 18:38 ` Tomi Ollila [this message]
2013-05-28 18:38 ` [PATCH v3 2/4] test: added --stderr=FILE tests Tomi Ollila
2013-05-28 18:38 ` [PATCH v3 3/4] man: documented --stderr=FILE in notmuch.1 manual page Tomi Ollila
2013-05-28 18:38 ` [PATCH v3 4/4] NEWS: added information about new --stderr=FILE top level option Tomi Ollila
2013-05-29 18:21 ` v3 of --stderr=FILE patches Mark Walters
2013-05-29 20:34 ` Austin Clements
2013-05-29 23:52 ` David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1369766335-26733-2-git-send-email-tomi.ollila@iki.fi \
--to=tomi.ollila@iki.fi \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).