* spawn.cc (spawn_guts): Set a flag when a process is not a cygwin process.
* fhandler_tty.cc (fhandler_tty_slave::init): Remove previous change. Try a
different method to determine when we should become the process group owner.
* signal.cc (kill0): Remove archaic code which dealt with never-set flag.
2010-09-20 Christopher Faylor <me+cygwin@cgf.cx>
+ * include/sys/cygwin.h (PID_NOTCYGWIN): New enum.
+ * spawn.cc (spawn_guts): Set a flag when a process is not a cygwin
+ process.
+ * fhandler_tty.cc (fhandler_tty_slave::init): Remove previous change.
+ Try a different method to determine when we should become the process
+ group owner.
+ * signal.cc (kill0): Remove archaic code which dealt with never-set
+ flag.
+
+2010-09-20 Christopher Faylor <me+cygwin@cgf.cx>
+
* fhandler_tty.cc (fhandler_tty_slave::init): Add additional checks to
determine when a process should grab control of a tty's pgid. Use
being_debugged() for consistency.
int ret = open (flags);
- /* We should only grab this when the parent process owns the pgid
- (which could happen when a cygwin process starts a DOS process which
- starts a cygwin process or when we are being started directly from a
- windows process, e.g., from the CMD prompt. */
- if (ret && !cygwin_finished_initializing && !being_debugged ()
- && (myself->ppid == 1 || myself->ppid == tc->getpgid ()))
+ if (ret && !cygwin_finished_initializing && !being_debugged ())
{
/* This only occurs when called from dtable::init_std_file_from_handle
We have been started from a non-Cygwin process. So we should become
tty process group leader.
TODO: Investigate how SIGTTIN should be handled with pure-windows
programs. */
- tc->setpgid (myself->pgid);
+ pinfo p (tc->getpgid ());
+ /* We should only grab this when the process group owner for this
+ tty is a non-cygwin process or we've been started directly
+ from a non-Cygwin process with no Cygwin ancestry. */
+ if (!p || ISSTATE (p, PID_NOTCYGWIN))
+ tc->setpgid (myself->pgid);
}
if (f != INVALID_HANDLE_VALUE)
PID_STOPPED = 0x00004, /* Waiting for SIGCONT. */
PID_TTYIN = 0x00008, /* Waiting for terminal input. */
PID_TTYOU = 0x00010, /* Waiting for terminal output. */
+ PID_NOTCYGWIN = 0x00080, /* Set if process is not a cygwin app. */
PID_ORPHANED = 0x00020, /* Member of an orphaned process group. */
PID_ACTIVE = 0x00040, /* Pid accepts signals. */
PID_CYGPARENT = 0x00080, /* Set if parent was a cygwin app. */
return -1;
}
- /* Silently ignore stop signals from a member of orphaned process group.
- FIXME: Why??? */
- if (ISSTATE (myself, PID_ORPHANED) &&
- (si.si_signo == SIGTSTP || si.si_signo == SIGTTIN || si.si_signo == SIGTTOU))
- si.si_signo = 0;
-
return (pid > 0) ? pinfo (pid)->kill (si) : kill_pgrp (-pid, si);
}
PWCHAR cwd;
cwd = NULL;
- if (!real_path.iscygexec())
+ if (!real_path.iscygexec ())
{
+ myself->process_state |= PID_NOTCYGWIN;
cygheap->cwd.cwd_lock.acquire ();
cwd = cygheap->cwd.win32.Buffer;
}
{
myself->set_has_pgid_children ();
ProtectHandle (pi.hThread);
- pinfo child (cygpid, PID_IN_USE);
+ pinfo child (cygpid,
+ PID_IN_USE | (real_path.iscygexec () ? 0 : PID_NOTCYGWIN));
if (!child)
{
syscall_printf ("pinfo failed");