diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-28 11:54:37 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-09-28 11:54:37 +0000 |
| commit | 2fcb3dd2406a4a28554c2069b8cab141e24317fa (patch) | |
| tree | def53dc6fbf7c8db105de8d400ce6ea306a61110 | |
| parent | d6e3cf74e07b77c232d7650f05083021a670330c (diff) | |
| download | ruby-2fcb3dd2406a4a28554c2069b8cab141e24317fa.tar.gz ruby-2fcb3dd2406a4a28554c2069b8cab141e24317fa.tar.xz ruby-2fcb3dd2406a4a28554c2069b8cab141e24317fa.zip | |
* lib/tmpdir.rb: use return value of getdir.call for length.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/tmpdir.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Thu Sep 28 20:49:20 2006 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/tmpdir.rb: use return value of getdir.call for length. + Wed Sep 27 22:08:16 2006 Akinori MUSHA <knu@iDaemons.org> * ext/digest/md5/md5init.c (Init_md5): Now that we have digest.rb, diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index 3042ed520..434d1bf05 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -17,8 +17,8 @@ class Dir rescue RuntimeError getdir = Win32API.new('kernel32', 'GetWindowsDirectory', 'PL', 'L') end - getdir.call(windir, windir.size) - windir = File.expand_path(windir.rstrip.untaint) + len = getdir.call(windir, windir.size) + windir = File.expand_path(windir[0, len]) temp = File.join(windir, 'temp') @@systmpdir = temp if File.directory?(temp) and File.writable?(temp) rescue LoadError |