зеркало из https://github.com/github/ruby.git
* lib/find.rb (Find.find): sort directory entries. [ruby-dev:39847]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
f62310ac62
Коммит
c48a4c2936
|
@ -1,3 +1,7 @@
|
|||
Sun Dec 13 23:48:25 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* lib/find.rb (Find.find): sort directory entries. [ruby-dev:39847]
|
||||
|
||||
Sun Dec 13 20:55:30 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* test/ruby/envutil.rb (invoke_ruby): call to_str for stdin_data to
|
||||
|
|
29
lib/find.rb
29
lib/find.rb
|
@ -46,22 +46,19 @@ module Find
|
|||
end
|
||||
begin
|
||||
if s.directory? then
|
||||
d = Dir.open(file)
|
||||
begin
|
||||
for f in d
|
||||
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
|
||||
paths.unshift f.untaint
|
||||
end
|
||||
ensure
|
||||
d.close
|
||||
end
|
||||
fs = Dir.entries(file)
|
||||
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
|
||||
paths.unshift f.untaint
|
||||
}
|
||||
end
|
||||
rescue Errno::ENOENT, Errno::EACCES
|
||||
end
|
||||
|
|
Загрузка…
Ссылка в новой задаче