summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-18 01:17:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-02-18 01:17:44 +0000
commitbd0cef8be7ba6f73251ff7ff741ecbccd3465ea6 (patch)
treec09642161c9c6cacb81958f693727a1c59c7d1f4
parenta5ba4f80663844e0505d37c88d34e0de2e3ab375 (diff)
downloadruby-bd0cef8be7ba6f73251ff7ff741ecbccd3465ea6.tar.gz
ruby-bd0cef8be7ba6f73251ff7ff741ecbccd3465ea6.tar.xz
ruby-bd0cef8be7ba6f73251ff7ff741ecbccd3465ea6.zip
* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
[ruby-Bugs-17940] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15531 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/pty/lib/expect.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 45894d847..eecaab057 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Feb 18 10:17:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
+ [ruby-Bugs-17940]
+
Mon Feb 18 00:33:03 2008 Tanaka Akira <akr@fsij.org>
* re.c (rb_reg_regsub): don't repeat repl twice with
diff --git a/ext/pty/lib/expect.rb b/ext/pty/lib/expect.rb
index aa9ab895d..08191b05b 100644
--- a/ext/pty/lib/expect.rb
+++ b/ext/pty/lib/expect.rb
@@ -10,7 +10,7 @@ class IO
e_pat = pat
end
while true
- if IO.select([self],nil,nil,timeout).nil? then
+ if !IO.select([self],nil,nil,timeout) or eof? then
result = nil
break
end