Changeset 6376af1

Timestamp:

Jun 3, 2011, 11:07:50 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

fc625fb

Parents:

cc305b5

git-author:

David Benjamin <davidben@mit.edu> (06/03/11 22:58:53)

git-committer:

David Benjamin <davidben@mit.edu> (06/03/11 23:07:50)

Message:

Use glib spawn functions when launching a newmsgproc

The glib version is smaller and has the advantage of not leaking all our
file descriptors to the process. More importantly, it does not call
malloc between fork and exec which is not safe in the presence of
threads.

File:

• functions.c (modified) (1 diff)

functions.c

@@ -3183 +3183 @@
     }
     
-    /* if it exited, fork & exec a new one */
+    /* if it exited, spawn a new one */
     if (owl_global_get_newmsgproc_pid(&g)==0) {
-      pid_t i;
       int myargc;
-      i=fork();
-      if (i) {
-        /* parent set the child's pid */
-        owl_global_set_newmsgproc_pid(&g, i);
-        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);
-        if (myargc < 0) {
-          owl_function_debugmsg("Could not parse newmsgproc '%s': unbalanced quotes?", owl_global_get_newmsgproc(&g));
-        }
-        if (myargc <= 0) {
-          _exit(127);
-        }
-        owl_function_debugmsg("About to exec \"%s\" with %d arguments", parsed[0], myargc);
-        
-        execvp(parsed[0], parsed);
-        
-        
-        /* was there an error exec'ing? */
-        owl_function_debugmsg("Cannot run newmsgproc '%s': cannot exec '%s': %s", 
-                              owl_global_get_newmsgproc(&g), parsed[0], strerror(errno));
-        _exit(127);
+      char **argv = owl_parseline(owl_global_get_newmsgproc(&g), &myargc);
+      if (myargc < 0) {
+        owl_function_debugmsg("Could not parse newmsgproc '%s': unbalanced quotes?",
+                              owl_global_get_newmsgproc(&g));
+      } else if (myargc > 0) {
+        /* Spawn the child. */
+        pid_t pid;
+        GError *error = NULL;
+        owl_function_debugmsg("About to exec \"%s\" with %d arguments", argv[0], myargc);
+        if (g_spawn_async(NULL, argv, NULL,
+                          G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+                          NULL, NULL, &pid, &error)) {
+          owl_global_set_newmsgproc_pid(&g, pid);
+          owl_function_debugmsg("I'm the parent and I started a new newmsgproc with pid %i", pid);
+        } else {
+          owl_function_debugmsg("Cannot run newmsgproc '%s': %s",
+                                owl_global_get_newmsgproc(&g), error->message);
+          g_error_free(error);
+        }
       }
+      g_strfreev(argv);
     }
   }