nobu	2012-02-23 08:10:08 +0900 (Thu, 23 Feb 2012)

  New Revision: 34756

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34756

  Log:
    merge revision(s) 33873:
    
    * 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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_file.rb
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/win32.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34755)
+++ ruby_1_9_3/ChangeLog	(revision 34756)
@@ -1,3 +1,9 @@
+Thu Feb 23 08:08:23 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* test/iconv/test_option.rb: enabled.  [ruby-core:42802][Bug #6061]
Index: ruby_1_9_3/win32/win32.c
===================================================================
--- ruby_1_9_3/win32/win32.c	(revision 34755)
+++ ruby_1_9_3/win32/win32.c	(revision 34756)
@@ -5705,7 +5705,7 @@
     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);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34755)
+++ ruby_1_9_3/version.h	(revision 34756)
@@ -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
Index: ruby_1_9_3/test/ruby/test_file.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_file.rb	(revision 34755)
+++ ruby_1_9_3/test/ruby/test_file.rb	(revision 34756)
@@ -181,4 +181,12 @@
     }
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/