summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-26 08:49:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-07-26 08:49:31 +0000
commitc4c78f758fd50f2291cbdab221c86ef1ecaafeb9 (patch)
tree81a936d5de9591657c3b035b127b6bb7744e4d5d
parente9b8488fe5ebef4b4637fe0ab6a6a857f8ff6495 (diff)
win32/file.c: fix target encoding
* win32/file.c (fix_string_encoding): fix target encoding. the parameter `encoding' is not the target encoding but the original encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/file.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e06a4e9715..f9dfdee2b1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul 26 17:49:26 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * win32/file.c (fix_string_encoding): fix target encoding. the
+ parameter `encoding' is not the target encoding but the original
+ encoding.
+
Fri Jul 26 14:05:19 2013 Zachary Scott <e@zzak.io>
* ext/fiddle/*: [DOC] More doc on dlopen and RTLD_DEFAULT from r42184
diff --git a/win32/file.c b/win32/file.c
index c9e014a40f2..c9dd8b49a73 100644
--- a/win32/file.c
+++ b/win32/file.c
@@ -235,7 +235,7 @@ code_page(rb_encoding *enc)
return INVALID_CODE_PAGE;
}
-#define fix_string_encoding(str, encoding) rb_str_conv_enc((str), NULL, (encoding))
+#define fix_string_encoding(str, encoding) rb_str_conv_enc((str), (encoding), rb_utf8_encoding())
/*
Replace the last part of the path to long name.