1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Skip path expansion for all wildcard characters

Browse Source 
* win32/file.c (replace_to_long_name): skip expansion for all wildcard
  characters.
  [ruby-core:49451] [Bug #7374]

* test/ruby/test_file_exhaustive.rb: add more assertions to test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37700 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
luislavena 2012-11-17 12:46:17 +00:00
parent ee6cfa9cca
commit 6285597653
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Nov 17 21:45:12 Luis Lavena <luislavena@gmail.com>
* win32/file.c (replace_to_long_name): skip expansion for all wildcard
characters.
[ruby-core:49451] [Bug #7374]
* test/ruby/test_file_exhaustive.rb: add more assertions to test.
Sat Nov 17 12:14:50 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/lib/psych/visitors/yaml_tree.rb: use literal YAML style

4
test/ruby/test_file_exhaustive.rb
View File

@ -662,9 +662,11 @@ class TestFileExhaustive < Test::Unit::TestCase
assert_equal("#{DRIVE}/dir", File.expand_path("#{DRIVE}/./dir"))
end
def test_expand_path_does_not_expand_wildcard
def test_expand_path_does_not_expand_wildcards
assert_equal("#{DRIVE}/*", File.expand_path("./*", "#{DRIVE}/"))
assert_equal("#{Dir.pwd}/*", File.expand_path("./*", Dir.pwd))
assert_equal("#{DRIVE}/?", File.expand_path("./?", "#{DRIVE}/"))
assert_equal("#{Dir.pwd}/?", File.expand_path("./?", Dir.pwd))
end if DRIVE
def test_expand_path_does_not_modify_the_string_argument

4
win32/file.c
View File

@ -276,8 +276,8 @@ replace_to_long_name(wchar_t **wfullpath, size_t size, int heap)
return size;
}
/* skip long name conversion if last character is a wildcard */
if (pos[size - 1] == L'*') {
/* skip long name conversion if path contains wildcard characters */
if (!wcspbrk(pos, "*?")) {
return size;
}