mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
18684395c6
commit
9a7e295255
2 changed files with 14 additions and 7 deletions
|
@ -1,3 +1,7 @@
|
|||
Wed May 25 07:12:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.
|
||||
|
||||
Tue May 24 17:30:36 2011 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* spec/README: fix typo.
|
||||
|
|
|
@ -132,7 +132,6 @@ class Tempfile < DelegateClass(File)
|
|||
ObjectSpace.define_finalizer(self, @clean_proc)
|
||||
|
||||
create(basename, *rest) do |tmpname, n, opts|
|
||||
lock = tmpname + '.lock'
|
||||
mode = File::RDWR|File::CREAT|File::EXCL
|
||||
perm = 0600
|
||||
if opts
|
||||
|
@ -142,12 +141,12 @@ class Tempfile < DelegateClass(File)
|
|||
else
|
||||
opts = perm
|
||||
end
|
||||
self.class.mkdir(lock)
|
||||
lock = self.class.lock_tempfile(tmpname)
|
||||
begin
|
||||
@data[1] = @tmpfile = File.open(tmpname, mode, opts)
|
||||
@data[0] = @tmpname = tmpname
|
||||
ensure
|
||||
self.class.rmdir(lock)
|
||||
self.class.unlock_tempfile(lock)
|
||||
end
|
||||
@mode = mode & ~(File::CREAT|File::EXCL)
|
||||
perm or opts.freeze
|
||||
|
@ -328,12 +327,16 @@ class Tempfile < DelegateClass(File)
|
|||
|
||||
# :stopdoc:
|
||||
|
||||
def mkdir(*args)
|
||||
Dir.mkdir(*args)
|
||||
# makes lock for +tmpname+ and returns the lock.
|
||||
def lock_tempfile(tmpname)
|
||||
lock = tmpname + '.lock'
|
||||
Dir.mkdir(lock)
|
||||
lock
|
||||
end
|
||||
|
||||
def rmdir(*args)
|
||||
Dir.rmdir(*args)
|
||||
# unlock the lock made by _lock_tempfile_.
|
||||
def unlock_tempfile(lock)
|
||||
Dir.rmdir(lock)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue