diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-05 07:56:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-05 07:56:19 +0000 |
| commit | d75a72e037b5cfb7c6f541b7cd034ccdca700317 (patch) | |
| tree | 11d68fe551e77375c20dfc4c6f3d5d5f4aafcde4 | |
| parent | 3244930a1c0764514e9115b2c89365858c1817f5 (diff) | |
| download | ruby-d75a72e037b5cfb7c6f541b7cd034ccdca700317.tar.gz ruby-d75a72e037b5cfb7c6f541b7cd034ccdca700317.tar.xz ruby-d75a72e037b5cfb7c6f541b7cd034ccdca700317.zip | |
* lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores
non-existent directory.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/tmpdir.rb | 7 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Thu Mar 5 16:56:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores + non-existent directory. + Thu Mar 5 14:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/win32.c (rb_w32_sysinit): initializes version info first. diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index 788ddbd1e..9fd36039d 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -40,12 +40,11 @@ class Dir if $SAFE > 0 tmp = @@systmpdir else - for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], - ENV['USERPROFILE'], @@systmpdir, '/tmp'] - if dir and File.directory?(dir) and File.writable?(dir) + for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp'] + if dir and stat = File.stat(dir) and stat.directory? and stat.writable? tmp = dir break - end + end rescue nil end File.expand_path(tmp) end |