diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/net/telnet.rb | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Fri Oct 9 00:33:29 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca> + + * lib/net/telnet.rb (cmd): Pass FailEOF options: patch by Brian + Candler [ruby-core:22723] + Fri Oct 9 00:01:17 2009 Tanaka Akira <akr@fsij.org> * ext/socket/lib/socket.rb (Socket.udp_server_recv): extracted from diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index 98285a944..17eec1f5e 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -681,20 +681,22 @@ module Net def cmd(options) # :yield: recvdata match = @options["Prompt"] time_out = @options["Timeout"] + fail_eof = @options["FailEOF"] if options.kind_of?(Hash) string = options["String"] match = options["Match"] if options.has_key?("Match") time_out = options["Timeout"] if options.has_key?("Timeout") + fail_eof = options["FailEOF"] if options.has_key?("FailEOF") else string = options end self.puts(string) if block_given? - waitfor({"Prompt" => match, "Timeout" => time_out}){|c| yield c } + waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof}){|c| yield c } else - waitfor({"Prompt" => match, "Timeout" => time_out}) + waitfor({"Prompt" => match, "Timeout" => time_out, "FailEOF" => fail_eof}) end end |