shyouhei	2008-06-15 23:07:19 +0900 (Sun, 15 Jun 2008)

  New Revision: 17305

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/process.c
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16471:
    * process.c (rb_f_system): set last_status when status == -1 because
      there is no path to set it on win32. this patch is derived from
      [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com>


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/process.c?r1=17305&r2=17304&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17305&r2=17304&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17305&r2=17304&diff_format=u

Index: ruby_1_8_5/process.c
===================================================================
--- ruby_1_8_5/process.c	(revision 17304)
+++ ruby_1_8_5/process.c	(revision 17305)
@@ -1524,6 +1524,9 @@
     }
 #if !defined(_WIN32)
     last_status_set(status == -1 ? 127 : status, 0);
+#else
+    if (status == -1)
+	last_status_set(0x7f << 8, 0);
 #endif
 #elif defined(__VMS)
     VALUE cmd;
Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17304)
+++ ruby_1_8_5/ChangeLog	(revision 17305)
@@ -1,3 +1,9 @@
+Sun Jun 15 23:06:49 2008  NAKAMURA Usaku  <usa@r...>
+
+	* process.c (rb_f_system): set last_status when status == -1 because
+	  there is no path to set it on win32. this patch is derived from
+	  [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com>
+
 Sun Jun 15 22:54:39 2008  GOTOU Yuuzou  <gotoyuzo@n...>
 
 	* lib/webrick/httpservlet/filehandler.rb: should normalize path
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17304)
+++ ruby_1_8_5/version.h	(revision 17305)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 209
+#define RUBY_PATCHLEVEL 210
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/