diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_file.rb | 8 | ||||
| -rw-r--r-- | version.h | 2 | ||||
| -rw-r--r-- | win32/win32.c | 2 |
4 files changed, 16 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Thu Feb 23 08:08:23 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_uchmod): typo. [Bug#5671] [ruby-dev:44898] + + * test/ruby/test_file.rb (TestFile#test_chmod_m17n): test of above bug. + Wed Feb 22 23:27:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/iconv/test_option.rb: enabled. [ruby-core:42802][Bug #6061] diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb index ba9549fda5..765458c09e 100644 --- a/test/ruby/test_file.rb +++ b/test/ruby/test_file.rb @@ -181,4 +181,12 @@ class TestFile < Test::Unit::TestCase } end + def test_chmod_m17n + bug5671 = '[ruby-dev:44898]' + Dir.mktmpdir('test-file-chmod-m17n-') do |tmpdir| + file = File.join(tmpdir, "\u3042") + File.open(file, 'w'){} + assert_equal(File.chmod(0666, file), 1, bug5671) + end + end end @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 139 +#define RUBY_PATCHLEVEL 140 #define RUBY_RELEASE_DATE "2012-02-23" #define RUBY_RELEASE_YEAR 2012 diff --git a/win32/win32.c b/win32/win32.c index 15832a8c0a..fc6c78f234 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5705,7 +5705,7 @@ rb_w32_uchmod(const char *path, int mode) WCHAR *wpath; int ret; - if (!(wpath = filecp_to_wstr(path, NULL))) + if (!(wpath = utf8_to_wstr(path, NULL))) return -1; ret = _wchmod(wpath, mode); free(wpath); |