summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-18 13:24:48 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-18 13:24:48 +0000
commit6874cb465a1a8193a64d946d1bdb7ff4756a7ed9 (patch)
tree965684cd30c68ae21e290d92e3ef848f77a35ae7 /lib
parent17db3830504628bd85dfb383cbfd6576ceafb303 (diff)
* lib/fileutils.rb (fu_same?): temporal fix for windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/fileutils.rb12
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 9b50aec919..bcc7b8d7d6 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -465,7 +465,7 @@ module FileUtils
alias move mv
def cannot_overwrite_file? #:nodoc:
- /djgpp|cygwin|mswin32/ === RUBY_PLATFORM
+ /djgpp|cygwin|mswin|mingw/ === RUBY_PLATFORM
end
private :cannot_overwrite_file?
@@ -739,11 +739,19 @@ module FileUtils
end
def fu_same?( a, b )
- File.stat(a).ino == File.stat(b).ino
+ if have_st_ino?
+ File.stat(a).dev == File.stat(b).dev and File.stat(a).ino == File.stat(b).ino
+ else
+ File.expand_path(a) == File.expand_path(b)
+ end
rescue Errno::ENOENT
return false
end
+ def have_st_ino?
+ /mswin|mingw/ !~ RUBY_PLATFORM
+ end
+
def fu_stream_blksize( *streams )
streams.each do |s|
next unless s.respond_to?(:stat)