diff options
| author | Christopher Faylor <me@cgf.cx> | 2005-11-17 19:36:00 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2005-11-17 19:36:00 +0300 |
| commit | 7912bcbf361e5a82f910ba6114a04f2806406e4b (patch) | |
| tree | 900f08fb426b440d3b51181c354284b488c3d273 /winsup | |
| parent | 0f46c31745740b8538ce30944182f425ef4f0142 (diff) | |
* fork.cc (fork): Move top-of-stack calculation later.
* pinfo.cc (_pinfo::set_ctty): Use __ctty to print current console in debugging
output.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 7 | ||||
| -rw-r--r-- | winsup/cygwin/fork.cc | 7 | ||||
| -rw-r--r-- | winsup/cygwin/pinfo.cc | 10 |
3 files changed, 16 insertions, 8 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index bf0643353..52a636165 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,10 @@ +2005-11-17 Christopher Faylor <cgf@timesys.com> + + * fork.cc (fork): Move top-of-stack calculation later. + + * pinfo.cc (_pinfo::set_ctty): Use __ctty to print current console in + debugging output. + 2005-11-17 Corinna Vinschen <corinna@vinschen.de> * fhandler_tty.cc (fhandler_tty_slave::open): Don't expect that diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index a9117e7c8..374eb0fdb 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -557,11 +557,8 @@ fork () grouped.load_dlls = 0; int res; - void *esp; int ischild; - __asm__ volatile ("movl %%esp,%0": "=r" (esp)); - myself->set_has_pgid_children (); if (grouped.ch.parent == NULL) @@ -574,6 +571,10 @@ fork () sig_send (NULL, __SIGHOLD); ischild = setjmp (grouped.ch.jmp); + + void *esp; + __asm__ volatile ("movl %%esp,%0": "=r" (esp)); + if (!ischild) res = grouped.parent (esp); else diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 661091954..9b3b39cb7 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -330,18 +330,18 @@ _pinfo::_ctty (char *buf) void _pinfo::set_ctty (tty_min *tc, int flags, fhandler_tty_slave *arch) { - debug_printf ("checking if /dev/tty%d changed", ctty); + debug_printf ("old %s", __ctty ()); if ((ctty < 0 || ctty == tc->ntty) && !(flags & O_NOCTTY)) { ctty = tc->ntty; - syscall_printf ("attached tty%d sid %d, pid %d, tty->pgid %d, tty->sid %d", - tc->ntty, sid, pid, pgid, tc->getsid ()); + syscall_printf ("attached %s sid %d, pid %d, tty->pgid %d, tty->sid %d", + __ctty (), sid, pid, pgid, tc->getsid ()); pinfo p (tc->getsid ()); if (sid == pid && (!p || p->pid == pid || !p->exists ())) { - paranoid_printf ("resetting tty%d sid. Was %d, now %d. pgid was %d, now %d.", - tc->ntty, tc->getsid (), sid, tc->getpgid (), pgid); + paranoid_printf ("resetting %s sid. Was %d, now %d. pgid was %d, now %d.", + __ctty (), tc->getsid (), sid, tc->getpgid (), pgid); /* We are the session leader */ tc->setsid (sid); tc->setpgid (pgid); |