summaryrefslogtreecommitdiff
path: root/win32/file.c
diff options
context:
space:
mode:
authorluislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-17 12:46:17 +0000
committerluislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-17 12:46:17 +0000
commit628559765352624df9aff2ff7d73927e0df858de (patch)
tree5a39173d894f9c97e688c7e65889d40a2413a577 /win32/file.c
parentee6cfa9cca54082d0e98751b6208a6b3626f3f44 (diff)
Skip path expansion for all wildcard characters
* 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
Diffstat (limited to 'win32/file.c')
-rw-r--r--win32/file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/win32/file.c b/win32/file.c
index 1f033c646b..5550a5751d 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -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;
}