summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-24 01:20:18 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-11-24 01:20:18 +0000
commitc796b348c6b4ce35a1dc4808881cd6177f3dfa96 (patch)
tree61a6c9935903f1e32dd0c8dba4e2b96cc2787108 /file.c
parentd7ffefb4059f95279f084d26ab04d92c7eb89975 (diff)
* file.c (file_path_convert): fix fs_encoding is not assign.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25897 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/file.c b/file.c
index 1ba1aaf942..5df3fc1c37 100644
--- a/file.c
+++ b/file.c
@@ -103,7 +103,7 @@ VALUE rb_cStat;
#define insecure_obj_p(obj, level) (level >= 4 || (level > 0 && OBJ_TAINTED(obj)))
-VALUE
+static VALUE
file_path_convert(VALUE name)
{
#ifndef _WIN32 /* non Windows == Unix */
@@ -113,7 +113,7 @@ file_path_convert(VALUE name)
/* Mac OS X's file system encoding is UTF-8 */
if (rb_usascii_encoding() != fname_encoding
&& rb_ascii8bit_encoding() != fname_encoding
- && rb_utf8_encoding() != fname_encoding
+ && (fs_encoding = rb_filesystem_encoding()) != fname_encoding
&& rb_enc_find("UTF8-MAC") != fname_encoding) {
/* Don't call rb_enc_find() before UTF-8 */
name = rb_str_conv_enc(name, fname_encoding, fs_encoding);