summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-14 15:21:31 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-14 15:21:31 +0000
commit8aa4048e5c087e5336486af26fd2cc4be3d21cce (patch)
tree0ed429fdd3ce5bda8a298774ce0df8f50d171af4
parent14e256f4b1c5871f30f44ae4c80f7033c10d6e83 (diff)
* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
readpartial. [ruby-talk:127641] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/telnet.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cba3fde379..44b252bbd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 15 00:18:24 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
+ readpartial. [ruby-talk:127641]
+
Wed Sep 14 22:40:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (ruby_glob): glob function not using ruby exception system.
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 05691de0f7..c5f8b0429a 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -551,7 +551,7 @@ module Net
raise TimeoutError, "timed out while waiting for more data"
end
begin
- c = @sock.sysread(1024 * 1024)
+ c = @sock.readpartial(1024 * 1024)
@dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
if @options["Telnetmode"]
c = rest + c