xemacs-beta: src/callproc.c comparison

comparison src/callproc.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	a300bb07d72d
children	bbff43aa5eb7

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
 #include "buffer.h"
 #include "commands.h"
 #include "insdel.h"
 #include "lstream.h"
-#include <paths.h>
 #include "process.h"
 #include "sysdep.h"
 #include "window.h"
 #ifdef FILE_CODING
 #include "file-coding.h"
 #endif
 }
 {
 /* child_setup must clobber environ in systems with true vfork.
-	Protect it from permanent change.  */
+Protect it from permanent change.  */
 REGISTER char **save_environ = environ;
 REGISTER int fd1 = fd[1];
 int fd_error = fd1;
 char **env;
-#ifdef EMACS_BTL
-/* when performance monitoring is on, turn it off before the vfork(),
-as the child has no handler for the signal -- when back in the
-parent process, turn it back on if it was really on when you "turned
-it off" */
-int logging_on = cadillac_stop_logging ();
-#endif /* EMACS_BTL */
 env = environ;
 /* Record that we're about to create a synchronous process.  */
 synch_process_alive = 1;
 	   file. */
 	disconnect_controlling_terminal ();
 	child_setup (filefd, fd1, fd_error, new_argv,
 		     (char *) XSTRING_DATA (current_dir));
 }
-#ifdef EMACS_BTL
-else if (logging_on)
-cadillac_start_logging ();
-#endif
 if (fd_error >= 0)
 close (fd_error);
 #endif /* not WINDOWSNT */
 }
 }
+/* Move the file descriptor FD so that its number is not less than MIN. *
+The original file descriptor remains open.  */
+static int
+relocate_fd (int fd, int min)
+{
+if (fd >= min)
+return fd;
+else
+{
+int newfd = dup (fd);
+if (newfd == -1)
+	{
+	  stderr_out ("Error while setting up child: %s\n",
+		      strerror (errno));
+	  _exit (1);
+	}
+return relocate_fd (newfd, min);
+}
+}
 /* This is the last thing run in a newly forked inferior
 either synchronous or asynchronous.
-Copy descriptors IN, OUT and ERR as descriptors 0, 1 and 2.
+Copy descriptors IN, OUT and ERR
+as descriptors STDIN_FILENO, STDOUT_FILENO, and STDERR_FILENO.
 Initialize inferior's priority, pgrp, connected dir and environment.
 then exec another program based on new_argv.
 This function may change environ for the superior process.
 Therefore, the superior process must save and restore the value
 CURRENT_DIR is an elisp string giving the path of the current
 directory the subprocess should have.  Since we can't really signal
 a decent error from within the child, this should be verified as an
 executable directory by the parent.  */
-static int relocate_fd (int fd, int min);
 #ifdef WINDOWSNT
 int
 #else
 void
 #else  /* not WINDOWSNT */
 /* Make sure that in, out, and err are not actually already in
 descriptors zero, one, or two; this could happen if Emacs is
 started with its standard in, out, or error closed, as might
 happen under X.  */
-{
+in  = relocate_fd (in,  3);
-int oin = in, oout = out;
+out = relocate_fd (out, 3);
+err = relocate_fd (err, 3);
-/* We have to avoid relocating the same descriptor twice!  */
+/* Set the standard input/output channels of the new process.  */
-in = relocate_fd (in, 3);
+close (STDIN_FILENO);
+close (STDOUT_FILENO);
-if (out == oin) out = in;
+close (STDERR_FILENO);
-else            out = relocate_fd (out, 3);
+dup2 (in,  STDIN_FILENO);
-if      (err == oin)  err = in;
+dup2 (out, STDOUT_FILENO);
-else if (err == oout) err = out;
+dup2 (err, STDERR_FILENO);
-else                  err = relocate_fd (err, 3);
-}
-close (0);
-close (1);
-close (2);
-dup2 (in,  0);
-dup2 (out, 1);
-dup2 (err, 2);
 close (in);
 close (out);
 close (err);
 /* I can't think of any reason why child processes need any more
 close just the ones that need to be, but the following brute
 force approach is certainly effective, and not too slow. */
 {
 int fd;
 for (fd=3; fd<=64; fd++)
-{
+close (fd);
-close(fd);
-}
 }
 #endif /* not WINDOWSNT */
 #ifdef vipc
 something missing here;
 execvp (new_argv[0], new_argv);
 stdout_out ("Can't exec program %s\n", new_argv[0]);
 _exit (1);
 #endif /* not WINDOWSNT */
-}
-/* Move the file descriptor FD so that its number is not less than MIN.
-If the file descriptor is moved at all, the original is freed.  */
-static int
-relocate_fd (int fd, int min)
-{
-if (fd >= min)
-return fd;
-else
-{
-int new = dup (fd);
-if (new == -1)
-	{
-	  stderr_out ("Error while setting up child: %s\n",
-		      strerror (errno));
-	  _exit (1);
-	}
-/* Note that we hold the original FD open while we recurse,
-	 to guarantee we'll get a new FD if we need it.  */
-new = relocate_fd (new, min);
-close (fd);
-return new;
-}
 }
 static int
 getenv_internal (CONST Bufbyte *var,
 		 Bytecount varlen,

Mercurial > hg > xemacs-beta

comparison src/callproc.c @ 380:8626e4521993 r21-2-5