aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 14:17:33 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-12-06 14:17:33 +0000
commit5e795ef8f6bf38d97188b989b0f6e46a66b63c57 (patch)
tree4f490e01ef8ab24a152ea29dd2f31f4b1e7f0b44
parent89214aac7a140878bae93c183040c56d62158fe4 (diff)
downloadruby-5e795ef8f6bf38d97188b989b0f6e46a66b63c57.tar.gz
* lib/find.rb (Find.find): reduce stat system call.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/find.rb8
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b896b44161..1982f4cd58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 6 23:16:35 2009 Tanaka Akira <akr@fsij.org>
+
+ * lib/find.rb (Find.find): reduce stat system call.
+
Sun Dec 6 16:02:15 2009 NARUSE, Yui <naruse@ruby-lang.org>
* lib/webrick/httpservlet/filehandler.rb: escape filename of index.
diff --git a/lib/find.rb b/lib/find.rb
index ee96e526ef..f9bc754152 100644
--- a/lib/find.rb
+++ b/lib/find.rb
@@ -39,9 +39,13 @@ module Find
while file = paths.shift
catch(:prune) do
yield file.dup.taint
- next unless File.exist? file
+ begin
+ s = File.lstat(file)
+ rescue SystemCallError
+ next
+ end
begin
- if File.lstat(file).directory? then
+ if s.directory? then
d = Dir.open(file)
begin
for f in d