From 70fe2f37d8ac1db199b2b32a6012b2a6c7a9b9c9 Mon Sep 17 00:00:00 2001 From: cgf Date: Fri, 13 Oct 2000 03:13:58 +0000 Subject: [PATCH] * dtable.cc (dtable::fixup_after_fork): Revert thinko below. * pinfo.cc (set_myself): Show pid in initial strace line. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/dtable.cc | 4 +--- winsup/cygwin/pinfo.cc | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 40d7d70729..c4bd8f34cd 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 12 23:11:05 2000 Christopher Faylor + + * 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 * child_info: Bump child_info "version". diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index ec05498f85..7d520b6dab 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 1ce6ace2c1..f14b45c605 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); -- 2.11.0