diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-14 12:50:13 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-14 12:50:13 +0000 |
| commit | a0e26acc7ae10c2a4b42a7bd47c2065c3182af6b (patch) | |
| tree | 58419ad68b8dd2d6d1795c1e45657768c0a5fb4b /lib | |
| parent | 4ac65478ad7888105e07bf499e6984c3d29d5db2 (diff) | |
| download | ruby-a0e26acc7ae10c2a4b42a7bd47c2065c3182af6b.tar.gz ruby-a0e26acc7ae10c2a4b42a7bd47c2065c3182af6b.tar.xz ruby-a0e26acc7ae10c2a4b42a7bd47c2065c3182af6b.zip | |
* lib/find.rb (Find.find): narrow rescue region.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26098 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/find.rb | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/find.rb b/lib/find.rb index 16a6a2606..7727bbdbb 100644 --- a/lib/find.rb +++ b/lib/find.rb @@ -44,18 +44,19 @@ module Find rescue SystemCallError next end - begin - if s.directory? then + if s.directory? then + begin fs = Dir.entries(file) - fs.sort! - fs.reverse_each {|f| - next if f == "." or f == ".." - f = File.join(file, f) - paths.unshift f.untaint - } - end - rescue Errno::ENOENT, Errno::EACCES - end + rescue Errno::ENOENT, Errno::EACCES + next + end + fs.sort! + fs.reverse_each {|f| + next if f == "." or f == ".." + f = File.join(file, f) + paths.unshift f.untaint + } + end end end end |