mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
fix [ruby-core:53079] [Bug #7996] reported and patched by mmeltner (Michael Meltner). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40003 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
33be01ca4d
commit
b7d708c3f1
2 changed files with 9 additions and 3 deletions
|
@ -1,10 +1,16 @@
|
|||
Sat Mar 30 03:58:00 2013 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
|
||||
fix [ruby-core:53079] [Bug #7996]
|
||||
reported and patched by mmeltner (Michael Meltner).
|
||||
|
||||
Sat Mar 30 03:49:21 2013 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
|
||||
because the latter fails on cross device file move of some
|
||||
environments.
|
||||
fix [ruby-core:53492] [Bug #8109]
|
||||
reported by mitchellh (Mitchell Hashimoto)
|
||||
reported by mitchellh (Mitchell Hashimoto).
|
||||
|
||||
Fri Mar 29 22:09:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
|
|
|
@ -212,9 +212,9 @@ code_page(rb_encoding *enc)
|
|||
names_ary = rb_funcall(encoding, names, 0);
|
||||
}
|
||||
|
||||
/* map US-ASCII and ASCII-8bit as code page 20127 (us-ascii) */
|
||||
/* map US-ASCII and ASCII-8bit as code page 1252 (us-ascii) */
|
||||
if (enc == rb_usascii_encoding() || enc == rb_ascii8bit_encoding()) {
|
||||
UINT code_page = 20127;
|
||||
UINT code_page = 1252;
|
||||
rb_hash_aset(rb_code_page, name_key, INT2FIX(code_page));
|
||||
return code_page;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue