summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-04 14:51:31 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-04 14:51:31 +0000
commitae73017cadc3114cf7dc4ef43f0a163414f0c50e (patch)
treeba8bc311178c8794ec70358521595fe9ce876fda /lib
parentc697a394f6328f9e43c48147c5ca7a0433a733cc (diff)
* file.c (rb_file_s_utime): allow nil to set the current time.
* lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate options. fixed: [ruby-talk:219037] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@11987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/fileutils.rb17
1 files changed, 14 insertions, 3 deletions
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index 9aea507..9216c74 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1013,22 +1013,33 @@ module FileUtils
def touch(list, options = {})
fu_check_options options, OPT_TABLE['touch']
list = fu_list(list)
- fu_output_message "touch #{list.join ' '}" if options[:verbose]
+ created = nocreate = options[:nocreate]
+ t = options[:mtime]
+ if options[:verbose]
+ fu_output_message "touch #{
+ nocreate ? ' -c' : ''
+ }#{
+ t ? t.strftime(' -t %Y%m%d%H%M.%S') : ''
+ }#{list.join ' '}"
+ end
return if options[:noop]
- t = Time.now
list.each do |path|
+ created = nocreate
begin
File.utime(t, t, path)
rescue Errno::ENOENT
+ raise if created
File.open(path, 'a') {
;
}
+ created = true
+ retry if t
end
end
end
module_function :touch
- OPT_TABLE['touch'] = [:noop, :verbose]
+ OPT_TABLE['touch'] = [:noop, :verbose, :mtime, :nocreate]
private