1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* file.c (file_path_convert): delay getting filesystem encoding

Browse Source 
while really needed.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25840 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2009-11-18 06:28:19 +00:00
parent a7db2c1efd
commit 4bfd133993
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Nov 18 15:27:20 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (file_path_convert): delay getting filesystem encoding
while really needed.
Wed Nov 18 12:33:42 2009 NARUSE, Yui <naruse@ruby-lang.org> Wed Nov 18 12:33:42 2009 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (enc_set_default_encoding): reset filesytem * encoding.c (enc_set_default_encoding): reset filesytem

6
file.c
View File

@ -107,7 +107,7 @@ VALUE
file_path_convert(VALUE name) file_path_convert(VALUE name)
{ {
rb_encoding *fname_encoding = rb_enc_from_index(ENCODING_GET(name)); rb_encoding *fname_encoding = rb_enc_from_index(ENCODING_GET(name));
rb_encoding *fs_encoding = rb_filesystem_encoding(); rb_encoding *fs_encoding;
#ifdef __APPLE__ #ifdef __APPLE__
static rb_encoding *utf8mac_encoding; static rb_encoding *utf8mac_encoding;
if (!utf8mac_encoding) if (!utf8mac_encoding)
@ -116,14 +116,14 @@ file_path_convert(VALUE name)
&& rb_ascii8bit_encoding() != fname_encoding && rb_ascii8bit_encoding() != fname_encoding
&& rb_utf8_encoding() != fname_encoding && rb_utf8_encoding() != fname_encoding
&& utf8mac_encoding != fname_encoding && utf8mac_encoding != fname_encoding
&& fs_encoding != fname_encoding) { && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) {
name = rb_str_conv_enc(name, fname_encoding, fs_encoding); name = rb_str_conv_enc(name, fname_encoding, fs_encoding);
} }
#elif !defined(_WIN32) #elif !defined(_WIN32)
if (rb_default_internal_encoding() != NULL if (rb_default_internal_encoding() != NULL
&& rb_usascii_encoding() != fname_encoding && rb_usascii_encoding() != fname_encoding
&& rb_ascii8bit_encoding() != fname_encoding && rb_ascii8bit_encoding() != fname_encoding
&& fs_encoding != fname_encoding) { && (fs_encoding = rb_filesystem_encoding()) != fname_encoding) {
name = rb_str_conv_enc(name, fname_encoding, fs_encoding); name = rb_str_conv_enc(name, fname_encoding, fs_encoding);
} }
#endif #endif