aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-14 00:20:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-14 00:20:56 +0000
commitcc744ef9b8637e053a8cc6254ee123aea39780b0 (patch)
treee6961897b9bbb9d0b7a281d35664632211466699
parentb3ea5a1789bdb9b52aaa7e37bfbab89094ef0f06 (diff)
downloadruby-cc744ef9b8637e053a8cc6254ee123aea39780b0.tar.gz
* 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
-rw-r--r--ChangeLog4
-rw-r--r--lib/find.rb8
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 <nobu@ruby-lang.org>
+
+ * lib/find.rb (Find.find): removed already unnecessary code.
+
Sun Dec 13 23:48:25 2009 Tanaka Akira <akr@fsij.org>
* 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