From 2395bb1159ebd26f5138e7f3acf8d5332b170543 Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 28 Mar 2018 10:52:33 +0000 Subject: merge revision(s) 62990: Ignore file separator from tmpfile/tmpdir name. From: SHIBATA Hiroshi git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@62998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/tmpdir.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb index d12afa1ae6..13ed580eb4 100644 --- a/lib/tmpdir.rb +++ b/lib/tmpdir.rb @@ -109,8 +109,10 @@ class Dir def make_tmpname((prefix, suffix), n) prefix = (String.try_convert(prefix) or raise ArgumentError, "unexpected prefix: #{prefix.inspect}") + prefix = prefix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}") suffix &&= (String.try_convert(suffix) or raise ArgumentError, "unexpected suffix: #{suffix.inspect}") + suffix &&= suffix.delete("#{File::SEPARATOR}#{File::ALT_SEPARATOR}") t = Time.now.strftime("%Y%m%d") path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}".dup path << "-#{n}" if n -- cgit v1.2.3