--- libaitio/src/pty.c	2011/09/21 13:25:19	1.1.2.6
+++ libaitio/src/pty.c	2011/10/31 13:53:51	1.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: pty.c,v 1.1.2.6 2011/09/21 13:25:19 misho Exp $
+* $Id: pty.c,v 1.2 2011/10/31 13:53:51 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -76,19 +76,24 @@ ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict n
 }
 
 /*
- * ioFreeTTY() Release TTY
+ * ioFreePTY() Release PTY and TTY device
+ * @ptyfd = master fd, pty (==-1 skip closing pty)
  * @ttyname = tty filename
  * return: none
  */
 inline void
-ioFreeTTY(const char *ttyname)
+ioFreePTY(int ptyfd, const char *ttyname)
 {
 	assert(ttyname);
 	if (!ttyname)
 		return;
 
-	chown(ttyname, (uid_t) 0, (gid_t) 0);
-	chmod(ttyname, (mode_t) 0666);
+	if (ptyfd != -1)
+		close(ptyfd);
+	if (ttyname) {
+		chown(ttyname, (uid_t) 0, (gid_t) 0);
+		chmod(ttyname, (mode_t) 0666);
+	}
 }
 
 /*
@@ -309,23 +314,20 @@ ioForkPTY(int *ptyfd, char * __restrict name, int name
 			LOGERR;
 			return -1;
 		case 0:
-			close(*ptyfd);
-
 			if (ioSetOwnerTTY(name, getuid(), getgid()) == -1) {
-				ioFreeTTY(name);
+				ioFreePTY(*ptyfd, name);
 				return -1;
 			}
 			if (ioSetSidTTY(&ttyfd, name) == -1) {
-				ioFreeTTY(name);
+				ioFreePTY(*ptyfd, name);
 				return -1;
 			}
+			close(*ptyfd);
 
 			/* CHILD */
 			break;
 		default:
 			close(ttyfd);
-
-			ioSetRAWMode(*ptyfd, otio);
 
 			/* PARENT */
 			break;