merge revision(s) 34871: [Backport #7415]

* file.c (file_expand_path): use wcscasecmp().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@38471 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-12-19 12:20:36 +00:00
parent f19478d5e3
commit 94d2a35139
3 changed files with 7 additions and 2 deletions

3
file.c
View file

@ -17,6 +17,7 @@
#ifdef __CYGWIN__
#include <windows.h>
#include <sys/cygwin.h>
#include <wchar.h>
#endif
#include "ruby/ruby.h"
@ -3190,7 +3191,7 @@ rb_file_expand_path_internal(VALUE fname, VALUE dname, int abs_mode, int long_na
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