From e1c33162cf821b5251559564242e0d91ad29a79c Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 1 Mar 2010 14:28:04 +0000
Subject: [PATCH] * ext/pty/pty.c (pty_open): refine the path for master IO.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog     |  4 ++++
 ext/pty/pty.c | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1bd107ab16..4eea88bddf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar  1 23:26:56 2010  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pty/pty.c (pty_open): refine the path for master IO.
+
 Mon Mar  1 20:07:06 2010  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
 
 	* ext/zlib/zlib.c (zstream_expand_buffer_into): remove compare different type values warning.
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index cd7aa88f77..9650f533f2 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -453,7 +453,7 @@ pty_close_pty(VALUE assoc)
  * The path name of the terminal device can be gotten by slave_file.path.
  *
  *   PTY.open {|m, s|
- *     p m      #=> #<IO: pty /dev/pts/1>
+ *     p m      #=> #<IO:masterpty:/dev/pts/1>
  *     p s      #=> #<File:/dev/pts/1>
  *     p s.path #=> "/dev/pts/1"
  *   }
@@ -472,6 +472,14 @@ pty_close_pty(VALUE assoc)
  *   p m.gets #=> "42: 2 3 7\n"
  *   w.puts "144"
  *   p m.gets #=> "144: 2 2 2 2 3 3\n"
+ *   w.close
+ *   # The result of read operation when pty slave is closed is platform dependnet.
+ *   ret = begin
+ *           m.gets          # FreeBSD returns nil.
+ *         rescue Errno::EIO # GNU/Linux raises EIO.
+ *           nil
+ *         end
+ *   p ret #=> nil
  *
  */
 static VALUE
@@ -489,7 +497,7 @@ pty_open(VALUE klass)
     MakeOpenFile(master_io, master_fptr);
     master_fptr->mode = FMODE_READWRITE | FMODE_SYNC | FMODE_DUPLEX;
     master_fptr->fd = master_fd;
-    master_fptr->pathv = rb_obj_freeze(rb_sprintf(" pty %s", slavename));
+    master_fptr->pathv = rb_obj_freeze(rb_sprintf("masterpty:%s", slavename));
 
     slave_file = rb_obj_alloc(rb_cFile);
     MakeOpenFile(slave_file, slave_fptr);