summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/pty/pty.c8
-rw-r--r--test/test_pty.rb8
-rw-r--r--version.h4
4 files changed, 22 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ea05d906b23..ef336563fba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep 3 06:14:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/pty/pty.c (chfunc): restore errno from SystemCallError and
+ propagate proper exception to the parent. [ruby-dev:41965]
+
Thu Sep 2 22:10:38 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_file_p): Pathname#file?
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 51bf3a33a5c..156e4563c39 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -162,6 +162,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
int slave = carg->slave;
int argc = carg->argc;
VALUE *argv = carg->argv;
+ VALUE exc;
struct exec_info arg;
int status;
@@ -221,7 +222,12 @@ chfunc(void *data, char *errbuf, size_t errbuf_len)
arg.argv = argv;
rb_protect(pty_exec, (VALUE)&arg, &status);
sleep(1);
- return -1;
+ errno = ENOENT; /* last resort */
+ exc = rb_errinfo();
+ if (!NIL_P(exc)) {
+ errno = NUM2INT(rb_attr_get(exc, rb_intern("errno")));
+ }
+ ERROR_EXIT(StringValueCStr(argv[0]));
#undef ERROR_EXIT
}
diff --git a/test/test_pty.rb b/test/test_pty.rb
index 1f0f8d6b311..dff025686d3 100644
--- a/test/test_pty.rb
+++ b/test/test_pty.rb
@@ -1,6 +1,7 @@
require 'test/unit'
require_relative 'ruby/envutil'
require 'shellwords'
+require 'tmpdir'
begin
require 'pty'
@@ -123,5 +124,12 @@ class TestPTY < Test::Unit::TestCase
) { master.readpartial(10) }
}
end
+
+ def test_getpty_nonexistent
+ bug3672 = '[ruby-dev:41965]'
+ Dir.mktmpdir do |tmpdir|
+ assert_raise(Errno::ENOENT, bug3672) {PTY.getpty(File.join(tmpdir, "no-such-command"))}
+ end
+ end
end if defined? PTY
diff --git a/version.h b/version.h
index 8dc900a8d6b..baf305fc2e8 100644
--- a/version.h
+++ b/version.h
@@ -1,11 +1,11 @@
#define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2010-09-02"
+#define RUBY_RELEASE_DATE "2010-09-03"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
#define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 3
#include "ruby/version.h"