xemacs-beta: src/process-unix.c comparison

comparison src/process-unix.c @ 386:4af0ddfb7c5b r21-2-8

Import from CVS: tag r21-2-8

author	cvs
date	Mon, 13 Aug 2007 11:08:50 +0200
parents	8626e4521993
children	74fd4e045ea6

comparison

equal deleted inserted replaced

-:bc48d89bf15c
+:4af0ddfb7c5b
 {
 UNIX_DATA(p)->infd = (int)in;
 }
 /*
-* Fork off a subprocess. P is a pointer to newly created subprocess
+* Fork off a subprocess. P is a pointer to a newly created subprocess
 * object. If this function signals, the caller is responsible for
 * deleting (and finalizing) the process object.
 *
 * The method must return PID of the new process, a (positive??? ####) number
 * which fits into Lisp_Int. No return value indicates an error, the method
 		     Lisp_Object *argv, int nargv,
 		     Lisp_Object program, Lisp_Object cur_dir)
 {
 /* This function rewritten by ben@xemacs.org. */
-int pid, inchannel, outchannel;
+int pid;
+int inchannel  = -1;
+int outchannel = -1;
 /* Use volatile to protect variables from being clobbered by longjmp.  */
-volatile int forkin, forkout;
+volatile int forkin   = -1;
+volatile int forkout  = -1;
 volatile int pty_flag = 0;
-char **env;
-char **new_argv;
-char *current_dir;
-int i;
-env = environ;
-inchannel = outchannel = forkin = forkout = -1;
-/* Nothing below here GCs so our string pointers shouldn't move. */
-new_argv = alloca_array (char *, nargv + 2);
-GET_C_STRING_FILENAME_DATA_ALLOCA (program, new_argv[0]);
-for (i = 0; i < nargv; i++)
-{
-Lisp_Object tem = argv[i];
-CHECK_STRING (tem);
-new_argv[i + 1] = (char *) XSTRING_DATA (tem);
-}
-new_argv[i + 1] = 0;
-GET_C_STRING_FILENAME_DATA_ALLOCA (cur_dir, current_dir);
 #ifdef HAVE_PTYS
 if (!NILP (Vprocess_connection_type))
 {
 /* find a new pty, open the master side, return the opened
 /* You're "supposed" to now open the slave in the child.
 	 On some systems, we can open it here; this allows for
 	 better error checking. */
 #if !defined(USG)
 /* On USG systems it does not work to open the pty's tty here
-	       and then close and reopen it in the child.  */
+	 and then close and reopen it in the child.  */
 #ifdef O_NOCTTY
 /* Don't let this terminal become our controlling terminal
 	 (in case we don't have one).  */
 forkout = forkin = open (pty_name, O_RDWR | O_NOCTTY | OPEN_BINARY, 0);
 #else
 	       a SIG_IGN handling from our parent (nohup) and we are in new
 	       process group.
 	    */
 	    signal (SIGHUP, SIG_DFL);
 	  }
+	if (pty_flag)
+	  /* Set up the terminal characteristics of the pty. */
+	  child_setup_tty (xforkout);
 #endif /* HAVE_PTYS */
-	signal (SIGINT, SIG_DFL);
+	signal (SIGINT,  SIG_DFL);
 	signal (SIGQUIT, SIG_DFL);
-	if (pty_flag)
+	{
-	  {
+	  char *current_dir;
-	    /* Set up the terminal characteristics of the pty. */
+	  char **new_argv = alloca_array (char *, nargv + 2);
-	    child_setup_tty (xforkout);
+	  int i;
-	  }
+	  /* Nothing below here GCs so our string pointers shouldn't move. */
-	child_setup (xforkin, xforkout, xforkout, new_argv, current_dir);
+	  new_argv[0] = (char *) XSTRING_DATA (program);
-}
+	  for (i = 0; i < nargv; i++)
+	    {
+	      CHECK_STRING (argv[i]);
+	      new_argv[i + 1] = (char *) XSTRING_DATA (argv[i]);
+	    }
+	  new_argv[i + 1] = 0;
+	  GET_C_STRING_FILENAME_DATA_ALLOCA (cur_dir, current_dir);
+	  child_setup (xforkin, xforkout, xforkout, new_argv, current_dir);
+	}
+} /**** End of child code ****/
+/**** Back in parent process ****/
 #if !defined(__CYGWIN32__)
 environ = save_environ;
 #endif
 }
 we're waiting for an event, when status_notify() is called). */
 return pid;
 io_failure:
 {
-int temp = errno;
+int save_errno = errno;
 close_descriptor_pair (forkin, forkout);
 close_descriptor_pair (inchannel, outchannel);
-errno = temp;
+errno = save_errno;
 report_file_error ("Opening pty or pipe", Qnil);
+return 0; /* not reached */
 }
-RETURN_NOT_REACHED (0);
 }
 /* Return nonzero if this process is a ToolTalk connection. */
 static int

Mercurial > hg > xemacs-beta

comparison src/process-unix.c @ 386:4af0ddfb7c5b r21-2-8