From 878384483d99fd4b887c5ddf44765b4178e72e42 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 20 Jul 2010 03:27:59 +0000 Subject: * lib/fileutils.rb (FileUtils::Entry_#copy): check file name spearator boundary. [ruby-core:31360] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/fileutils.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 5905022c96..73e2bfe3c3 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -1240,7 +1240,7 @@ module FileUtils when file? copy_file dest when directory? - if !File.exist?(dest) and /^#{Regexp.quote(path)}/ =~ File.dirname(dest) + if !File.exist?(dest) and descendant_diretory?(dest, path) raise ArgumentError, "cannot copy directory %s to itself %s" % [path, dest] end begin @@ -1394,6 +1394,17 @@ module FileUtils return File.path(base) if not dir or dir == '.' File.join(dir, base) end + + if File::ALT_SEPARATOR + DIRECTORY_TERM = "(?=[/#{Regexp.quote(File::ALT_SEPARATOR)}]|\\z)".freeze + else + DIRECTORY_TERM = "(?=/|\\z)".freeze + end + SYSCASE = File::FNM_SYSCASE.nonzero? ? "-i" : "" + + def descendant_diretory?(descendant, ascendant) + /\A(?#{SYSCASE}:#{Regexp.quote(ascendant)})#{DIRECTORY_TERM}/ =~ File.dirname(descendant) + end end # class Entry_ def fu_list(arg) #:nodoc: -- cgit v1.2.3