* lib/find.rb (Find.find): sort directory entries. [ruby-dev:39847]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@26075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 17 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index edb36542f..bb41b8bb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/lib/find.rb b/lib/find.rb
index f9bc75415..12e2a5a93 100644
--- a/lib/find.rb
+++ b/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