diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-07 02:51:05 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-07 02:51:05 +0000 |
commit | 4ded52b623ebd1b3de12db82f8b54cc156c1fd28 (patch) | |
tree | 7b44f5fa6aa0e5c49b2928d43f00ccc71c97a07f /lib/fileutils.rb | |
parent | 43db576e61cc70fc7d8280183b71985e5ab18651 (diff) |
* file.c (rb_get_path): get path string via "to_path" method if
path object is not a string. [Ruby2]
* gc.c (rb_gc_call_finalizer_at_exit): do not free threads in the
exit finalizers.
* io.c (rb_io_reopen): should use rb_io_check_io().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/fileutils.rb')
-rw-r--r-- | lib/fileutils.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb index b3a1466726..c15478ca1b 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -717,7 +717,7 @@ module FileUtils end def fu_list(arg) - Array(arg).map {|path| path.to_str } + Array(arg).map {|path| File.path(path) } end def fu_each_src_dest(src, dest) @@ -730,13 +730,15 @@ module FileUtils def fu_each_src_dest0(src, dest) if src.is_a?(Array) src.each do |s| - yield s.to_str, File.join(dest, File.basename(s)) + s = File.path(s) + yield s, File.join(dest, File.basename(s)) end else + src = File.path(src) if File.directory?(dest) - yield src.to_str, File.join(dest, File.basename(src)) + yield src, File.join(dest, File.basename(src)) else - yield src.to_str, dest.to_str + yield src, File.path(dest) end end end |