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

* ruby.c (locale_encoding): guestimate encoding from environment

Browse Source 
variables.  [ruby-core:13315]

* ruby.c (process_options): set primary encoding from environment.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13855 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-11-09 08:48:13 +00:00
parent 70f70f7dfe
commit 94a6c1eef9
2 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Nov 9 17:48:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (locale_encoding): guestimate encoding from environment
variables. [ruby-core:13315]
* ruby.c (process_options): set primary encoding from environment.
Fri Nov 9 16:51:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Nov 9 16:51:42 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_each_byte): should update rbuf_off and rbuf_len for * io.c (rb_io_each_byte): should update rbuf_off and rbuf_len for

39
ruby.c
View File

@ -132,6 +132,37 @@ usage(const char *name)
printf(" %s\n", *p++); printf(" %s\n", *p++);
} }
static rb_encoding *
locale_encoding(void)
{
static const char *const langs[] = {"LC_ALL", "LC_CTYPE", "LANG",};
const char *lang, *at;
int i, len, idx = 0;
char buf[32];
rb_encoding *enc;
for (i = 0; i < sizeof(langs) / sizeof(langs[0]); ++i) {
if (!(lang = getenv(langs[i]))) continue;
if (!(lang = strchr(lang, '.'))) continue;
at = strchr(++lang, '@');
if ((len = (at ? at - lang : strlen(lang))) >= sizeof(buf) - 1) continue;
MEMCPY(buf, lang, char, len);
buf[len] = 0;
idx = rb_enc_find_index(buf);
if (idx < 0 && len > 3 &&
(strncasecmp(buf, "euc", 3) == 0 ||
strncasecmp(buf, "utf", 3) == 0) &&
buf[3]) {
MEMMOVE(buf + 4, buf + 3, char, len - 2);
buf[3] = '-';
idx = rb_enc_find_index(buf);
}
enc = rb_enc_from_index(idx);
if (enc) return enc;
}
return rb_enc_default();
}
extern VALUE rb_load_path; extern VALUE rb_load_path;
#ifndef CharNext /* defined as CharNext[AW] on Windows. */ #ifndef CharNext /* defined as CharNext[AW] on Windows. */
@ -850,7 +881,7 @@ process_options(VALUE arg)
char **argv = opt->argv; char **argv = opt->argv;
NODE *tree = 0; NODE *tree = 0;
VALUE parser; VALUE parser;
VALUE encoding; rb_encoding *enc;
const char *s; const char *s;
int i = proc_options(argc, argv, opt); int i = proc_options(argc, argv, opt);
@ -979,12 +1010,12 @@ process_options(VALUE arg)
} }
if (opt->enc_index >= 0) { if (opt->enc_index >= 0) {
encoding = rb_enc_from_encoding(rb_enc_from_index(opt->enc_index)); enc = rb_enc_from_index(opt->enc_index);
} }
else { else {
encoding = rb_parser_encoding(parser); enc = locale_encoding();
} }
rb_set_primary_encoding(encoding); rb_set_primary_encoding(rb_enc_from_encoding(enc));
return (VALUE)tree; return (VALUE)tree;
} }