archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Dec 19 21:20:23 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (file_expand_path): use wcscasecmp().
Wed Dec 19 21:15:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Dec 19 21:15:29 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_yylex): fix false usage of local variable, it cannot * parse.y (parser_yylex): fix false usage of local variable, it cannot

3
file.c
View file

@ -17,6 +17,7 @@
#ifdef __CYGWIN__ #ifdef __CYGWIN__
#include <windows.h> #include <windows.h>
#include <sys/cygwin.h> #include <sys/cygwin.h>
#include <wchar.h>
#endif #endif
#include "ruby/ruby.h" #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); len = lstrlenW(wfd.cFileName);
#ifdef __CYGWIN__ #ifdef __CYGWIN__
if (lnk_added && len > 4 && 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'; wfd.cFileName[len -= 4] = L'\0';
} }
#else #else

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 344 #define RUBY_PATCHLEVEL 345
#define RUBY_RELEASE_DATE "2012-12-19" #define RUBY_RELEASE_DATE "2012-12-19"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012