yugui	2008-12-26 01:33:06 +0900 (Fri, 26 Dec 2008)

  New Revision: 21057

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

  Log:
    merges r20757 from trunk into ruby_1_9_1. [ruby-dev:37560]
    * ext/pty/pty.c (child_info): add slavename.
      (chfunc): use slavename.
      (establishShell): set slavename.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/ext/pty/pty.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21056)
+++ ruby_1_9_1/ChangeLog	(revision 21057)
@@ -1,3 +1,9 @@
+Mon Dec 15 20:59:10 2008  Tanaka Akira  <akr@f...>
+
+	* ext/pty/pty.c (child_info): add slavename.
+	  (chfunc): use slavename.
+	  (establishShell): set slavename.
+	
 Tue Dec  9 13:23:18 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* vm_insnhelper.c (check_cfunc): use function pointer.
Index: ruby_1_9_1/ext/pty/pty.c
===================================================================
--- ruby_1_9_1/ext/pty/pty.c	(revision 21056)
+++ ruby_1_9_1/ext/pty/pty.c	(revision 21057)
@@ -191,6 +191,7 @@
 
 struct child_info {
     int master, slave;
+    char *slavename;
     int argc;
     VALUE *argv;
 };
@@ -240,7 +241,7 @@
     /* errors ignored for sun */
 #else
     close(slave);
-    slave = open(SlaveName, O_RDWR);
+    slave = open(carg->slavename, O_RDWR);
     if (slave < 0) {
         perror("open: pty slave");
         _exit(1);
@@ -296,6 +297,7 @@
 
     carg.master = master;
     carg.slave = slave;
+    carg.slavename = SlaveName;
     carg.argc = argc;
     carg.argv = argv;
     pid = rb_fork(0, chfunc, &carg, Qnil);

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