Changeset 7c539a8

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Parents:

0a9ffc5 (diff), 4d9e311c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 4d9e311c006953157914f0491b8904e796ea3f19 into 0a9ffc5232545cdaee5dacab62f1082c9230892e

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