diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-21 16:47:23 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-21 16:47:23 +0000 |
| commit | 878eb97a81c336858873630e398bd25b31ac29c8 (patch) | |
| tree | 552aae90929d0812fd6a5d08e43c870add3a35a5 /lib | |
| parent | ab22e879635e564a25996989f5ccca1954c2fb4b (diff) | |
| download | ruby-878eb97a81c336858873630e398bd25b31ac29c8.tar.gz ruby-878eb97a81c336858873630e398bd25b31ac29c8.tar.xz ruby-878eb97a81c336858873630e398bd25b31ac29c8.zip | |
* parse.y (newline_node): do not use NODE_NEWLINE node anymore,
use NEWLINE flag instead.
* ext/socket/socket.c (sock_gethostbyname): returns host if
ai_canonname is NULL. (ruby-bugs PR#1243)
* parse.y (block_append): update nd_end for "real" head node.
[ruby-list:39058]
* marshal.c (w_class): should not dump singleton class.
[ruby-dev:22631]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/find.rb | 3 | ||||
| -rw-r--r-- | lib/net/telnet.rb | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/find.rb b/lib/find.rb index 9ca39cabc..e94d5c2c7 100644 --- a/lib/find.rb +++ b/lib/find.rb @@ -36,7 +36,8 @@ module Find paths.collect!{|d| d.dup} while file = paths.shift catch(:prune) do - yield file + yield file.dup + file.untaint begin if File.lstat(file).directory? then d = Dir.open(file) diff --git a/lib/net/telnet.rb b/lib/net/telnet.rb index 095be4533..6e50d1757 100644 --- a/lib/net/telnet.rb +++ b/lib/net/telnet.rb @@ -706,7 +706,7 @@ module Net # :nodoc: end if block_given? - line = waitfor(/login[: ]*\z/n){|c| yield c } + line = waitfor(/[Ll]ogin[: ]*\z/n){|c| yield c } if password line += cmd({"String" => username, "Match" => /Password[: ]*\z/n}){|c| yield c } @@ -715,7 +715,7 @@ module Net # :nodoc: line += cmd(username){|c| yield c } end else - line = waitfor(/login[: ]*\z/n) + line = waitfor(/[Ll]ogin[: ]*\z/n) if password line += cmd({"String" => username, "Match" => /Password[: ]*\z/n}) |