From 896db7d62512ec9baa5b5f7b0644e22d3c619064 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 28 Mar 2009 23:59:28 +0000 Subject: * lib/pathname.rb (Pathname#relative_path_from): compares path components according to system default case-sensitiveness. [ruby-core:22829] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23093 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/pathname.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/pathname.rb b/lib/pathname.rb index 75faaef8b2..7b7ed374ea 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -197,6 +197,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: # @@ -786,12 +793,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 -- cgit v1.2.3