From 89602ad3f05667aa44a5385644e1b6ad63276e7c Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 14:07:58 +0000 Subject: 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ process.c | 3 +++ version.h | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index dbd2eb70ca..1cf77f3465 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 23:07:46 2008 NAKAMURA Usaku + + * 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 + Sun Jun 15 23:02:12 2008 GOTOU Yuuzou * lib/webrick/httpservlet/filehandler.rb: should normalize path diff --git a/process.c b/process.c index ced3f53f6f..377fa5f3f2 100644 --- a/process.c +++ b/process.c @@ -1525,6 +1525,9 @@ rb_f_system(argc, argv) } #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; diff --git a/version.h b/version.h index 026d13688a..1ea16667b4 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 210 +#define RUBY_PATCHLEVEL 211 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3