--- libaitio/src/pty.c	2011/09/19 22:41:04	1.1.2.2
+++ libaitio/src/pty.c	2011/09/22 22:25:12	1.1.2.7
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: pty.c,v 1.1.2.2 2011/09/19 22:41:04 misho Exp $
+* $Id: pty.c,v 1.1.2.7 2011/09/22 22:25:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -47,7 +47,7 @@ SUCH DAMAGE.
 
 
 /*
- * ioAllocPTY() Allocate new PTY
+ * ioAllocPTY() Allocate new PTY and TTY
  * @ptyfd = master fd, pty
  * @ttyfd = slave fd, tty
  * @name = tty device name if not null
@@ -76,17 +76,19 @@ ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict n
 }
 
 /*
- * ioFreePTY() Release PTY
+ * ioFreeTTY() Release PTY and TTY device
+ * @ptyfd = master fd, pty
  * @ttyname = tty filename
  * return: none
  */
 inline void
-ioFreePTY(const char *ttyname)
+ioFreeTTY(int ptyfd, const char *ttyname)
 {
 	assert(ttyname);
 	if (!ttyname)
 		return;
 
+	close(ptyfd);
 	chown(ttyname, (uid_t) 0, (gid_t) 0);
 	chmod(ttyname, (mode_t) 0666);
 }
@@ -119,14 +121,14 @@ ioChgWinPTY(int ptyfd, u_short row, u_short col, u_sho
 }
 
 /*
- * ioSetOwnerPTY() Set owner to PTY
+ * ioSetOwnerTTY() Set owner to TTY
  * @ttyname = tty filename
  * @UID = uid
  * @GID = gid
  * return: -1 error or 0 ok
  */
 int
-ioSetOwnerPTY(const char *ttyname, uid_t UID, gid_t GID)
+ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_t GID)
 {
 	struct group *grp;
 	gid_t gid;
@@ -165,4 +167,170 @@ ioSetOwnerPTY(const char *ttyname, uid_t UID, gid_t GI
 		}
 
 	return 0;
+}
+
+/*
+ * ioSetSidTTY() Makes the process's controlling TTY and sets it to sane modes.
+ * @ttyfd = slave fd, tty
+ * @ttyname = tty filename
+ * return: -1 error or 0 ok
+ */
+int
+ioSetSidTTY(int *ttyfd, const char *ttyname)
+{
+	int fd;
+
+	/* First disconnect from the old controlling tty. */
+#ifdef TIOCNOTTY
+	fd = open(_PATH_TTY, O_RDWR | O_NOCTTY);
+	if (fd >= 0) {
+		ioctl(fd, TIOCNOTTY, NULL);
+		close(fd);
+	}
+#endif
+	setsid();
+
+	/* Verify that we are successfully disconnected from the controlling tty. */
+	fd = open(_PATH_TTY, O_RDWR | O_NOCTTY);
+	if (fd >= 0) {
+		io_SetErr(ENXIO, "Error:: Failed to disconnect from controlling tty.");
+		close(fd);
+		return -1;
+	}
+	/* Make it our controlling tty. */
+#ifdef TIOCSCTTY
+	if (ioctl(*ttyfd, TIOCSCTTY, NULL) == -1) {
+		LOGERR;
+		return -1;
+	}
+#endif
+	fd = open(ttyname, O_RDWR);
+	if (fd == -1) {
+		LOGERR;
+		return -1;
+	} else
+		close(fd);
+
+	/* Verify that we now have a controlling tty. */
+	fd = open(_PATH_TTY, O_WRONLY);
+	if (fd == -1) {
+		LOGERR;
+		return -1;
+	} else
+		close(fd);
+
+	/* redirect standart handles to tty */
+	dup2(*ttyfd, STDIN_FILENO);
+	dup2(*ttyfd, STDOUT_FILENO);
+	dup2(*ttyfd, STDERR_FILENO);
+	if (*ttyfd > 2)
+		close(*ttyfd);
+
+	/* NOW TTY IS READY! */
+	return 0;
+}
+
+/*
+ * ioSetRAWMode() Enter into RAW mode
+ * @fd = tty fd
+ * @otio = saved old termios for later restore if !=NULL
+ * return: -1 error or 0 ok
+ */
+inline int
+ioSetRAWMode(int fd, struct termios *otio)
+{
+	struct termios tio;
+
+	if (tcgetattr(fd, &tio) == -1) {
+		LOGERR;
+		return -1;
+	}
+	if (otio)
+		*otio = tio;
+
+	tio.c_iflag |= IGNPAR;
+	tio.c_iflag &= ~(ISTRIP | INLCR | IGNCR | ICRNL | IXON | IXANY | IXOFF);
+#ifdef IUCLC
+	tio.c_iflag &= ~IUCLC;
+#endif
+	tio.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL);
+#ifdef IEXTEN
+	tio.c_lflag &= ~IEXTEN;
+#endif
+	tio.c_oflag &= ~OPOST;
+	tio.c_cc[VMIN] = 1;
+	tio.c_cc[VTIME] = 0;
+
+	if (tcsetattr(fd, TCSADRAIN, &tio) == -1) {
+		LOGERR;
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * ioRestoreMode() Restore termios to tty fd
+ * @fd = tty fd
+ * @tio = termios structure for restore
+ * return: -1 error or 0 ok
+ */
+inline int
+ioRestoreMode(int fd, struct termios tio)
+{
+	if (tcsetattr(fd, TCSADRAIN, &tio) == -1) {
+		LOGERR;
+		return -1;
+	}
+
+	return 0;
+}
+
+/*
+ * ioForkPTY() Fork new process with session leader and new TTY
+ * @ptyfd = master fd, pty
+ * @name = tty device name if not null
+ * @namesiz = name length, must be above 63 bytes.
+ * @term = termios for terminal
+ * @winz = winsize for terminal
+ * @otio = old termios structure for restore
+ * return: -1 error, 0 child process or >0 parent: pid of child
+ */
+pid_t
+ioForkPTY(int *ptyfd, char * __restrict name, int namesiz, struct termios * __restrict term, 
+		struct winsize * __restrict winz, struct termios * __restrict otio)
+{
+	int ttyfd;
+	pid_t pid;
+
+	if (ioAllocPTY(ptyfd, &ttyfd, name, namesiz, term, winz))
+		return -1;
+
+	switch ((pid = fork())) {
+		case -1:
+			LOGERR;
+			return -1;
+		case 0:
+			if (ioSetOwnerTTY(name, getuid(), getgid()) == -1) {
+				ioFreeTTY(*ptyfd, name);
+				return -1;
+			}
+			if (ioSetSidTTY(&ttyfd, name) == -1) {
+				ioFreeTTY(*ptyfd, name);
+				return -1;
+			}
+			close(*ptyfd);
+
+			/* CHILD */
+			break;
+		default:
+			close(ttyfd);
+
+			ioSetRAWMode(*ptyfd, otio);
+
+			/* PARENT */
+			break;
+	}
+
+	return pid;
 }