diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-25 08:10:23 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-25 08:10:23 +0000 |
commit | f7f7f93a03f013fb957a0e3e99237f16b5bc1fef (patch) | |
tree | bf659f16ad0a53f078185e0b19d388f3b4ee96c7 /io.c | |
parent | 7e2e3dc85d8c02672bc7486630424e7df95ef28b (diff) |
merge revision(s) 34795:
* dir.c (dir_inspect), io.c (rb_io_inspect): keep encoding of path.
[Bug #6072]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 22 |
1 files changed, 10 insertions, 12 deletions
@@ -1618,31 +1618,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, ">"); } /* |