From ef276e959ec8a8ad0b7683176e2943058335f55c Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 29 Oct 2014 05:44:33 +0000 Subject: 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 --- load.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'load.c') diff --git a/load.c b/load.c index 3f5372c064..e6a7be4a67 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)); -- cgit v1.2.3