[前][次][番号順一覧][スレッド一覧]

ruby-changes:10844

From: shyouhei <ko1@a...>
Date: Wed, 18 Feb 2009 22:24:35 +0900 (JST)
Subject: [ruby-changes:10844] Ruby:r22414 (ruby_1_8_7): merge revision(s) 20537:

shyouhei	2009-02-18 22:24:27 +0900 (Wed, 18 Feb 2009)

  New Revision: 22414

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22414

  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_7/ChangeLog
    branches/ruby_1_8_7/version.h
    branches/ruby_1_8_7/win32/win32.c

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 22413)
+++ ruby_1_8_7/ChangeLog	(revision 22414)
@@ -1,3 +1,9 @@
+Wed Feb 18 22:24:23 2009  NAKAMURA Usaku  <usa@r...>
+
+	* win32/win32.c (waitpid): fix bug of checking child slot.
+
+	* win32/win32.c (FindChildSlotByHandle): new.
+
 Wed Feb 18 22:17:04 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* pack.c (pack_pack): propagate taint status from format string to
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 22413)
+++ ruby_1_8_7/version.h	(revision 22414)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-02-18"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20090218
-#define RUBY_PATCHLEVEL 125
+#define RUBY_PATCHLEVEL 126
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/win32/win32.c
===================================================================
--- ruby_1_8_7/win32/win32.c	(revision 22413)
+++ ruby_1_8_7/win32/win32.c	(revision 22414)
@@ -514,6 +514,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)
 {
@@ -2964,7 +2976,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/

[前][次][番号順一覧][スレッド一覧]