* lib/ftools.rb (catname): allow trailing '/' for the destination.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 6 deletions

diff --git a/lib/ftools.rb b/lib/ftools.rb
index 5e6203b1a3..4047a595eb 100644
--- a/lib/ftools.rb
+++ b/lib/ftools.rb
@@ -4,12 +4,7 @@ class << File
 
   def catname from, to
     if FileTest.directory? to
-      to +
-	if to =~ /\\/
-	  if to[-1,1] != '\\' then '\\' end + basename(from)
-	else
-	  if to[-1,1] != '/' then '/' end + basename(from)
-	end
+      File.join to.sub(%r([/\\]$), ''), basename(from)
     else
       to
     end