aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--win32/file.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f1347d6a71..7c9308619f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Nov 18 02:50:12 2012 Luis Lavena <luislavena@gmail.com>
+
+ * win32/file.c (replace_to_long_name): correct logic around wildcard
+ characters detection and ensure wide-chars are used as pattern.
+ [ruby-core:49451] [Bug #7374]
+
Sun Nov 18 02:02:46 2012 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (read_comp): modified handling of polar form.
diff --git a/win32/file.c b/win32/file.c
index 5550a5751d..dfe122480f 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -277,7 +277,7 @@ replace_to_long_name(wchar_t **wfullpath, size_t size, int heap)
}
/* skip long name conversion if path contains wildcard characters */
- if (!wcspbrk(pos, "*?")) {
+ if (wcspbrk(pos, L"*?")) {
return size;
}