summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 14:07:19 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 14:07:19 +0000
commit897483c97955ee38181ee93a2d3317f61ee7d058 (patch)
tree167e5f70c836a2847f5a70df914209aa2bee65f9
parent1200b21eae06fd52c44fc4bc8180c769fd91589f (diff)
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> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--process.c3
-rw-r--r--version.h2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c5163ee..9d5b637 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 23:06:49 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * 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@notwork.org>
* lib/webrick/httpservlet/filehandler.rb: should normalize path
diff --git a/process.c b/process.c
index 0f45891..706210d 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 0beb577..0d5ef02 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