diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/tmpdir.rb | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Thu Feb 19 15:17:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/tmpdir.rb (@@systmpdir): File.expand_path also joins paths. + Thu Feb 19 15:14:25 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/etc/etc.c (etc_each_group): defines only when Etc::Group is diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index bcd66ab42..788ddbd1e 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -18,17 +18,16 @@ class Dir begin getdir = Win32API.new('shell32', 'SHGetFolderPath', 'LLLLP', 'L') raise RuntimeError if getdir.call(0, CSIDL_LOCAL_APPDATA, 0, 0, windir) != 0 - windir = File.expand_path(windir.rstrip) + windir.rstrip! rescue RuntimeError begin getdir = Win32API.new('kernel32', 'GetSystemWindowsDirectory', 'PL', 'L') rescue RuntimeError getdir = Win32API.new('kernel32', 'GetWindowsDirectory', 'PL', 'L') end - len = getdir.call(windir, windir.size) - windir = File.expand_path(windir[0, len]) + windir[getdir.call(windir, windir.size)..-1] = "" end - temp = File.join(windir.untaint, 'temp') + temp = File.expand_path('temp', windir.untaint) @@systmpdir = temp if File.directory?(temp) and File.writable?(temp) rescue LoadError end |