Changeset 2a2bb60

Timestamp:

Oct 17, 2003, 9:51:17 PM (19 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e8b95f8

Parents:

27c3a93

Message:

2.0.9-pre-3
	Added testing feature for capturing stderr messages
	        from commands and displaying them in the errors buffer.
		This feature is disabled by default.
		Enable in owl.h with:  OWL_STDERR_REDIR 1

Files:

• ChangeLog (modified) (1 diff)
• functions.c (modified) (1 diff)
• owl.c (modified) (5 diffs)
• owl.h (modified) (1 diff)
• zwrite.c (modified) (1 diff)

ChangeLog

@@ -1 +1 @@
 $Id$
 
+2.0.9-pre-3
+        Added testing feature for capturing stderr messages
+                from commands and displaying them in the errors buffer.
+                This feature is disabled by default.
+                Enable in owl.h with:  OWL_STDERR_REDIR 1
+        
 2.0.9-pre-2
         Better reporting of perl errors (both into the errqueue

functions.c

@@ -1972 +1972 @@
   FILE *p;
 
+#if OWL_STDERR_REDIR
+  redirect = " < /dev/null";
+#endif 
+
   if (argc<2) {
     owl_function_error("Wrong number of arguments to the exec command");

owl.c

@@ -21 +21 @@
 #include <sys/stat.h>
 #include "owl.h"
+
+#if OWL_STDERR_REDIR
+#include <sys/ioctl.h>
+int stderr_replace(void);
+void stderr_redirect(int rfd);
+#endif
 
 static const char fileIdent[] = "$Id$";
@@ -42 +48 @@
   ZNotice_t notice;
 #endif
+#if OWL_STDERR_REDIR
+  int newstderr;
+#endif
 
   argcsave=argc;
@@ -136 +145 @@
 #endif
   owl_global_set_haveaim(&g);
+
+#if OWL_STDERR_REDIR
+  /* Do this only after we've started curses up... */  
+  newstderr = stderr_replace();
+#endif   
+
   
   /* create the owl directory, in case it does not exist */
@@ -530 +545 @@
       owl_function_makemsg("Unable to handle keypress");
     }
+
+#if OWL_STDERR_REDIR
+    stderr_redirect(newstderr);
+#endif   
+
   }
 }
@@ -552 +572 @@
   fprintf(stderr, "  -t      set the tty name\n");
 }
+
+
+
+#if OWL_STDERR_REDIR
+
+/* Replaces stderr with a pipe so that we can read from it. 
+ * Returns the fd of the pipe from which stderr can be read. */
+int stderr_replace(void) {
+  int pipefds[2];
+  if (0 != pipe(pipefds)) {
+    perror("pipe");
+    owl_function_debugmsg("stderr_replace: pipe FAILED\n");
+    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));
+    perror("dup2");
+    return -1;
+  }
+  return pipefds[0];
+}
+
+/* Sends stderr (read from rfd) messages to a file */
+void stderr_redirect(int rfd) {
+  int navail, bread;
+  char *buf;
+  /*owl_function_debugmsg("stderr_redirect: called with rfd=%d\n", rfd);*/
+  if (rfd<0) return;
+  if (-1 == ioctl(rfd, FIONREAD, (void*)&navail)) {
+    return;
+  }
+  /*owl_function_debugmsg("stderr_redirect: navail = %d\n", navail);*/
+  if (navail<=0) return;
+  if (navail>256) { navail = 256; }
+  buf = owl_malloc(navail+1);
+  bread = read(rfd, buf, navail);
+  if (buf[navail-1] != '\0') {
+    buf[navail] = '\0';
+  }
+  owl_function_error("Err: %s", buf);
+  owl_free(buf);
+}
+
+#endif /* OWL_STDERR_REDIR */

owl.h

@@ -17 +17 @@
 #endif
 
-
-
 static const char owl_h_fileIdent[] = "$Id$";
 
-#define OWL_VERSION         2.0.9-pre-2
-#define OWL_VERSION_STRING "2.0.9-pre-2"
+#define OWL_VERSION         2.0.9-pre-3
+#define OWL_VERSION_STRING "2.0.9-pre-3"
+
+/* Feature that is being tested to redirect stderr through a pipe. 
+ * There may still be some portability problems with this. */
+#define OWL_STDERR_REDIR 1
 
 #define OWL_DEBUG 0

zwrite.c

@@ -154 +154 @@
       openline=owl_malloc(strlen(zsigproc)+40);
       strcpy(openline, zsigproc);
+#if !(OWL_STDERR_REDIR)
       strcat(openline, " 2> /dev/null");
+#endif
       file=popen(openline, "r");
       owl_free(openline);