Changeset 8f44c6b for owl.c

Timestamp:

Feb 9, 2003, 10:08:38 PM (22 years ago)

Author:

James M. Kretchmar <kretch@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:

7e3e00a

Parents:

ddb8252

Message:

Changed version to 2.0.1-pre-1
Moved the (broken) newmsgproc stuff it a function procedure

File:

• owl.c (modified) (2 diffs)

owl.c

@@ -22 +22 @@
 #include <sys/param.h>
 #include <sys/types.h>
-#include <sys/wait.h>
-#include <errno.h>
 #include "owl.h"
 
@@ -331 +329 @@
        make it active */
     if (newzephyrs) {
-      if (owl_global_get_newmsgproc(&g) && strcmp(owl_global_get_newmsgproc(&g), "")) {
-        /* if there's a process out there, we need to check on it */
-        if (owl_global_get_newmsgproc_pid(&g)) {
-          owl_function_debugmsg("Checking on newmsgproc pid==%i", owl_global_get_newmsgproc_pid(&g));
-          owl_function_debugmsg("Waitpid return is %i", waitpid(owl_global_get_newmsgproc_pid(&g), NULL, WNOHANG));
-          waitpid(owl_global_get_newmsgproc_pid(&g), NULL, WNOHANG);
-          if (waitpid(owl_global_get_newmsgproc_pid(&g), NULL, WNOHANG)==-1) {
-            /* it exited */
-            owl_global_set_newmsgproc_pid(&g, 0);
-            owl_function_debugmsg("newmsgproc exited");
-          } else {
-            owl_function_debugmsg("newmsgproc did not exit");
-          }
-        }
-        
-        /* if it exited, fork & exec a new one */
-        if (owl_global_get_newmsgproc_pid(&g)==0) {
-          int i, myargc;
-          i=fork();
-          if (i) {
-            /* parent set the child's pid */
-            owl_global_set_newmsgproc_pid(&g, i);
-            waitpid(i, NULL, WNOHANG);
-            owl_function_debugmsg("I'm the parent and I started a new newmsgproc with pid %i", i);
-          } else {
-            /* child exec's the program */
-            char **parsed;
-            parsed=owl_parseline(owl_global_get_newmsgproc(&g), &myargc);
-            parsed=realloc(parsed, strlen(owl_global_get_newmsgproc(&g)+300));
-            parsed[myargc]=(char *) NULL;
-
-            owl_function_debugmsg("About to exec: %s with %i arguments", parsed[0], myargc);
-
-            execvp(parsed[0], (char **) parsed);
-            
-
-            /* was there an error exec'ing? */
-            owl_function_debugmsg("Error execing: %s", strerror(errno));
-            _exit(127);
-          }
-        }
-      }
+      owl_function_do_newmsgproc();
     }