From 58b331d3778bdc59557ff77ba2d93f865af3e46a Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 28 Sep 2006 11:54:37 +0000 Subject: * lib/tmpdir.rb: use return value of getdir.call for length. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11044 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/tmpdir.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 30168505f3..da6424f6f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 28 20:53:16 2006 NAKAMURA Usaku + + * lib/tmpdir.rb: use return value of getdir.call for length. + Wed Sep 27 01:04:49 2006 Nobuyoshi Nakada * lib/mkmf.rb (try_func): check function pointer first and macro next. diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index 3042ed5202..434d1bf053 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 -- cgit v1.2.3