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

win32/file.c: check ASCII encodings first

Browse Source 
* win32/file.c (code_page): check US-ASCII and ASCII-8bit before
  ordinary mapping.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43165 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-10-07 06:09:01 +00:00
parent 1ccaef9938
commit 1c7b42e2bc
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
win32/file.c
View File

@ -186,6 +186,11 @@ code_page(rb_encoding *enc)
if (!enc) if (!enc)
return system_code_page(); return system_code_page();
/* map US-ASCII and ASCII-8bit as code page 1252 (us-ascii) */
if (enc == rb_usascii_encoding() || enc == rb_ascii8bit_encoding()) {
return 1252;
}
enc_name = (char *)rb_enc_name(enc); enc_name = (char *)rb_enc_name(enc);
fake_str.basic.flags = T_STRING|RSTRING_NOEMBED; fake_str.basic.flags = T_STRING|RSTRING_NOEMBED;
@ -206,16 +211,6 @@ code_page(rb_encoding *enc)
if (!NIL_P(encoding)) { if (!NIL_P(encoding)) {
CONST_ID(names, "names"); CONST_ID(names, "names");
names_ary = rb_funcall(encoding, names, 0); names_ary = rb_funcall(encoding, names, 0);
}
/* map US-ASCII and ASCII-8bit as code page 1252 (us-ascii) */
if (enc == rb_usascii_encoding() || enc == rb_ascii8bit_encoding()) {
UINT code_page = 1252;
rb_hash_aset(rb_code_page, name_key, INT2FIX(code_page));
return code_page;
}
if (names_ary != Qundef) {
for (i = 0; i < RARRAY_LEN(names_ary); i++) { for (i = 0; i < RARRAY_LEN(names_ary); i++) {
name = RARRAY_PTR(names_ary)[i]; name = RARRAY_PTR(names_ary)[i];
if (strncmp("CP", RSTRING_PTR(name), 2) == 0) { if (strncmp("CP", RSTRING_PTR(name), 2) == 0) {