nobu	2009-03-05 16:56:19 +0900 (Thu, 05 Mar 2009)

  New Revision: 22782

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22782

  Log:
    * lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores
      non-existent directory.

  Modified files:
    trunk/ChangeLog
    trunk/lib/tmpdir.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22781)
+++ ChangeLog	(revision 22782)
@@ -1,3 +1,8 @@
+Thu Mar  5 16:56:14 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/tmpdir.rb (Dir.tmpdir): not use USERPROFILE, and ignores
+	  non-existent directory.
+
 Thu Mar  5 14:52:46 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* win32/win32.c (rb_w32_sysinit): initializes version info first.
Index: lib/tmpdir.rb
===================================================================
--- lib/tmpdir.rb	(revision 22781)
+++ lib/tmpdir.rb	(revision 22782)
@@ -40,12 +40,11 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/