akr	2008-12-23 16:24:13 +0900 (Tue, 23 Dec 2008)

  New Revision: 20940

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20940

  Log:
    * io.c (rb_io_inspect): show fd number if there is no pathname.

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/test/ruby/test_io.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20939)
+++ ChangeLog	(revision 20940)
@@ -1,3 +1,7 @@
+Tue Dec 23 16:22:41 2008  Tanaka Akira  <akr@f...>
+
+	* io.c (rb_io_inspect): show fd number if there is no pathname.
+
 Tue Dec 23 15:48:55 2008  NAKAMURA Usaku  <usa@r...>
 
 	* tool/file2lastrev.rb: shouldn't use single quote in shell's command
Index: io.c
===================================================================
--- io.c	(revision 20939)
+++ io.c	(revision 20940)
@@ -1353,15 +1353,29 @@
 {
     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;
+        }
     }
-    return rb_sprintf("#<%s:%s%s>", cname, RSTRING_PTR(fptr->pathv), st);
+    else {
+        path = RSTRING_PTR(fptr->pathv);
+        if (fptr->fd < 0) {
+            st = " (closed)";
+        }
+    }
+    return rb_sprintf("#<%s:%s%s>", cname, path, st);
 }
 
 /*
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 20939)
+++ test/ruby/test_io.rb	(revision 20940)
@@ -705,7 +705,7 @@
 
   def test_inspect
     with_pipe do |r, w|
-      assert(r.inspect =~ /^#<IO:0x[0-9a-f]+>$/)
+      assert(r.inspect =~ /^#<IO:fd \d+>$/)
       assert_raise(SecurityError) do
         safe_4 { r.inspect }
       end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/