ruby-core

Here are some lightly-tested patches.

(1) A patch to Net::Telnet which adds a new option "FailEOF". If you specify

    sock = Net::Telnet.new(...., "FailEOF" => true)
or
    sock.waitfor("Match" => /foo/, "FailEOF" => true)

then if the remote side closes the connection before the expected response is
seen, an EOFError will be raised. If this option is not set then the old
behaviour is maintained.

(2) A patch to IO#expect which raises EOFError instead of NoMethodError if
the remote side closes the connection before the expected response is seen.

Regards,

Brian.

Attachments (2)

net-telnet.diff (1.42 KB, text/x-diff)

--- /usr/lib/ruby/1.8/net/telnet.rb	2005-09-14 16:21:31.000000000 +0100
+++ telnet.rb	2007-05-31 14:43:21.000000000 +0100
@@ -520,10 +520,15 @@
     #            value specified when this instance was created will be
     #            used, or, failing that, the default value of 0 seconds,
     #            which means not to wait for more input.
+    # FailEOF:: if true, when the remote end closes the connection then an
+    #           EOFError will be raised. Otherwise, defaults to the old
+    #           behaviour that the function will return whatever data
+    #           has been received already, or nil if nothing was received.
     #           
     def waitfor(options) # :yield: recvdata
       time_out = @options["Timeout"]
       waittime = @options["Waittime"]
+      fail_eof = @options["FailEOF"]
 
       if options.kind_of?(Hash)
         prompt   = if options.has_key?("Match")
@@ -535,6 +540,7 @@
                    end
         time_out = options["Timeout"]  if options.has_key?("Timeout")
         waittime = options["Waittime"] if options.has_key?("Waittime")
+        fail_eof = options["FailEOF"]  if options.has_key?("FailEOF")
       else
         prompt = options
       end
@@ -579,6 +585,7 @@
           line += buf
           yield buf if block_given?
         rescue EOFError # End of file reached
+          raise if fail_eof
           if line == ''
             line = nil
             yield nil if block_given?

expect.diff (320 Bytes, text/x-diff)

--- /usr/lib/ruby/1.8/expect.rb	2006-11-22 14:06:58.000000000 +0000
+++ lib/rds/expect.rb	2007-05-31 14:40:22.000000000 +0100
@@ -14,7 +14,7 @@
         result = nil
         break
       end
-      c = getc.chr
+      c = (getc || (raise EOFError)).chr
       buf << c
       if $expect_verbose
         STDOUT.print c

Thread

Prev Next

In This Thread

Prev Next

[#11066] question about frame_unique — Paul Brannan <pbrannan@...>

[#11069] High-precision Rationals cannot be converted to Floats — <noreply@...>

[#11070] Re: Welcome to our (ruby-core ML) You are added automatically — "Bunno Lim" <bunno_lim@...>

[#11071] autorunner -n option does not work in trunk — <noreply@...>

[#11073] segfault printing instruction sequence for iterator — <noreply@...>

[#11074] sub! causing unexpected side effect — <noreply@...>

[#11075] Ruby fails to parse valid wsdl — <noreply@...>

[#11076] Windows DEP causes crash — <noreply@...>

[#11077] Submitting an RDoc patch — gga <ggarra@...>

[#11078] sub! causing unexpected side effect — <noreply@...>

[#11079] ruby packer prototype: core dumps ( design review request ) — "Adam Bozanich" <adam.boz@...>

[#11081] sub! causing unexpected side effect — <noreply@...>

[#11082] Understanding code: Kernel#require and blocks. — Hugh Sasse <hgs@...>

[#11088] Net::HTTP encodes parameters improperly. — <noreply@...>

[#11090] parsedate fails — <noreply@...>

[#11092] return from block inside a lambda does not work as expected — <noreply@...>

[#11094] RDoc for Kernel#select same as IO.select — <noreply@...>

[#11095] RDoc for Kernel#select same as IO.select — <noreply@...>

[#11097] TestReadline fails depending on the terminal in which the test is run. — <noreply@...>

[#11098] Short read with readline, popen and timeout - first byte of the line disappears — <noreply@...>

[#11099] Short read with readline, popen and timeout - first byte of the line disappears — <noreply@...>

[#11100] Short read with readline, popen and timeout - first byte of the line disappears — <noreply@...>

[#11102] Net::HTTP encodes parameters improperly. — <noreply@...>

[#11103] irb attempts to escape '\c' inside single quotes — <noreply@...>

[#11104] overriding autoloads with classes and modules — Thomas Enebo <Thomas.Enebo@...>

[#11106] Failure parsing dates returned by WIN32OLE — <noreply@...>

[#11107] unable to build ruby HEAD without previously installed ruby — <noreply@...>

[#11108] pattern for implementation-private constants? — David Flanagan <david@...>

[#11117] BUGS in metaclasses inheritance — <noreply@...>

[#11118] BUGS in metaclasses inheritance — <noreply@...>

[#11121] Weird rounding behavior.. — <noreply@...>

[#11124] IRHG - Found interesting Japanese Document exploring various GC's — Charles Thornton <ceo@...>

[#11125] two fixes for sync.rb: sync_try_lock, Err.Fail — "Dmitry Borodaenko" <angdraug@...>

[#11127] Bugs that can be closed — "Jano Svitok" <jan.svitok@...>

[#11128] Weird rounding behavior.. — <noreply@...>

[#11129] sub! causing unexpected side effect — <noreply@...>

[#11130] :!~ not a symbol — <noreply@...>

[#11131] Documentation for String.scan has a bad example. — <noreply@...>

[#11132] rdoc/usage uses an uninitalized constant — <noreply@...>

[#11133] bug in newton.rb — <noreply@...>

[#11134] each_with_index (Enumerable) does not forward arguments to each — <noreply@...>

[#11135] Ruby Gem installer not playing nice on Ubuntu — <noreply@...>

[#11136] Ruby one-click installer wiped out system PATH environment variable. — <noreply@...>

[#11137] Ruby one-click installer wiped out system PATH environment variable. — <noreply@...>

[#11138] Marshal.dump shouldn't complain about singletons if the _dump method is defined — <noreply@...>

[#11139] exit from within block returns wrong value. — <noreply@...>

[#11140] :!~ not a symbol — <noreply@...>

[#11141] Weird rounding behavior.. — <noreply@...>

[#11143] Logger::Application accessor for logger — Brian Candler <B.Candler@...>

[#11144] Rational comparison to 0 fails when denominator is != 1 — <noreply@...>

[#11145] Rational comparison to 0 fails when denominator is != 1 — <noreply@...>

[#11147] RDoc patch to better support documenting multiple classes/SWIG — <noreply@...>

[#11150] "password" is case sensitive in lib/telnet.rb — <noreply@...>

[#11153] segfault printing instruction sequence for iterator — <noreply@...>

[#11154] Rational comparison to 0 fails when denominator is != 1 — <noreply@...>

[#11155] Class#=== bug — <noreply@...>

[#11156] Class#=== bug — <noreply@...>

[#11157] Class#=== bug — <noreply@...>

[#11158] Class#=== bug — <noreply@...>

[#11159] Rational comparison to 0 fails when denominator is != 1 — <noreply@...>

[#11165] Rational comparison to 0 fails when denominator is != 1 — <noreply@...>

[#11166] rdoc patches — Joel VanderWerf <vjoel@...>

[#11167] Date parsing bug with patch — <noreply@...>

[#11169] Allow back reference with nest level in Oniguruma for Ruby again — =?ISO-8859-15?Q?Wolfgang_N=E1dasi-Donner?= <wonado@...>

[#11171] Loss of precision during iteration. — <noreply@...>

[#11172] "read_nonblock" Problem (Windows and Ruby 1.8) — =?ISO-8859-15?Q?Wolfgang_N=E1dasi-Donner?= <wonado@...>

[#11174] Loss of precision during iteration. — <noreply@...>

[#11175] Loss of precision during iteration. — <noreply@...>

[#11176] FileUtils.rm_rf misfeature? — johan556@...

[#11177] Loss of precision during iteration. — <noreply@...>

[#11187] Garbage collection of Symbols in future release? — Sven Suska <sven716rc@...>

[#11193] IRHG -- Downloadable Files — Charles Thornton <ceo@...>

[#11204] URI Methods Raise Unclear Exceptions When Passed URI Objects — <noreply@...>

[#11206] ri HTML output bug with constants — Chris Thomas <chris@...>

[#11208] How to handle Change Proposals that affect mainly Oniguruma (for Ruby)? — =?ISO-8859-15?Q?Wolfgang_N=E1dasi-Donner?= <wonado@...>

[#11209] eval("0.0025 + 9 * 0.0025") === 0.025 => false — <noreply@...>

[#11210] Pathname ascend and descend inclusive parameter — TRANS <transfire@...>

[#11211] eval("0.0025 + 9 * 0.0025") === 0.025 => false — <noreply@...>

[#11213] eval(&quot;0.0025 + 9 * 0.0025&quot;) === 0.025 =&gt; false — <noreply@...>

[#11214] eval(&quot;0.0025 + 9 * 0.0025&quot;) === 0.025 =&gt; false — <noreply@...>

[#11213] eval("0.0025 + 9 * 0.0025") === 0.025 => false — <noreply@...>

[#11214] eval("0.0025 + 9 * 0.0025") === 0.025 => false — <noreply@...>

[#11216] eval("0.0025 + 9 * 0.0025") === 0.025 => false — <noreply@...>

[#11290] [TINY][PATCH] Array#last is not working for n > 3 — <noreply@...>

[#11291] In a c++ program, when I call "fclose()", or "ofstream::close()" in a file that includes ruby.h, the program crashes — <noreply@...>

[#11318] Problem with Benchmark::Tms#add! - expects &blk but takes no parameters — <noreply@...>