From 897483c97955ee38181ee93a2d3317f61ee7d058 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 14:07:19 +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_5@17305 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 c5163ee866..9d5b637d16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 23:06:49 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 22:54:39 2008 GOTOU Yuuzou * lib/webrick/httpservlet/filehandler.rb: should normalize path diff --git a/process.c b/process.c index 0f45891b7a..706210d22e 100644 --- a/process.c +++ b/process.c @@ -1524,6 +1524,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 0beb57705c..0d5ef0211d 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3