diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-26 04:04:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-26 04:04:23 +0000 |
commit | 8948280c67072f652eebc31bc3a2f3fb86bcca5f (patch) | |
tree | 8e433b03c6bc0f19f1a166b53d8aea0430e24c97 /ruby.c | |
parent | 2c181b6d1a0514204e049e5f37529b8b8ccfe434 (diff) |
load.c: search in OS path encoding
* load.c (rb_load_internal): use rb_load_file_str() to keep path
encoding.
* load.c (rb_require_safe): search in OS path encoding for Windows.
* ruby.c (rb_load_file_str): load file with keeping path encoding.
* win32/file.c (rb_file_load_ok): use WCHAR type API assuming incoming
path is encoded in UTF-8. [ruby-core:56136] [Bug #8676]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42183 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r-- | ruby.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1768,8 +1768,14 @@ load_file(VALUE parser, VALUE fname, int script, struct cmdline_options *opt) void * rb_load_file(const char *fname) { - struct cmdline_options opt; VALUE fname_v = rb_str_new_cstr(fname); + return rb_load_file_str(fname_v); +} + +void * +rb_load_file_str(VALUE fname_v) +{ + struct cmdline_options opt; return load_file(rb_parser_new(), fname_v, 0, cmdline_options_init(&opt)); } |