diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/tempfile.rb | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jul 8 00:05:23 2004 akira yamada <akira@arika.org> + + * lib/tempfile.rb (Tempfile::initialize): got out code of + generating tmpname. [ruby-dev:23832][ruby-dev:23837] + Wed Jul 7 15:53:14 2004 NAKAMURA Usaku <usa@ruby-lang.org> * string.c (rb_str_match): raise TypeError when both arguments are diff --git a/lib/tempfile.rb b/lib/tempfile.rb index 8105b30f50..b13e5ff61f 100644 --- a/lib/tempfile.rb +++ b/lib/tempfile.rb @@ -33,7 +33,7 @@ class Tempfile < DelegateClass(File) Thread.critical = true begin - tmpname = sprintf('%s/%s%d.%d', tmpdir, basename, $$, n) + tmpname = File.join(tmpdir, make_tmpname(basename, n)) lock = tmpname + '.lock' n += 1 end while @@cleanlist.include?(tmpname) or @@ -66,6 +66,11 @@ class Tempfile < DelegateClass(File) Dir.rmdir(lock) end + def make_tmpname(basename, n) + sprintf('%s%d.%d', basename, $$, n) + end + private :make_tmpname + # Opens or reopens the file with mode "r+". def open @tmpfile.close if @tmpfile |