diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-16 21:28:03 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-16 21:28:03 +0000 |
commit | 48ee8924c4a97275ba29d678eb61e23e01142ea9 (patch) | |
tree | d0d182c586c99756dd611b93589f616068e9a62a | |
parent | 4b98618fb0d4943bbafe9a65c65773f3e1338216 (diff) | |
download | ruby-48ee8924c4a97275ba29d678eb61e23e01142ea9.tar.gz ruby-48ee8924c4a97275ba29d678eb61e23e01142ea9.tar.xz ruby-48ee8924c4a97275ba29d678eb61e23e01142ea9.zip |
* encoding.c (rb_filesystem_encoding): defined.
* include/ruby/encoding.h (rb_filesystem_encoding): added.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | encoding.c | 16 | ||||
-rw-r--r-- | include/ruby/encoding.h | 1 |
3 files changed, 23 insertions, 0 deletions
@@ -1,3 +1,9 @@ +Tue Jun 17 06:26:28 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c (rb_filesystem_encoding): defined. + + * include/ruby/encoding.h (rb_filesystem_encoding): added. + Tue Jun 17 06:24:28 2008 NARUSE, Yui <naruse@ruby-lang.org> * ext/syck/rubyext.c: add encoding header. diff --git a/encoding.c b/encoding.c index 0928b4b2b..305213569 100644 --- a/encoding.c +++ b/encoding.c @@ -962,6 +962,22 @@ rb_locale_encoding(void) return rb_enc_from_index(idx); } +rb_encoding * +rb_filesystem_encoding(void) +{ + static rb_encoding *enc; + if (!enc) { +#if defined _WIN32 + enc = rb_locale_encoding(); +#elif defined __APPLE__ + enc = rb_enc_find("UTF8-MAC"); +#else + enc = rb_ascii8bit_encoding(); +#endif + } + return enc; +} + static int default_external_index; rb_encoding * diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 1955a4f20..33a8fcd73 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -165,6 +165,7 @@ rb_encoding *rb_ascii8bit_encoding(void); rb_encoding *rb_utf8_encoding(void); rb_encoding *rb_usascii_encoding(void); rb_encoding *rb_locale_encoding(void); +rb_encoding *rb_filesystem_encoding(void); rb_encoding *rb_default_external_encoding(void); int rb_usascii_encindex(void); int rb_ascii8bit_encindex(void); |