ruby-changes:4763
From: ko1@a...
Date: Thu, 1 May 2008 23:57:51 +0900 (JST)
Subject: [ruby-changes:4763] jeg2 - Ruby:r16257 (trunk): * lib/net/telnet.rb: This patch from Brian Candler adds a FailEOF mode which
jeg2 2008-05-01 23:57:40 +0900 (Thu, 01 May 2008) New Revision: 16257 Modified files: trunk/lib/net/telnet.rb Log: * lib/net/telnet.rb: This patch from Brian Candler adds a FailEOF mode which can be activated to have net/telnet raise EOFError exceptions when the remote connection is closed. The default behavior remains unchanged though. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/net/telnet.rb?r1=16257&r2=16256&diff_format=u Index: lib/net/telnet.rb =================================================================== --- lib/net/telnet.rb (revision 16256) +++ lib/net/telnet.rb (revision 16257) @@ -523,10 +523,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") @@ -538,6 +543,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 @@ -589,6 +595,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? -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/