From 628559765352624df9aff2ff7d73927e0df858de Mon Sep 17 00:00:00 2001
From: luislavena <luislavena@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Nov 2012 12:46:17 +0000
Subject: 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
---
 win32/file.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'win32/file.c')

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;
     }
 
-- 
cgit v1.2.3