From d9eae8001157b255307b6754737968db12b9c9ba Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 11 Nov 2009 10:17:36 +0000
Subject: * lib/tempfile.rb (Tempfile#initialize): merge mode option.

* lib/tmpdir.rb (Dir::Tmpname#create): splat options.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25720 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/tempfile.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib/tempfile.rb')

diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 4ebeea28a1..7024bd9bdb 100755
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -133,9 +133,11 @@ class Tempfile < DelegateClass(File)
 
     create(basename, *rest) do |tmpname, n, opts|
       lock = tmpname + '.lock'
+      mode = opts.delete(:mode) || 0
+      mode = File::RDWR|File::CREAT|File::EXCL|mode
       self.class.mkdir(lock)
       begin
-        @data[1] = @tmpfile = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL, 0600, *opts)
+        @data[1] = @tmpfile = File.open(tmpname, mode, 0600, *opts)
         @data[0] = @tmpname = tmpname
       ensure
         self.class.rmdir(lock)
-- 
cgit v1.2.3