summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorwyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 19:19:17 +0000
committerwyhaines <wyhaines@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-08 19:19:17 +0000
commitaf6593ba0d97a4cd110143d0d872b398f6f0a9e7 (patch)
tree9aa29fec15a6be1acf89fd362ef6b55dd658ad7a /lib
parent44c8d6c4dbc75555ab2993ca1b39c42771313437 (diff)
lib/pathname.rb: Backport #2110 [ruby-core:25627]; backport of r23093 to handle the scenario where, on filesystems like Windows', paths are compared using casecmp instead of ==.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@28234 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/pathname.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/pathname.rb b/lib/pathname.rb
index e4ca5489ce..63588cf196 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -194,6 +194,13 @@ class Pathname
# to_path is implemented so Pathname objects are usable with File.open, etc.
TO_PATH = :to_path
end
+
+ SAME_PATHS = if File::FNM_SYSCASE
+ proc {|a, b| a.casecmp(b).zero?}
+ else
+ proc {|a, b| a == b}
+ end
+
# :startdoc:
#
@@ -705,12 +712,12 @@ class Pathname
base_prefix, basename = r
base_names.unshift basename if basename != '.'
end
- if dest_prefix != base_prefix
+ unless SAME_PATHS[dest_prefix, base_prefix]
raise ArgumentError, "different prefix: #{dest_prefix.inspect} and #{base_directory.inspect}"
end
while !dest_names.empty? &&
!base_names.empty? &&
- dest_names.first == base_names.first
+ SAME_PATHS[dest_names.first, base_names.first]
dest_names.shift
base_names.shift
end