diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-23 07:24:13 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-23 07:24:13 +0000 |
commit | fbcc23a8faff983216fdf3d99614a8c4cb18c0c1 (patch) | |
tree | a33efd92aa0f6dae61482a5a765fc9dfd1511a74 /io.c | |
parent | 81031ebdcc6fb73550c91935a7c0f586a0faa1fa (diff) |
* io.c (rb_io_inspect): show fd number if there is no pathname.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 22 |
1 files changed, 18 insertions, 4 deletions
@@ -1353,15 +1353,29 @@ rb_io_inspect(VALUE obj) { rb_io_t *fptr; const char *cname; + char fd_desc[256]; + const char *path; const char *st = ""; fptr = RFILE(rb_io_taint_check(obj))->fptr; - if (!fptr || NIL_P(fptr->pathv)) return rb_any_to_s(obj); cname = rb_obj_classname(obj); - if (fptr->fd < 0) { - st = " (closed)"; + if (!fptr || NIL_P(fptr->pathv)) { + if (fptr->fd < 0) { + path = ""; + st = "(closed)"; + } + else { + snprintf(fd_desc, sizeof(fd_desc), "fd %d", fptr->fd); + path = fd_desc; + } + } + else { + path = RSTRING_PTR(fptr->pathv); + if (fptr->fd < 0) { + st = " (closed)"; + } } - return rb_sprintf("#<%s:%s%s>", cname, RSTRING_PTR(fptr->pathv), st); + return rb_sprintf("#<%s:%s%s>", cname, path, st); } /* |