From 8d863c9e87677909491f9783b951b2f0f13130ab Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Fri, 31 May 2013 22:10:31 +0300 Subject: revert: Removed top level --stderr= option While looked good on paper, its attempted use caused confusion, complexity, and potential for information leak when passed through wrapper scripts. For slimmer code and to lessen demand for maintenance/support the set of commits which added top level --stderr= option is now reverted. --- notmuch.c | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'notmuch.c') diff --git a/notmuch.c b/notmuch.c index 45a73ce0..ffe8f7e0 100644 --- a/notmuch.c +++ b/notmuch.c @@ -238,32 +238,6 @@ 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[]) { @@ -272,7 +246,6 @@ 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; @@ -282,7 +255,6 @@ 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 } }; @@ -304,10 +276,6 @@ 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]); -- cgit v1.2.3