comparison src/callproc.c @ 109358:a9586dc942d5

Merge from mainline.

109240:6f0915b37828

{
  if (fd >= minfd)
    return fd;
  else
    {
      int new = dup (fd);
      if (new == -1)
	{
	  char *message1 = "Error while setting up child: ";
	  char *errmessage = strerror (errno);
	  char *message2 = "\n";
	  emacs_write (2, message1, strlen (message1));
	  emacs_write (2, errmessage, strlen (errmessage));
	  emacs_write (2, message2, strlen (message2));
	  _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, minfd);
      emacs_close (fd);
      return new;
    }
}

static int
getenv_internal_1 (char *var, int varlen, char **value, int *valuelen, Lisp_Object env)
{
  for (; CONSP (env); env = XCDR (env))
    {
      Lisp_Object entry = XCAR (env);
      if (STRINGP (entry)

    }
  return 0;
}

static int
getenv_internal (char *var, int varlen, char **value, int *valuelen, Lisp_Object frame)
{
  /* Try to find VAR in Vprocess_environment first.  */
  if (getenv_internal_1 (var, varlen, value, valuelen,
			 Vprocess_environment))
    return *value ? 1 : 0;

}

/* A version of getenv that consults the Lisp environment lists,
   easily callable from C.  */
char *
egetenv (char *var)
{
  char *value;
  int valuelen;

  if (getenv_internal (var, strlen (var), &value, &valuelen, Qnil))

109358:a9586dc942d5

{
  if (fd >= minfd)
    return fd;
  else
    {
      int new;
#ifdef F_DUPFD
      new = fcntl (fd, F_DUPFD, minfd);
#else
      new = dup (fd);
      if (new != -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, minfd);
#endif
      if (new == -1)
	{
	  const char *message1 = "Error while setting up child: ";
	  const char *errmessage = strerror (errno);
	  const char *message2 = "\n";
	  emacs_write (2, message1, strlen (message1));
	  emacs_write (2, errmessage, strlen (errmessage));
	  emacs_write (2, message2, strlen (message2));
	  _exit (1);
	}
      emacs_close (fd);
      return new;
    }
}

static int
getenv_internal_1 (const char *var, int varlen, char **value, int *valuelen,
		   Lisp_Object env)
{
  for (; CONSP (env); env = XCDR (env))
    {
      Lisp_Object entry = XCAR (env);
      if (STRINGP (entry)

    }
  return 0;
}

static int
getenv_internal (const char *var, int varlen, char **value, int *valuelen,
		 Lisp_Object frame)
{
  /* Try to find VAR in Vprocess_environment first.  */
  if (getenv_internal_1 (var, varlen, value, valuelen,
			 Vprocess_environment))
    return *value ? 1 : 0;

}

/* A version of getenv that consults the Lisp environment lists,
   easily callable from C.  */
char *
egetenv (const char *var)
{
  char *value;
  int valuelen;

  if (getenv_internal (var, strlen (var), &value, &valuelen, Qnil))