comparison src/callproc.c @ 2286:7f66b40a0192

* callproc.c (child_setup): Make sure that in, out, and err are not less than three. (relocate_fd): New function.

2285:f0a979beceab

#include <signal.h>
#include <errno.h>

#include "config.h"

/* Define SIGCHLD as an alias for SIGCLD.  */

#if !defined (SIGCHLD) && defined (SIGCLD)
#define SIGCHLD SIGCLD

	 tem = XCONS (tem)->cdr)
      *new_env++ = (char *) XSTRING (XCONS (tem)->car)->data;
    *new_env = 0;
  }

  close (0);
  close (1);
  close (2);

  dup2 (in, 0);

  execvp (new_argv[0], new_argv);

  write (1, "Couldn't exec the program ", 26);
  write (1, new_argv[0], strlen (new_argv[0]));
  _exit (1);
}

static int
getenv_internal (var, varlen, value, valuelen)
     char *var;

2286:7f66b40a0192

#include <signal.h>
#include <errno.h>

#include "config.h"

extern int errno;
#ifndef VMS
extern char *sys_errlist[];
#endif

/* Define SIGCHLD as an alias for SIGCLD.  */

#if !defined (SIGCHLD) && defined (SIGCLD)
#define SIGCHLD SIGCLD

	 tem = XCONS (tem)->cdr)
      *new_env++ = (char *) XSTRING (XCONS (tem)->car)->data;
    *new_env = 0;
  }

  /* 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, our, or error closed, as might
     happen under X.  */
  in = relocate_fd (in, 3);
  out = relocate_fd (out, 3);
  err = relocate_fd (err, 3);

  close (0);
  close (1);
  close (2);

  dup2 (in, 0);

  execvp (new_argv[0], new_argv);

  write (1, "Couldn't exec the program ", 26);
  write (1, new_argv[0], strlen (new_argv[0]));
  _exit (1);
}

/* 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.  */
int
relocate_fd (fd, min)
     int fd, min;
{
  if (fd >= min)
    return fd;
  else
    {
      int new = dup (fd);
      if (new == -1)
	{
	  char message1[] =
	    "Error while setting up child: ";
	  char message2[] = "\n";
	  write (2, message1, sizeof (message1) - 1);
	  write (2, sys_errlist[errno], strlen (sys_errlist[errno]));
	  write (2, message2, sizeof (message2) - 1);
	  _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 (var, varlen, value, valuelen)
     char *var;