summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-02 07:37:13 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-02 07:37:13 +0000
commitee98d58f1c7d650706229e75f7a85b181a34a707 (patch)
treecdb6cde46268312db8a727fc6cd1327d37e9bdd0
parentac018e7b3e4f4c5e6f251f38c95d66640c1be82d (diff)
* file.c (file_expand_path): use wcscasecmp().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34871 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--file.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ed2c18f776..38fecbaab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Mar 2 16:37:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (file_expand_path): use wcscasecmp().
+
Fri Mar 2 16:36:31 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread_pthread.c (native_cond_timeout): cast explicitly to suppress
diff --git a/file.c b/file.c
index 38d2ee8ee5..9f3f72a53c 100644
--- a/file.c
+++ b/file.c
@@ -17,6 +17,7 @@
#ifdef __CYGWIN__
#include <windows.h>
#include <sys/cygwin.h>
+#include <wchar.h>
#endif
#include "ruby/ruby.h"
@@ -3193,7 +3194,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
len = lstrlenW(wfd.cFileName);
#ifdef __CYGWIN__
if (lnk_added && len > 4 &&
- wcsicmp(wfd.cFileName + len - 4, L".lnk") == 0) {
+ wcscasecmp(wfd.cFileName + len - 4, L".lnk") == 0) {
wfd.cFileName[len -= 4] = L'\0';
}
#else