--- libaitio/src/pty.c 2011/09/21 13:25:19 1.1.2.6 +++ libaitio/src/pty.c 2011/09/22 22:25:12 1.1.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: pty.c,v 1.1.2.6 2011/09/21 13:25:19 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 @@ -76,17 +76,19 @@ ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict n } /* - * ioFreeTTY() Release TTY + * ioFreeTTY() Release PTY and TTY device + * @ptyfd = master fd, pty * @ttyname = tty filename * return: none */ inline void -ioFreeTTY(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); } @@ -309,16 +311,15 @@ ioForkPTY(int *ptyfd, char * __restrict name, int name LOGERR; return -1; case 0: - close(*ptyfd); - if (ioSetOwnerTTY(name, getuid(), getgid()) == -1) { - ioFreeTTY(name); + ioFreeTTY(*ptyfd, name); return -1; } if (ioSetSidTTY(&ttyfd, name) == -1) { - ioFreeTTY(name); + ioFreeTTY(*ptyfd, name); return -1; } + close(*ptyfd); /* CHILD */ break;