diff options
| author | Christopher Faylor <me@cgf.cx> | 2000-10-13 03:13:59 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2000-10-13 03:13:59 +0000 |
| commit | ee20f060a813cd2588dfcdc8665737f361723289 (patch) | |
| tree | 50bcfb8cb7eca1f7edf211c013d68355b5578a9e | |
| parent | 1ec4f618feb517c020ff25784bedc66dd4f6f0e2 (diff) | |
| download | cygnal-ee20f060a813cd2588dfcdc8665737f361723289.tar.gz cygnal-ee20f060a813cd2588dfcdc8665737f361723289.tar.bz2 cygnal-ee20f060a813cd2588dfcdc8665737f361723289.zip | |
* dtable.cc (dtable::fixup_after_fork): Revert thinko below.
* pinfo.cc (set_myself): Show pid in initial strace line.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/dtable.cc | 4 | ||||
| -rw-r--r-- | winsup/cygwin/pinfo.cc | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 40d7d7072..c4bd8f34c 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 12 23:11:05 2000 Christopher Faylor <cgf@cygnus.com> + + * dtable.cc (dtable::fixup_after_fork): Revert thinko below. + * pinfo.cc (set_myself): Show pid in initial strace line. + Thu Oct 12 17:58:03 2000 Christopher Faylor <cgf@cygnus.com> * child_info: Bump child_info "version". diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index ec05498f8..7d520b6da 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -472,9 +472,7 @@ dtable::fixup_after_fork (HANDLE parent) for (size_t i = 0; i < size; i++) if ((fh = fds[i]) != NULL) { - if (fds[i]->get_close_on_exec ()) - release (i); - else if (fh->get_need_fork_fixup ()) + if (fds[i]->get_close_on_exec () || fh->get_need_fork_fixup ()) { debug_printf ("fd %d(%s)", i, fh->get_name ()); fh->fixup_after_fork (parent); diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 1ce6ace2c..f14b45c60 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -54,7 +54,7 @@ set_myself (pid_t pid, HANDLE h) { extern char osname[]; strace.prntf (1, NULL, "**********************************************"); - strace.prntf (1, NULL, "Program name: %s", myself->progname); + strace.prntf (1, NULL, "Program name: %s (%d)", myself->progname, myself->pid); strace.prntf (1, NULL, "App version: %d.%d, api: %d.%d", user_data->dll_major, user_data->dll_minor, user_data->api_major, user_data->api_minor); |