diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-16 02:11:36 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-16 02:11:36 +0000 |
| commit | e9ff4a22dfbd07ea6c54179979d937ff739eead3 (patch) | |
| tree | 03b87b343800f7dd25c718942366d1b0cc48b2f0 /file.c | |
| parent | ae5930a892da55dddc8513dde50b0dc65572ca3a (diff) | |
merge revision(s) 36800: [Backport #6377]
* file.c (rb_find_file_ext_safe, rb_find_file_safe): default to
US-ASCII for encdb and transdb.
* load.c (search_required): keep encoding of feature name. set
loading path to filesystem encoding. [Bug #6377][ruby-core:44750]
* ruby.c (add_modules, require_libraries): assume default external
encoding as well as ARGV.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
| -rw-r--r-- | file.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -5150,6 +5150,7 @@ rb_find_file_ext_safe(VALUE *filep, const char *const *ext, int safe_level) RBASIC(fname)->klass = 0; fnlen = RSTRING_LEN(fname); tmp = rb_str_tmp_new(MAXPATHLEN + 2); + rb_enc_associate_index(tmp, rb_usascii_encindex()); for (j=0; ext[j]; j++) { rb_str_cat2(fname, ext[j]); for (i = 0; i < RARRAY_LEN(load_path); i++) { @@ -5212,6 +5213,7 @@ rb_find_file_safe(VALUE path, int safe_level) long i; tmp = rb_str_tmp_new(MAXPATHLEN + 2); + rb_enc_associate_index(tmp, rb_usascii_encindex()); for (i = 0; i < RARRAY_LEN(load_path); i++) { VALUE str = RARRAY_PTR(load_path)[i]; RB_GC_GUARD(str) = rb_get_path_check(str, safe_level); |