aboutsummaryrefslogtreecommitdiffhomepage
path: root/notmuch.c
diff options
context:
space:
mode:
authorGravatar Tomi Ollila <tomi.ollila@iki.fi>2013-05-28 21:38:52 +0300
committerGravatar David Bremner <bremner@debian.org>2013-05-29 20:00:52 -0300
commit8a0e85025af5854666f5a8a18236f4ed69924638 (patch)
tree2bc3ec44bc031e4a8d5dfb92b3aed78c9a58a24f /notmuch.c
parente7ade21d56b43dafc6dbd517a1b72fcf9d62b238 (diff)
cli: add global option --stderr=FILE
With this option all writes to stderr are redirected to the specified 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.
Diffstat (limited to 'notmuch.c')
-rw-r--r--notmuch.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/notmuch.c b/notmuch.c
index f51a84f5..15e90c81 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]);