1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21057 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-25 16:33:06 +00:00
parent f14ec698b9
commit 16161acfed
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Mon Dec 15 20:59:10 2008 Tanaka Akira <akr@fsij.org>
* ext/pty/pty.c (child_info): add slavename.
(chfunc): use slavename.
(establishShell): set slavename.
Tue Dec 9 13:23:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_insnhelper.c (check_cfunc): use function pointer.

View file

@ -191,6 +191,7 @@ pty_exec(VALUE v)
struct child_info {
int master, slave;
char *slavename;
int argc;
VALUE *argv;
};
@ -240,7 +241,7 @@ chfunc(void *data)
/* 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 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
carg.master = master;
carg.slave = slave;
carg.slavename = SlaveName;
carg.argc = argc;
carg.argv = argv;
pid = rb_fork(0, chfunc, &carg, Qnil);