ruby-changes:3275
From: ko1@a...
Date: 28 Dec 2007 19:12:37 +0900
Subject: [ruby-changes:3275] akr - Ruby:r14768 (trunk): * encoding.c (rb_locale_encoding): defined.
akr 2007-12-28 19:12:13 +0900 (Fri, 28 Dec 2007)
New Revision: 14768
Modified files:
trunk/ChangeLog
trunk/encoding.c
trunk/include/ruby/encoding.h
Log:
* encoding.c (rb_locale_encoding): defined.
* include/ruby/encoding.h (rb_locale_encoding): declared.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14768&r2=14767
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/encoding.h?r1=14768&r2=14767
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=14768&r2=14767
Index: encoding.c
===================================================================
--- encoding.c (revision 14767)
+++ encoding.c (revision 14768)
@@ -853,6 +853,18 @@
return enc_table[ENCINDEX_UTF8].enc;
}
+rb_encoding *
+rb_locale_encoding(void)
+{
+ VALUE charmap = rb_locale_charmap(rb_cEncoding);
+ int idx = rb_enc_find_index(StringValueCStr(charmap));
+
+ if (idx < 0)
+ return rb_ascii8bit_encoding();
+
+ return rb_enc_from_index(idx);
+}
+
static int default_external_index;
rb_encoding *
Index: include/ruby/encoding.h
===================================================================
--- include/ruby/encoding.h (revision 14767)
+++ include/ruby/encoding.h (revision 14768)
@@ -123,6 +123,7 @@
VALUE rb_enc_from_encoding(rb_encoding *enc);
rb_encoding *rb_ascii8bit_encoding(void);
rb_encoding *rb_utf8_encoding(void);
+rb_encoding *rb_locale_encoding(void);
rb_encoding *rb_default_external_encoding(void);
VALUE rb_enc_default_external(void);
void rb_enc_set_default_external(VALUE encoding);
Index: ChangeLog
===================================================================
--- ChangeLog (revision 14767)
+++ ChangeLog (revision 14768)
@@ -1,3 +1,9 @@
+Fri Dec 28 19:11:28 2007 Tanaka Akira <akr@f...>
+
+ * encoding.c (rb_locale_encoding): defined.
+
+ * include/ruby/encoding.h (rb_locale_encoding): declared.
+
Fri Dec 28 18:45:29 2007 NAKAMURA Usaku <usa@r...>
* ext/readline/readline.c (readline_readline): set encoding to result.
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml