telnet.rb in net-telnet-0.2.0

- old
+ new

@@ -550,12 +550,12 @@
       end
 
       line = ''
       buf = ''
       rest = ''
-      until(prompt === line and not IO::select([@sock], nil, nil, waittime))
-        unless IO::select([@sock], nil, nil, time_out)
+      until(prompt === line and not @sock.wait_readable(waittime))
+        unless @sock.wait_readable(time_out)
           raise Net::ReadTimeout, "timed out while waiting for more data"
         end
         begin
           c = @sock.readpartial(1024 * 1024)
           @dumplog.log_dump('<', c) if @options.has_key?("Dump_log")
@@ -571,24 +571,24 @@
               rest = c[pt .. -1]
             else
               buf = preprocess(c)
               rest = ''
             end
-         else
-           # Not Telnetmode.
-           #
-           # We cannot use preprocess() on this data, because that
-           # method makes some Telnetmode-specific assumptions.
-           buf = rest + c
-           rest = ''
-           unless @options["Binmode"]
-             if pt = buf.rindex(/\r\z/no)
-               buf = buf[0 ... pt]
-               rest = buf[pt .. -1]
-             end
-             buf.gsub!(/#{EOL}/no, "\n")
-           end
+          else
+            # Not Telnetmode.
+            #
+            # We cannot use preprocess() on this data, because that
+            # method makes some Telnetmode-specific assumptions.
+            buf = rest + c
+            rest = ''
+            unless @options["Binmode"]
+              if pt = buf.rindex(/\r\z/no)
+                buf = buf[0 ... pt]
+                rest = buf[pt .. -1]
+              end
+              buf.gsub!(/#{EOL}/no, "\n")
+            end
           end
           @log.print(buf) if @options.has_key?("Output_log")
           line += buf
           yield buf if block_given?
         rescue EOFError # End of file reached
@@ -608,10 +608,10 @@
     # Does not perform any conversions on +string+.  Will log +string+ to the
     # dumplog, if the Dump_log option is set.
     def write(string)
       length = string.length
       while 0 < length
-        IO::select(nil, [@sock])
+        @sock.wait_writable
         @dumplog.log_dump('>', string[-length..-1]) if @options.has_key?("Dump_log")
         length -= @sock.syswrite(string[-length..-1])
       end
     end
 