* dtable.cc (dtable::fixup_after_fork): Revert thinko below.

* pinfo.cc (set_myself): Show pid in initial strace line.
This commit is contained in:
Christopher Faylor 2000-10-13 03:13:59 +00:00
parent 1ec4f618fe
commit ee20f060a8
3 changed files with 7 additions and 4 deletions

View File

@ -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> Thu Oct 12 17:58:03 2000 Christopher Faylor <cgf@cygnus.com>
* child_info: Bump child_info "version". * child_info: Bump child_info "version".

View File

@ -472,9 +472,7 @@ dtable::fixup_after_fork (HANDLE parent)
for (size_t i = 0; i < size; i++) for (size_t i = 0; i < size; i++)
if ((fh = fds[i]) != NULL) if ((fh = fds[i]) != NULL)
{ {
if (fds[i]->get_close_on_exec ()) if (fds[i]->get_close_on_exec () || fh->get_need_fork_fixup ())
release (i);
else if (fh->get_need_fork_fixup ())
{ {
debug_printf ("fd %d(%s)", i, fh->get_name ()); debug_printf ("fd %d(%s)", i, fh->get_name ());
fh->fixup_after_fork (parent); fh->fixup_after_fork (parent);

View File

@ -54,7 +54,7 @@ set_myself (pid_t pid, HANDLE h)
{ {
extern char osname[]; extern char osname[];
strace.prntf (1, NULL, "**********************************************"); 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", strace.prntf (1, NULL, "App version: %d.%d, api: %d.%d",
user_data->dll_major, user_data->dll_minor, user_data->dll_major, user_data->dll_minor,
user_data->api_major, user_data->api_minor); user_data->api_major, user_data->api_minor);