From b681457f018c9d8ef2233a2f97ab998d629182c9 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 12 Mar 2012 11:19:42 +0000 Subject: * lib/tmpdir.rb (Dir::tmpdir): test the current directory suitable for temporary directory. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/tmpdir.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/tmpdir.rb') diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index 37af025065..03c02fd788 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -18,18 +18,21 @@ class Dir # Returns the operating system's temporary file path. def Dir::tmpdir - tmp = '.' if $SAFE > 0 tmp = @@systmpdir else - for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp'] - if dir and stat = File.stat(dir) and stat.directory? and stat.writable? and + tmp = nil + for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp', '.'] + next if !dir + dir = File.expand_path(dir) + if stat = File.stat(dir) and stat.directory? and stat.writable? and (!stat.world_writable? or stat.sticky?) tmp = dir break end rescue nil end - File.expand_path(tmp) + raise ArgumentError, "could not find a temporary directory" if !tmp + tmp end end -- cgit v1.2.3