Changeset 4d9e311c

Timestamp:

Aug 12, 2012, 9:11:23 PM (12 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.9

Children:

ea0c453, 54d9b42, a8c55b5, 7c539a8

Parents:

0a9ffc5

git-author:

David Benjamin <davidben@mit.edu> (08/12/12 18:08:20)

git-committer:

David Benjamin <davidben@mit.edu> (08/12/12 21:11:23)

Message:

Don't do the stderr redirect hack if !isatty(2)

stderr has already been redirected, so there's no point. This way if
barnowl crashes, we have some hope of recovering the stderr by
redirecting it to a file first. The pipe hack is still evil, but this is
somewhat less insane.

File:

• owl.c (modified) (3 diffs)

owl.c

@@ -12 +12 @@
 #include <sys/stat.h>
 #include <locale.h>
+#include <unistd.h>
 
 #if OWL_STDERR_REDIR
@@ -427 +428 @@
   if (0 != pipe(pipefds)) {
     perror("pipe");
-    owl_function_debugmsg("stderr_replace: pipe FAILED\n");
+    owl_function_debugmsg("stderr_replace: pipe FAILED");
     return -1;
   }
-    owl_function_debugmsg("stderr_replace: pipe: %d,%d\n", pipefds[0], pipefds[1]);
-  if (-1 == dup2(pipefds[1], 2 /*stderr*/)) {
-    owl_function_debugmsg("stderr_replace: dup2 FAILED (%s)\n", strerror(errno));
+    owl_function_debugmsg("stderr_replace: pipe: %d,%d", pipefds[0], pipefds[1]);
+  if (-1 == dup2(pipefds[1], STDERR_FILENO)) {
+    owl_function_debugmsg("stderr_replace: dup2 FAILED (%s)", strerror(errno));
     perror("dup2");
     return -1;
@@ -514 +515 @@
 #if OWL_STDERR_REDIR
   /* Do this only after we've started curses up... */
-  owl_function_debugmsg("startup: doing stderr redirection");
-  channel = g_io_channel_unix_new(stderr_replace());
-  g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR, &stderr_redirect_handler, NULL);
-  g_io_channel_unref(channel);
+  if (isatty(STDERR_FILENO)) {
+    owl_function_debugmsg("startup: doing stderr redirection");
+    channel = g_io_channel_unix_new(stderr_replace());
+    g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR, &stderr_redirect_handler, NULL);
+    g_io_channel_unref(channel);
+  }
 #endif