ruby-changes:10842
From: shyouhei <ko1@a...>
Date: Wed, 18 Feb 2009 22:24:07 +0900 (JST)
Subject: [ruby-changes:10842] Ruby:r22412 (ruby_1_8_6): merge revision(s) 20537:
shyouhei 2009-02-18 22:24:00 +0900 (Wed, 18 Feb 2009) New Revision: 22412 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22412 Log: merge revision(s) 20537: * win32/win32.c (waitpid): fix bug of checking child slot. * win32/win32.c (FindChildSlotByHandle): new. Modified files: branches/ruby_1_8_6/ChangeLog branches/ruby_1_8_6/version.h branches/ruby_1_8_6/win32/win32.c Index: ruby_1_8_6/ChangeLog =================================================================== --- ruby_1_8_6/ChangeLog (revision 22411) +++ ruby_1_8_6/ChangeLog (revision 22412) @@ -1,3 +1,9 @@ +Wed Feb 18 22:23:44 2009 NAKAMURA Usaku <usa@r...> + + * win32/win32.c (waitpid): fix bug of checking child slot. + + * win32/win32.c (FindChildSlotByHandle): new. + Wed Feb 18 22:12:24 2009 Yukihiro Matsumoto <matz@r...> * pack.c (pack_pack): propagate taint status from format string to Index: ruby_1_8_6/version.h =================================================================== --- ruby_1_8_6/version.h (revision 22411) +++ ruby_1_8_6/version.h (revision 22412) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-18" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20090218 -#define RUBY_PATCHLEVEL 339 +#define RUBY_PATCHLEVEL 340 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 Index: ruby_1_8_6/win32/win32.c =================================================================== --- ruby_1_8_6/win32/win32.c (revision 22411) +++ ruby_1_8_6/win32/win32.c (revision 22412) @@ -520,6 +520,18 @@ 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) { @@ -2784,7 +2796,7 @@ 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); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/