diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | dir.c | 8 | ||||
| -rw-r--r-- | io.c | 22 | ||||
| -rw-r--r-- | test/ruby/test_dir_m17n.rb | 13 | ||||
| -rw-r--r-- | test/ruby/test_io_m17n.rb | 11 |
5 files changed, 44 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Sat Feb 25 07:53:49 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path. + [Bug #6072] + Sat Feb 25 07:53:40 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> * dir.c (dir_initialize): keep path in original encoding. @@ -485,8 +485,12 @@ dir_inspect(VALUE dir) TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp); if (!NIL_P(dirp->path)) { - const char *c = rb_obj_classname(dir); - return rb_sprintf("#<%s:%s>", c, RSTRING_PTR(dirp->path)); + VALUE str = rb_str_new_cstr("#<"); + rb_str_append(str, rb_class_name(CLASS_OF(dir))); + rb_str_cat2(str, ":"); + rb_str_append(str, dirp->path); + rb_str_cat2(str, ">"); + return str; } return rb_funcall(dir, rb_intern("to_s"), 0, 0); } @@ -1778,31 +1778,29 @@ static VALUE rb_io_inspect(VALUE obj) { rb_io_t *fptr; - const char *cname; - char fd_desc[4+sizeof(int)*3]; - const char *path; - const char *st = ""; + VALUE result; + static const char closed[] = " (closed)"; fptr = RFILE(rb_io_taint_check(obj))->fptr; if (!fptr) return rb_any_to_s(obj); - cname = rb_obj_classname(obj); + result = rb_str_new_cstr("#<"); + rb_str_append(result, rb_class_name(CLASS_OF(obj))); + rb_str_cat2(result, ":"); if (NIL_P(fptr->pathv)) { if (fptr->fd < 0) { - path = ""; - st = "(closed)"; + rb_str_cat(result, closed+1, strlen(closed)-1); } else { - snprintf(fd_desc, sizeof(fd_desc), "fd %d", fptr->fd); - path = fd_desc; + rb_str_catf(result, "fd %d", fptr->fd); } } else { - path = RSTRING_PTR(fptr->pathv); + rb_str_append(result, fptr->pathv); if (fptr->fd < 0) { - st = " (closed)"; + rb_str_cat(result, closed, strlen(closed)); } } - return rb_sprintf("#<%s:%s%s>", cname, path, st); + return rb_str_cat2(result, ">"); } /* diff --git a/test/ruby/test_dir_m17n.rb b/test/ruby/test_dir_m17n.rb index 1f5b03a905..b376393abf 100644 --- a/test/ruby/test_dir_m17n.rb +++ b/test/ruby/test_dir_m17n.rb @@ -224,5 +224,16 @@ class TestDir_M17N < Test::Unit::TestCase } assert_equal(paths.map(&:encoding), encs, bug6071) end -end + def test_inspect_nonascii + bug6072 = '[ruby-dev:45280]' + paths = ["\u{3042}".encode("sjis"), "\u{ff}".encode("iso-8859-1")] + encs = with_tmpdir { + paths.map {|path| + Dir.mkdir(path) + Dir.open(path) {|d| d.inspect.encoding} + } + } + assert_equal(paths.map(&:encoding), encs, bug6072) + end +end diff --git a/test/ruby/test_io_m17n.rb b/test/ruby/test_io_m17n.rb index 02e60fb62f..d8916433ad 100644 --- a/test/ruby/test_io_m17n.rb +++ b/test/ruby/test_io_m17n.rb @@ -2367,4 +2367,15 @@ EOT } assert_equal(paths.map(&:encoding), encs, bug6071) end + + def test_inspect_nonascii + bug6072 = '[ruby-dev:45280]' + paths = ["\u{3042}".encode("sjis"), "\u{ff}".encode("iso-8859-1")] + encs = with_tmpdir { + paths.map {|path| + open(path, "wb") {|f| f.inspect.encoding} + } + } + assert_equal(paths.map(&:encoding), encs, bug6072) + end end |