From 085d68bcc29ecddb6c48e9f32c20648db28f4417 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 18 Jun 2008 21:14:42 +0000
Subject: [PATCH] Solaris bits.
---
compat/forkpty-sunos.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/compat/forkpty-sunos.c b/compat/forkpty-sunos.c
index 27a44bc2..e333b80e 100644
--- a/compat/forkpty-sunos.c
+++ b/compat/forkpty-sunos.c
@@ -1,4 +1,4 @@
-/* $Id: forkpty-sunos.c,v 1.2 2008-06-18 20:11:25 nicm Exp $ */
+/* $Id: forkpty-sunos.c,v 1.3 2008-06-18 21:14:42 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -45,19 +45,29 @@ forkpty(int *master,
if ((slave = open(path, O_RDWR)) == -1)
goto out;
- if (ioctl(slave, I_PUSH, "ptem") == -1)
- fatal("ioctl failed");
- if (ioctl(slave, I_PUSH, "ldterm") == -1)
- fatal("ioctl failed");
-
- if (ioctl(slave, TIOCSWINSZ, ws) == -1)
- fatal("ioctl failed");
-
switch (pid = fork()) {
case -1:
goto out;
case 0:
close(*master);
+
+ setsid();
+ if (ioctl(slave, TIOCSCTTY, NULL) == -1)
+ fatal("ioctl failed");
+
+ if (ioctl(slave, I_PUSH, "ptem") == -1)
+ fatal("ioctl failed");
+ if (ioctl(slave, I_PUSH, "ldterm") == -1)
+ fatal("ioctl failed");
+
+ if (ioctl(slave, TIOCSWINSZ, ws) == -1)
+ fatal("ioctl failed");
+
+ dup2(slave, 0);
+ dup2(slave, 1);
+ dup2(slave, 2);
+ if (slave > 2)
+ close(slave);
return (0);
}