diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 14:31:37 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 14:31:37 +0000 |
commit | 8068f497271643dea2842bcddb37bb41c5dd72fd (patch) | |
tree | 40222c5815b941be477d2e777274bd71466c5603 /win32/win32.c | |
parent | bca9bf7feff03118ebb9ab58ff57f8f8216d64c4 (diff) | |
download | ruby-8068f497271643dea2842bcddb37bb41c5dd72fd.tar.gz |
* win32/win32.c (waitpid): fix bug of checking child slot.
* win32/win32.c (FindChildSlotByHandle): new.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.c')
-rw-r--r-- | win32/win32.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c index f2129afac8..5829e86d68 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -533,6 +533,18 @@ FindChildSlot(rb_pid_t pid) return NULL; } +static struct ChildRecord * +FindChildSlotByHandle(HANDLE h) +{ + + FOREACH_CHILD(child) { + if (child->hProcess == h) { + return child; + } + } END_FOREACH_CHILD; + return NULL; +} + static void CloseChildHandle(struct ChildRecord *child) { @@ -3062,7 +3074,7 @@ waitpid(rb_pid_t pid, int *stat_loc, int options) return -1; } - return poll_child_status(ChildRecord + ret, stat_loc); + return poll_child_status(FindChildSlotByHandle(events[ret]), stat_loc); } else { struct ChildRecord* child = FindChildSlot(pid); |