From 6e2490beb56a2c6498393517d61eaf3d777ed2e5 Mon Sep 17 00:00:00 2001
From: wakou <wakou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 7 Sep 2001 00:56:10 +0000
Subject: [PATCH]         * lib/net/telnet.rb: waitfor(): bug fix.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 4 ++++
 lib/net/telnet.rb | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b8c56946a..45c7469672 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep  7 09:44:44 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
+
+	* lib/net/telnet.rb: waitfor(): bug fix.
+
 Fri Sep  7 07:11:34 2001  Wakou Aoyama  <wakou@fsinet.or.jp>
 
 	* lib/cgi.rb: CGI#doctype(): bug fix (html4Fr).
diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb
index 1d523c551f..0a520eaabb 100644
--- a/lib/net/telnet.rb
+++ b/lib/net/telnet.rb
@@ -467,13 +467,14 @@ module Net
         begin
           c = @sock.sysread(1024 * 1024)
           @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
+          c = rest + c
           if @options["Telnetmode"]
             if Integer(c.rindex(/#{IAC}#{SE}/no)) <
                Integer(c.rindex(/#{IAC}#{SB}/no))
-              buf = preprocess(rest + c[0 ... c.rindex(/#{IAC}#{SB}/no)])
+              buf = preprocess(c[0 ... c.rindex(/#{IAC}#{SB}/no)])
               rest = c[c.rindex(/#{IAC}#{SB}/no) .. -1]
             elsif pt = c.rindex(/#{IAC}[^#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]?\z/no)
-              buf = preprocess(rest + c[0 ... pt])
+              buf = preprocess(c[0 ... pt])
               rest = c[pt .. -1]
             else
               buf = preprocess(c)