From be1fea072cd0d22788ef8a931c0c6b64a2503b5d Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 12 Oct 1999 04:53:36 +0000 Subject: 19991012 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/cgi-lib.rb | 19 ++++++++--- lib/matrix.rb | 100 ++++++++++++++++++++++++++++++++++----------------------- lib/telnet.rb | 54 ++++++++++++++++++++----------- 3 files changed, 110 insertions(+), 63 deletions(-) (limited to 'lib') diff --git a/lib/cgi-lib.rb b/lib/cgi-lib.rb index f599f772ce..bf04601238 100644 --- a/lib/cgi-lib.rb +++ b/lib/cgi-lib.rb @@ -117,6 +117,17 @@ class CGI < SimpleDelegator LF = "\012" EOL = CR + LF + RFC822_DAYS = %w[ Sun Mon Tue Wed Thu Fri Sat ] + RFC822_MONTHS = %w[ Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ] + + # make rfc1123 date string + def rfc1123_date(time) + t = time.clone.gmtime + return format("%s, %.2d %s %d %.2d:%.2d:%.2d GMT", + RFC822_DAYS[t.wday], t.day, RFC822_MONTHS[t.month-1], t.year, + t.hour, t.min, t.sec) + end + # escape url encode def escape(str) str.gsub(/[^a-zA-Z0-9_\-.]/n){ sprintf("%%%02X", $&.unpack("C")[0]) } @@ -132,7 +143,7 @@ class CGI < SimpleDelegator str.gsub(/&/, "&").gsub(/\"/, """).gsub(/>/, ">").gsub(/ column_size - 1 - nothing = true + exists = false break end end while a[i][k] == 0 - next if nothing - a[i], a[k] = a[k], a[i] - akk = a[k][k] + if exists + a[i], a[k] = a[k], a[i] + akk = a[k][k] + else + i = k + exists = true + begin + if (i += 1) > row_size - 1 + exists = false + break + end + end while a[k][i] == 0 + if exists + k.upto(column_size - 1) do + |j| + a[j][k], a[j][i] = a[j][i], a[j][k] + end + akk = a[k][k] + else + next + end + end end (k + 1).upto(row_size - 1) do |i| @@ -806,10 +827,10 @@ class Vector private_class_method :new def Vector.[](*array) - new(:init_elements, array, copy = false) + new(:init_elements, array, copy = FALSE) end - def Vector.elements(array, copy = true) + def Vector.elements(array, copy = TRUE) new(:init_elements, array, copy) end @@ -854,7 +875,7 @@ class Vector # COMPARING def ==(other) - return false unless Vector === other + return FALSE unless Vector === other other.compare_by(@elements) end @@ -874,11 +895,11 @@ class Vector # ARITHMETIC - def *(x) # is matrix or number + def *(x) "is matrix or number" case x when Numeric els = @elements.collect{|e| e * x} - Vector.elements(els, false) + Vector.elements(els, FALSE) when Matrix self.covector * x else @@ -895,7 +916,7 @@ class Vector |v1, v2| v1 + v2 } - Vector.elements(els, false) + Vector.elements(els, FALSE) when Matrix Matrix.column_vector(self) + v else @@ -912,7 +933,7 @@ class Vector |v1, v2| v1 - v2 } - Vector.elements(els, false) + Vector.elements(els, FALSE) when Matrix Matrix.column_vector(self) - v else @@ -939,7 +960,7 @@ class Vector |v| yield v } - Vector.elements(els, false) + Vector.elements(els, FALSE) end alias map collect @@ -948,7 +969,7 @@ class Vector |v1, v2| yield v1, v2 } - Vector.elements(els, false) + Vector.elements(els, FALSE) end def r @@ -999,4 +1020,3 @@ class Vector str = "Vector"+@elements.inspect end end - diff --git a/lib/telnet.rb b/lib/telnet.rb index b161ae8c6c..b6623513e0 100644 --- a/lib/telnet.rb +++ b/lib/telnet.rb @@ -1,11 +1,11 @@ =begin -$Date: 1999/09/21 21:24:07 $ +$Date: 1999/10/04 22:51:26 $ == SIMPLE TELNET CLIANT LIBRARY telnet.rb -Version 0.50 +Version 1.00 Wakou Aoyama @@ -155,6 +155,15 @@ of cource, set sync=true or flush is necessary. == HISTORY +=== Version 1.00 + +1999/10/04 22:51:26 + +- bug fix: waitfor(preprocess) method + thanks to Shin-ichiro Hara +- add simple support for AO, DM, IP, NOP, SB, SE +- COUTION! TimeOut --> TimeoutError + === Version 0.50 1999/09/21 21:24:07 @@ -331,7 +340,6 @@ require "socket" require "delegate" require "thread" require "timeout" -TimeOut = TimeoutError class Telnet < SimpleDelegator @@ -405,8 +413,8 @@ class Telnet < SimpleDelegator EOL = CR + LF v = $-v $-v = false - VERSION = "0.50" - RELEASE_DATE = "$Date: 1999/09/21 21:24:07 $" + VERSION = "1.00" + RELEASE_DATE = "$Date: 1999/10/04 22:51:26 $" $-v = v def initialize(options) @@ -456,7 +464,7 @@ $-v = v } end rescue TimeoutError - raise TimeOut, "timed-out; opening of the host" + raise TimeoutError, "timed-out; opening of the host" rescue @log.write($!.to_s + "\n") if @options.key?("Output_log") @dumplog.write($!.to_s + "\n") if @options.key?("Dump_log") @@ -502,10 +510,10 @@ $-v = v str.gsub!(/#{EOL}/no, "\n") unless @options["Binmode"] str.gsub!(/#{IAC}( - #{IAC}| - #{AYT}| + [#{IAC}#{AO}#{AYT}#{DM}#{IP}#{NOP}]| [#{DO}#{DONT}#{WILL}#{WONT}] - [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}] + [#{OPT_BINARY}-#{OPT_NEW_ENVIRON}#{OPT_EXOPL}]| + #{SB}[^#{IAC}]*#{IAC}#{SE} )/xno){ if IAC == $1 # handle escaped IAC characters IAC @@ -539,6 +547,8 @@ $-v = v self.write(IAC + DONT + OPT_SGA) end '' + else + '' end } @@ -551,7 +561,7 @@ $-v = v if options.kind_of?(Hash) prompt = if options.key?("Match") - options["Match"] + options["Match"] elsif options.key?("Prompt") options["Prompt"] elsif options.key?("String") @@ -569,24 +579,30 @@ $-v = v line = '' buf = '' + rest = '' until(prompt === line and not IO::select([@sock], nil, nil, waittime)) unless IO::select([@sock], nil, nil, time_out) - raise TimeOut, "timed-out; wait for the next data" + raise TimeoutError, "timed-out; wait for the next data" end begin c = @sock.sysread(1024 * 1024) @dumplog.print(c) if @options.key?("Dump_log") - buf.concat c if @options["Telnetmode"] - buf = preprocess(buf) - if /#{IAC}.?\z/no === buf - next - end - end + if Integer(c.rindex(/#{IAC}#{SE}/no)) < + Integer(c.rindex(/#{IAC}#{SB}/no)) + buf = preprocess(rest + 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]) + rest = c[pt .. -1] + else + buf = preprocess(c) + rest = '' + end + end @log.print(buf) if @options.key?("Output_log") - yield buf if iterator? line.concat(buf) - buf = '' + yield buf if iterator? rescue EOFError # End of file reached if line == '' line = nil -- cgit v1.2.1