Avoid vfork-related deadlock more cleanly.

* callproc.c (child_setup): When the child's exec fails, output
the program name, as that's more useful.  Use O_NONBLOCK to avoid
deadlock.
* process.c (create_process_1): Remove; no longer needed.
(create_process): Remove timer hack; no longer needed, now that
the child avoids deadlock.

1 files changed, 6 insertions, 33 deletions

diff --git a/src/process.c b/src/process.c
index 12035da7b58..34783fae5fd 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1599,12 +1599,6 @@ start_process_unwind (Lisp_Object proc)
     remove_process (proc);
 }
 
-static void
-create_process_1 (struct atimer *timer)
-{
-  /* Nothing to do.  */
-}
-
 
 static void
 create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
@@ -1841,14 +1835,13 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
   unblock_child_signal ();
   unblock_input ();
 
+  if (forkin >= 0)
+    emacs_close (forkin);
+  if (forkin != forkout && forkout >= 0)
+    emacs_close (forkout);
+
   if (pid < 0)
-    {
-      if (forkin >= 0)
-        emacs_close (forkin);
-      if (forkin != forkout && forkout >= 0)
-        emacs_close (forkout);
-      report_file_errno ("Doing vfork", Qnil, vfork_errno);
-    }
+    report_file_errno ("Doing vfork", Qnil, vfork_errno);
   else
     {
       /* vfork succeeded.  */
@@ -1857,26 +1850,6 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
       register_child (pid, inchannel);
 #endif /* WINDOWSNT */
 
-      /* If the subfork execv fails, and it exits,
-         this close hangs.  I don't know why.
-         So have an interrupt jar it loose.  */
-      {
-        struct atimer *timer;
-        EMACS_TIME offset = make_emacs_time (1, 0);
-
-        stop_polling ();
-        timer = start_atimer (ATIMER_RELATIVE, offset, create_process_1, 0);
-
-        if (forkin >= 0)
-          emacs_close (forkin);
-
-        cancel_atimer (timer);
-        start_polling ();
-      }
-
-      if (forkin != forkout && forkout >= 0)
-        emacs_close (forkout);
-
       pset_tty_name (XPROCESS (process), lisp_pty_name);
 
 #ifndef WINDOWSNT