comparison src/process.c @ 96774:3760da9fe15e

Merge from emacs--rel--22 Revision: [e-mail]/emacs--devo--0--patch-1339

96773:8b4d07d37cc5

     Lisp_Object current_dir;
{
  int inchannel, outchannel;
  pid_t pid;
  int sv[2];
#ifdef POSIX_SIGNALS
  sigset_t procmask;
  sigset_t blocked;
  struct sigaction sigint_action;
  struct sigaction sigquit_action;

	  report_file_error ("Creating pipe", Qnil);
	}
      outchannel = sv[1];
      forkin = sv[0];
    }

#if 0
  /* Replaced by close_process_descs */
  set_exclusive_use (inchannel);
  set_exclusive_use (outchannel);

#endif /* not DONT_REOPEN_PTY */
#ifdef WINDOWSNT
	pid = child_setup (xforkin, xforkout, xforkout,
			   new_argv, 1, current_dir);
#else  /* not WINDOWSNT */
	child_setup (xforkin, xforkout, xforkout,
		     new_argv, 1, current_dir);
#endif /* not WINDOWSNT */
      }
    environ = save_environ;

      if (pty_flag)
	XPROCESS (process)->tty_name = build_string (pty_name);
      else
#endif
	XPROCESS (process)->tty_name = Qnil;
    }

  /* Restore the signal state whether vfork succeeded or not.
     (We will signal an error, below, if it failed.)  */
#ifdef POSIX_SIGNALS

#ifdef NON_BLOCKING_CONNECT
	  SELECT_TYPE Ctemp;
#endif

	  Atemp = input_wait_mask;
#if 0
          /* On Mac OS X 10.0, the SELECT system call always says input is
             present (for reading) at stdin, even when none is.  This
             causes the call to SELECT below to return 1 and
             status_notify not to be called.  As a result output of
             subprocesses are incorrectly discarded.
	  */
          FD_CLR (0, &Atemp);
#endif
	  IF_NON_BLOCKING_CONNECT (Ctemp = connect_wait_mask);

	  EMACS_SET_SECS_USECS (timeout, 0, 0);
	  if ((select (max (max (max_process_desc, max_keyboard_desc),
			      max_gpm_desc) + 1,

96774:3760da9fe15e

     Lisp_Object current_dir;
{
  int inchannel, outchannel;
  pid_t pid;
  int sv[2];
#if !defined (WINDOWSNT) && defined (FD_CLOEXEC)
  int wait_child_setup[2];
#endif
#ifdef POSIX_SIGNALS
  sigset_t procmask;
  sigset_t blocked;
  struct sigaction sigint_action;
  struct sigaction sigquit_action;

	  report_file_error ("Creating pipe", Qnil);
	}
      outchannel = sv[1];
      forkin = sv[0];
    }

#if !defined (WINDOWSNT) && defined (FD_CLOEXEC)
    {
      int tem;

      tem = pipe (wait_child_setup);
      if (tem < 0)
	report_file_error ("Creating pipe", Qnil);
      tem = fcntl (wait_child_setup[1], F_GETFD, 0);
      if (tem >= 0)
	tem = fcntl (wait_child_setup[1], F_SETFD, tem | FD_CLOEXEC);
      if (tem < 0)
	{
	  emacs_close (wait_child_setup[0]);
	  emacs_close (wait_child_setup[1]);
	  report_file_error ("Setting file descriptor flags", Qnil);
	}
    }
#endif

#if 0
  /* Replaced by close_process_descs */
  set_exclusive_use (inchannel);
  set_exclusive_use (outchannel);

#endif /* not DONT_REOPEN_PTY */
#ifdef WINDOWSNT
	pid = child_setup (xforkin, xforkout, xforkout,
			   new_argv, 1, current_dir);
#else  /* not WINDOWSNT */
#ifdef FD_CLOEXEC
	emacs_close (wait_child_setup[0]);
#endif
	child_setup (xforkin, xforkout, xforkout,
		     new_argv, 1, current_dir);
#endif /* not WINDOWSNT */
      }
    environ = save_environ;

      if (pty_flag)
	XPROCESS (process)->tty_name = build_string (pty_name);
      else
#endif
	XPROCESS (process)->tty_name = Qnil;

#if !defined (WINDOWSNT) && defined (FD_CLOEXEC)
      /* Wait for child_setup to complete in case that vfork is
	 actually defined as fork.  The descriptor wait_child_setup[1]
	 of a pipe is closed at the child side either by close-on-exec
	 on successful execvp or the _exit call in child_setup.  */
      {
	char dummy;

	emacs_close (wait_child_setup[1]);
	emacs_read (wait_child_setup[0], &dummy, 1);
	emacs_close (wait_child_setup[0]);
      }
#endif
    }

  /* Restore the signal state whether vfork succeeded or not.
     (We will signal an error, below, if it failed.)  */
#ifdef POSIX_SIGNALS

#ifdef NON_BLOCKING_CONNECT
	  SELECT_TYPE Ctemp;
#endif

	  Atemp = input_wait_mask;
	  IF_NON_BLOCKING_CONNECT (Ctemp = connect_wait_mask);

	  EMACS_SET_SECS_USECS (timeout, 0, 0);
	  if ((select (max (max (max_process_desc, max_keyboard_desc),
			      max_gpm_desc) + 1,