From cc744ef9b8637e053a8cc6254ee123aea39780b0 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 14 Dec 2009 00:20:56 +0000 Subject: [PATCH] * lib/find.rb (Find.find): removed already unnecessary code. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26085 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/find.rb | 8 +------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb41b8bb2b..1cc0efc950 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Dec 14 09:20:54 2009 Nobuyoshi Nakada + + * lib/find.rb (Find.find): removed already unnecessary code. + Sun Dec 13 23:48:25 2009 Tanaka Akira * lib/find.rb (Find.find): sort directory entries. [ruby-dev:39847] diff --git a/lib/find.rb b/lib/find.rb index 12e2a5a938..16a6a26069 100644 --- a/lib/find.rb +++ b/lib/find.rb @@ -50,13 +50,7 @@ module Find fs.sort! fs.reverse_each {|f| next if f == "." or f == ".." - if File::ALT_SEPARATOR and file =~ /^(?:[\/\\]|[A-Za-z]:[\/\\]?)$/ then - f = file + f - elsif file == "/" then - f = "/" + f - else - f = File.join(file, f) - end + f = File.join(file, f) paths.unshift f.untaint } end