ruby-changes:25157
From: usa <ko1@a...>
Date: Tue, 16 Oct 2012 11:11:50 +0900 (JST)
Subject: [ruby-changes:25157] usa:r37209 (ruby_1_9_3): merge revision(s) 36800: [Backport #6377]
usa 2012-10-16 11:11:36 +0900 (Tue, 16 Oct 2012) New Revision: 37209 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37209 Log: 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. Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/file.c branches/ruby_1_9_3/load.c branches/ruby_1_9_3/ruby.c branches/ruby_1_9_3/test/ruby/test_require.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 37208) +++ ruby_1_9_3/ChangeLog (revision 37209) @@ -1,3 +1,14 @@ +Tue Oct 16 10:56:55 2012 Nobuyoshi Nakada <nobu@r...> + + * 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. + Tue Oct 16 10:47:43 2012 Nobuyoshi Nakada <nobu@r...> * random.c (random_s_rand): ensure default PRNG is re-initialized Index: ruby_1_9_3/load.c =================================================================== --- ruby_1_9_3/load.c (revision 37208) +++ ruby_1_9_3/load.c (revision 37209) @@ -498,7 +498,7 @@ if (ext && !strchr(ext, '/')) { if (IS_RBEXT(ext)) { if (rb_feature_p(ftptr, ext, TRUE, FALSE, &loading)) { - if (loading) *path = rb_str_new2(loading); + if (loading) *path = rb_filesystem_str_new_cstr(loading); return 'r'; } if ((tmp = rb_find_file_safe(fname, safe_level)) != 0) { @@ -511,10 +511,10 @@ } else if (IS_SOEXT(ext)) { if (rb_feature_p(ftptr, ext, FALSE, FALSE, &loading)) { - if (loading) *path = rb_str_new2(loading); + if (loading) *path = rb_filesystem_str_new_cstr(loading); return 's'; } - tmp = rb_str_new(RSTRING_PTR(fname), ext - RSTRING_PTR(fname)); + tmp = rb_str_subseq(fname, 0, ext - RSTRING_PTR(fname)); #ifdef DLEXT2 OBJ_FREEZE(tmp); if (rb_find_file_ext_safe(&tmp, loadable_ext + 1, safe_level)) { @@ -536,7 +536,7 @@ } else if (IS_DLEXT(ext)) { if (rb_feature_p(ftptr, ext, FALSE, FALSE, &loading)) { - if (loading) *path = rb_str_new2(loading); + if (loading) *path = rb_filesystem_str_new_cstr(loading); return 's'; } if ((tmp = rb_find_file_safe(fname, safe_level)) != 0) { @@ -548,7 +548,7 @@ } } else if ((ft = rb_feature_p(ftptr, 0, FALSE, FALSE, &loading)) == 'r') { - if (loading) *path = rb_str_new2(loading); + if (loading) *path = rb_filesystem_str_new_cstr(loading); return 'r'; } tmp = fname; Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 37208) +++ ruby_1_9_3/version.h (revision 37209) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 293 +#define RUBY_PATCHLEVEL 294 #define RUBY_RELEASE_DATE "2012-10-16" #define RUBY_RELEASE_YEAR 2012 Index: ruby_1_9_3/ruby.c =================================================================== --- ruby_1_9_3/ruby.c (revision 37208) +++ ruby_1_9_3/ruby.c (revision 37209) @@ -476,12 +476,15 @@ add_modules(VALUE *req_list, const char *mod) { VALUE list = *req_list; + VALUE feature; if (!list) { *req_list = list = rb_ary_new(); RBASIC(list)->klass = 0; } - rb_ary_push(list, rb_obj_freeze(rb_str_new2(mod))); + feature = rb_str_new2(mod); + RBASIC(feature)->klass = 0; + rb_ary_push(list, feature); } static void @@ -492,6 +495,7 @@ ID require; rb_thread_t *th = GET_THREAD(); rb_block_t *prev_base_block = th->base_block; + rb_encoding *extenc = rb_default_external_encoding(); int prev_parse_in_eval = th->parse_in_eval; th->base_block = 0; th->parse_in_eval = 0; @@ -500,6 +504,9 @@ CONST_ID(require, "require"); while (list && RARRAY_LEN(list) > 0) { VALUE feature = rb_ary_shift(list); + rb_enc_associate(feature, extenc); + RBASIC(feature)->klass = rb_cString; + OBJ_FREEZE(feature); rb_funcall2(self, require, 1, &feature); } *req_list = 0; Index: ruby_1_9_3/test/ruby/test_require.rb =================================================================== --- ruby_1_9_3/test/ruby/test_require.rb (revision 37208) +++ ruby_1_9_3/test/ruby/test_require.rb (revision 37209) @@ -339,4 +339,21 @@ [], /\$LOADED_FEATURES is frozen; cannot append feature \(RuntimeError\)$/, bug3756) end + + def test_loaded_features_encoding + bug6377 = '[ruby-core:44750]' + loadpath = $:.dup + features = $".dup + $".clear + $:.clear + Dir.mktmpdir {|tmp| + $: << tmp + open(File.join(tmp, "foo.rb"), "w") {} + require "foo" + assert_equal(tmp.encoding, $"[0].encoding, bug6377) + } + ensure + $:.replace(loadpath) + $".replace(features) + end end Index: ruby_1_9_3/file.c =================================================================== --- ruby_1_9_3/file.c (revision 37208) +++ ruby_1_9_3/file.c (revision 37209) @@ -5150,6 +5150,7 @@ 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 @@ 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); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/