Changeset afbf668 for owl.c

Timestamp:

Mar 1, 2004, 12:42:56 PM (20 years ago)

Author:

Erik Nygren <nygren@mit.edu>

Branches:

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

Children:

948b942

Parents:

c61918e

Message:

	pexec will now incrimentally display data as it is output
	  by the child process.  Additionally, commands running under
	  pexec may now be killed by quitting out of the popless window.
	Added muxevents select loop dispatcher.  File descriptors may
	  be registered with muxevents and handlers will be dispatched
	  to when data is available for non-blocking read/write/except.
	Switched the stderr_redir stuff to use muxevents.

File:

• owl.c (modified) (7 diffs)

owl.c

@@ -57 +57 @@
 #endif
 int stderr_replace(void);
-void stderr_redirect(int rfd);
 #endif
 
@@ -196 +195 @@
   owl_function_debugmsg("startup: doing stderr redirection");
   newstderr = stderr_replace();
+  owl_muxevents_add(owl_global_get_muxevents(&g), newstderr, OWL_MUX_READ,
+                    stderr_redirect_handler, NULL);
 #endif   
 
@@ -579 +580 @@
       }
     }
+
+    /* dispatch any muxevents */
+    owl_muxevents_dispatch(owl_global_get_muxevents(&g), 0);
 
     /* follow the last message if we're supposed to */
@@ -665 +669 @@
     }
 
-#if OWL_STDERR_REDIR
-    stderr_redirect(newstderr);
-#endif   
-
     /* Log any error signals */
     {
@@ -675 +675 @@
       if ((signum = owl_global_get_errsignal_and_clear(&g, &si)) > 0) {
         owl_function_error("Got unexpected signal: %d %s  (code: %d band: %d  errno: %d)", 
-                           signum, signum==SIGPIPE?"SIGPIPE":"",
+                           signum, signum==SIGPIPE?"SIGPIPE":"SIG????",
                            si.si_code, si.si_band, si.si_errno);
       }
@@ -690 +690 @@
      */
     owl_function_resize();
-  } else if (sig==SIGPIPE) {
+  } else if (sig==SIGPIPE || sig==SIGCHLD) {
     /* Set a flag and some info that we got the sigpipe
      * so we can record that we got it and why... */
@@ -732 +732 @@
 }
 
-/* Sends stderr (read from rfd) messages to a file */
-void stderr_redirect(int rfd)
+/* Sends stderr (read from rfd) messages to the error console */
+void stderr_redirect_handler(int handle, int rfd, int eventmask, void *data) 
 {
   int navail, bread;