From a74dd747e3e2be1c6908196603b3e5ae059745eb Mon Sep 17 00:00:00 2001 From: aamine Date: Wed, 19 Nov 2003 05:33:07 +0000 Subject: [PATCH] * lib/fileutils.rb (fu_same?): add djgpp and wince. * lib/fileutils.rb (cannot_overwrite?): add wince. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/fileutils.rb | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d131d4575c..1e24276807 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Nov 19 14:32:08 2003 Minero Aoki + + * lib/fileutils.rb (fu_same?): add djgpp and wince. + + * lib/fileutils.rb (cannot_overwrite_file?): add wince. + Wed Nov 19 11:04:47 2003 NAKAMURA Usaku * lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32 diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 18aa862bf7..0210e64f07 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -464,8 +464,8 @@ module FileUtils alias move mv - def cannot_overwrite_file? #:nodoc: - /djgpp|cygwin|mswin|mingw|bccwin/ === RUBY_PLATFORM + def cannot_overwrite_file? #:nodoc: + /djgpp|cygwin|mswin|mingw|bccwin|wince/ === RUBY_PLATFORM end private :cannot_overwrite_file? @@ -740,7 +740,9 @@ module FileUtils def fu_same?( a, b ) if have_st_ino? - File.stat(a).dev == File.stat(b).dev and File.stat(a).ino == File.stat(b).ino + st1 = File.stat(a) + st2 = File.stat(b) + st1.dev == st2.dev and st1.ino == st2.ino else File.expand_path(a) == File.expand_path(b) end @@ -749,7 +751,7 @@ module FileUtils end def have_st_ino? - /mswin|mingw|bccwin/ !~ RUBY_PLATFORM + /djgpp|mswin|mingw|bccwin|wince/ !~ RUBY_PLATFORM end def fu_stream_blksize( *streams )