ruby-changes:22745
From: nobu <ko1@a...>
Date: Sat, 25 Feb 2012 07:53:53 +0900 (JST)
Subject: [ruby-changes:22745] nobu:r34794 (trunk): * dir.c (dir_initialize): keep path in original encoding.
nobu 2012-02-25 07:53:42 +0900 (Sat, 25 Feb 2012) New Revision: 34794 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34794 Log: * dir.c (dir_initialize): keep path in original encoding. * error.c (syserr_initialize): prefer the encoding of message over locale. [ruby-dev:45279][Bug #6071] Modified files: trunk/ChangeLog trunk/dir.c trunk/error.c trunk/test/ruby/test_dir_m17n.rb trunk/test/ruby/test_io_m17n.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 34793) +++ ChangeLog (revision 34794) @@ -1,3 +1,10 @@ +Sat Feb 25 07:53:40 2012 Nobuyoshi Nakada <nobu@r...> + + * dir.c (dir_initialize): keep path in original encoding. + + * error.c (syserr_initialize): prefer the encoding of message over + locale. [ruby-dev:45279][Bug #6071] + Sat Feb 25 06:55:29 2012 Nobuyoshi Nakada <nobu@r...> * file.c (utime_internal): fix a variable missed to replace. Index: dir.c =================================================================== --- dir.c (revision 34793) +++ dir.c (revision 34794) @@ -384,7 +384,7 @@ { struct dir_data *dp; rb_encoding *fsenc; - VALUE dirname, opt; + VALUE dirname, opt, orig; static VALUE sym_enc; if (!sym_enc) { @@ -402,7 +402,9 @@ } GlobPathValue(dirname, FALSE); + orig = rb_str_dup_frozen(dirname); dirname = rb_str_encode_ospath(dirname); + dirname = rb_str_dup_frozen(dirname); TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp); if (dp->dir) closedir(dp->dir); @@ -416,10 +418,10 @@ dp->dir = opendir(RSTRING_PTR(dirname)); } if (dp->dir == NULL) { - rb_sys_fail_path(dirname); + rb_sys_fail_path(orig); } } - dp->path = rb_str_dup_frozen(dirname); + dp->path = orig; return dir; } Index: error.c =================================================================== --- error.c (revision 34793) +++ error.c (revision 34794) @@ -1212,15 +1212,13 @@ else err = "unknown error"; if (!NIL_P(mesg)) { rb_encoding *le = rb_locale_encoding(); - VALUE str = mesg; + VALUE str = StringValue(mesg); + rb_encoding *me = rb_enc_get(mesg); - StringValue(str); mesg = rb_sprintf("%s - %.*s", err, (int)RSTRING_LEN(str), RSTRING_PTR(str)); - if (le == rb_usascii_encoding()) { - rb_encoding *me = rb_enc_get(mesg); - if (le != me && rb_enc_asciicompat(me)) - le = me; + if (le != me && rb_enc_asciicompat(me)) { + le = me; }/* else assume err is non ASCII string. */ OBJ_INFECT(mesg, str); rb_enc_associate(mesg, le); Index: test/ruby/test_io_m17n.rb =================================================================== --- test/ruby/test_io_m17n.rb (revision 34793) +++ test/ruby/test_io_m17n.rb (revision 34794) @@ -2356,4 +2356,15 @@ end } end if /mswin|mingw/ =~ RUBY_PLATFORM + + def test_error_nonascii + bug6071 = '[ruby-dev:45279]' + paths = ["\u{3042}".encode("sjis"), "\u{ff}".encode("iso-8859-1")] + encs = with_tmpdir { + paths.map {|path| + open(path) rescue $!.message.encoding + } + } + assert_equal(paths.map(&:encoding), encs, bug6071) + end end Index: test/ruby/test_dir_m17n.rb =================================================================== --- test/ruby/test_dir_m17n.rb (revision 34793) +++ test/ruby/test_dir_m17n.rb (revision 34794) @@ -213,5 +213,16 @@ EOS } end + + def test_error_nonascii + bug6071 = '[ruby-dev:45279]' + paths = ["\u{3042}".encode("sjis"), "\u{ff}".encode("iso-8859-1")] + encs = with_tmpdir { + paths.map {|path| + Dir.open(path) rescue $!.message.encoding + } + } + assert_equal(paths.map(&:encoding), encs, bug6071) + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/