diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-05 06:44:14 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-05 06:44:14 +0000 |
commit | da7cf16496235262502cfb8b3232b51b469fd462 (patch) | |
tree | 40093eb244f5dedb0a5e0b0bfef8f10f65d6a47f /lib | |
parent | 1901ca6a177c998aa9d90fe81ab270fe59e147f8 (diff) |
* lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
suffix for a temporary file name.
* lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
names less predictable by including a random string.
[inspired by: akr]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tempfile.rb | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lib/tempfile.rb b/lib/tempfile.rb index b885444b15..f87c5fd394 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -13,9 +13,15 @@ class Tempfile < DelegateClass(File) MAX_TRY = 10 @@cleanlist = [] - # Creates a temporary file of mode 0600 in the temporary directory - # whose name is basename.pid.n and opens with mode "w+". A Tempfile - # object works just like a File object. + # Creates a temporary file of mode 0600 in the temporary directory, + # opens it with mode "w+", and returns a Tempfile object which + # represents the created temporary file. A Tempfile object can be + # treated just like a normal File object. + # + # The basename parameter is used to determine the name of a + # temporary file. If an Array is given, the first element is used + # as prefix string and the second as suffix string, respectively. + # Otherwise it is treated as prefix string. # # If tmpdir is omitted, the temporary directory is determined by # Dir::tmpdir provided by 'tmpdir.rb'. @@ -67,7 +73,15 @@ class Tempfile < DelegateClass(File) end def make_tmpname(basename, n) - sprintf('%s.%d.%d', basename, $$, n) + case basename + when Array + prefix, suffix = *basename + else + prefix, suffix = basename, '' + end + + t = Time.now.strftime("%Y%m%d") + path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}-#{n}#{suffix}" end private :make_tmpname |