archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 33873:

Browse source 
* 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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-02-22 23:10:08 +00:00
parent 0894d6d66a
commit 9efce27a62
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Wed Feb 22 23:27:52 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/iconv/test_option.rb: enabled. [ruby-core:42802][Bug #6061] * test/iconv/test_option.rb: enabled. [ruby-core:42802][Bug #6061]

8
test/ruby/test_file.rb
View file

@ -181,4 +181,12 @@ class TestFile < Test::Unit::TestCase
} }
end 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 end

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 139 #define RUBY_PATCHLEVEL 140
#define RUBY_RELEASE_DATE "2012-02-23" #define RUBY_RELEASE_DATE "2012-02-23"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012

2
win32/win32.c
View file

@ -5705,7 +5705,7 @@ rb_w32_uchmod(const char *path, int mode)
WCHAR *wpath; WCHAR *wpath;
int ret; int ret;
if (!(wpath = filecp_to_wstr(path, NULL))) if (!(wpath = utf8_to_wstr(path, NULL)))
return -1; return -1;
ret = _wchmod(wpath, mode); ret = _wchmod(wpath, mode);
free(wpath); free(wpath);