mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores
non-existent directory. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
90b0b8d437
commit
e691ba3bac
2 changed files with 8 additions and 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>
|
Thu Mar 5 14:52:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* win32/win32.c (rb_w32_sysinit): initializes version info first.
|
* win32/win32.c (rb_w32_sysinit): initializes version info first.
|
||||||
|
|
|
@ -40,12 +40,11 @@ class Dir
|
||||||
if $SAFE > 0
|
if $SAFE > 0
|
||||||
tmp = @@systmpdir
|
tmp = @@systmpdir
|
||||||
else
|
else
|
||||||
for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'],
|
for dir in [ENV['TMPDIR'], ENV['TMP'], ENV['TEMP'], @@systmpdir, '/tmp']
|
||||||
ENV['USERPROFILE'], @@systmpdir, '/tmp']
|
if dir and stat = File.stat(dir) and stat.directory? and stat.writable?
|
||||||
if dir and File.directory?(dir) and File.writable?(dir)
|
|
||||||
tmp = dir
|
tmp = dir
|
||||||
break
|
break
|
||||||
end
|
end rescue nil
|
||||||
end
|
end
|
||||||
File.expand_path(tmp)
|
File.expand_path(tmp)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue