summaryrefslogtreecommitdiff
path: root/load.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-29 05:44:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-29 05:44:33 +0000
commitef276e959ec8a8ad0b7683176e2943058335f55c (patch)
tree1ceb41f82080f9a49fa59b95c9904dff235c1429 /load.c
parent5de3e7e2bdce598dfc7348fbe3ef8ee951058d1d (diff)
load.c: transcode path
* load.c (rb_f_load): path name needs to be transcoded to OS path encoding. [ruby-list:49994] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r--load.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/load.c b/load.c
index 3f5372c..e6a7be4 100644
--- a/load.c
+++ b/load.c
@@ -683,7 +683,7 @@ rb_load_protect(VALUE fname, int wrap, int *state)
static VALUE
rb_f_load(int argc, VALUE *argv)
{
- VALUE fname, wrap, path;
+ VALUE fname, wrap, path, orig_fname;
rb_scan_args(argc, argv, "11", &fname, &wrap);
@@ -693,10 +693,12 @@ rb_f_load(int argc, VALUE *argv)
rb_sourceline());
}
- path = rb_find_file(FilePathValue(fname));
+ orig_fname = FilePathValue(fname);
+ fname = rb_str_encode_ospath(orig_fname);
+ path = rb_find_file(fname);
if (!path) {
if (!rb_file_load_ok(RSTRING_PTR(fname)))
- load_failed(fname);
+ load_failed(orig_fname);
path = fname;
}
rb_load_internal(path, RTEST(wrap));