diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-02 10:36:34 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2001-10-02 10:36:34 +0000 |
| commit | 361be96e52a2982e5ab1c061efa73fd152446cfd (patch) | |
| tree | e89854471aba5e2c90da990b9779e6bfeacc9863 | |
| parent | 1baa36bc201ed2c715891df2858f3c14790953e9 (diff) | |
| download | ruby-361be96e52a2982e5ab1c061efa73fd152446cfd.tar.gz ruby-361be96e52a2982e5ab1c061efa73fd152446cfd.tar.xz ruby-361be96e52a2982e5ab1c061efa73fd152446cfd.zip | |
* lib/ftools.rb (catname): allow trailing '/' for the destination.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@1763 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/ftools.rb | 7 |
2 files changed, 5 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Tue Oct 2 19:12:47 2001 WATANABE Hirofumi <eban@ruby-lang.org> + + * lib/ftools.rb (catname): allow trailing '/' for the destination. + Tue Oct 2 08:04:52 2001 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp> * marshal.c (r_object): TYPE_UCLASS check should be inversed. diff --git a/lib/ftools.rb b/lib/ftools.rb index 5e6203b1a..4047a595e 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 |