Index: lib/libc/stdlib/grantpt.c =================================================================== RCS file: /home/ncvs/src/lib/libc/stdlib/grantpt.c,v retrieving revision 1.7.2.2 diff -u -d -r1.7.2.2 grantpt.c --- lib/libc/stdlib/grantpt.c 18 Dec 2007 00:35:01 -0000 1.7.2.2 +++ lib/libc/stdlib/grantpt.c 13 Jan 2008 22:23:58 -0000 @@ -56,18 +56,19 @@ #include #include "un-namespace.h" -#define PTM_PREFIX "pty" /* pseudo tty master naming convention */ -#define PTS_PREFIX "tty" /* pseudo tty slave naming convention */ -#define NEWPTS_PREFIX "pts" +#define PTYM_PREFIX "pty" /* pty(4) master naming convention */ +#define PTYS_PREFIX "tty" /* pty(4) slave naming convention */ +#define PTMXM_PREFIX "ptc/" /* pts(4) master naming convention */ +#define PTMXS_PREFIX "pts/" /* pts(4) slave naming convention */ #define PTMX "ptmx" /* * The following are range values for pseudo TTY devices. Pseudo TTYs have a * name of /dev/[pt]ty[l-sL-S][0-9a-v], yielding 256 combinations per major. */ -#define PT_MAX 256 -#define PT_DEV1 "pqrsPQRSlmnoLMNO" -#define PT_DEV2 "0123456789abcdefghijklmnopqrstuv" +#define PTY_MAX 256 +#define PTY_DEV1 "pqrsPQRSlmnoLMNO" +#define PTY_DEV2 "0123456789abcdefghijklmnopqrstuv" /* * grantpt(3) support utility. @@ -80,16 +81,8 @@ */ #define ISPTM(x) (S_ISCHR((x).st_mode) && \ minor((x).st_rdev) >= 0 && \ - minor((x).st_rdev) < PT_MAX) - - -static int -is_pts(int fd) -{ - int nb; + minor((x).st_rdev) < PTY_MAX) - return (_ioctl(fd, TIOCGPTN, &nb) == 0); -} #if 0 int @@ -104,7 +97,7 @@ if (error) { struct stat sb; - if (stat("/dev/ptmx", &sb) != 0) + if (stat(_PATH_DEV PTMX, &sb) != 0) return (0); use_pts = 1; } @@ -199,7 +192,7 @@ int posix_openpt(int oflag) { - char *mc1, *mc2, master[] = _PATH_DEV PTM_PREFIX "XY"; + char *mc1, *mc2, master[] = _PATH_DEV PTYM_PREFIX "XY"; const char *pc1, *pc2; int fildes, bflag, serrno; @@ -220,12 +213,12 @@ return (fildes); } #endif - mc1 = master + strlen(_PATH_DEV PTM_PREFIX); + mc1 = master + strlen(_PATH_DEV PTYM_PREFIX); mc2 = mc1 + 1; /* Cycle through all possible master PTY devices. */ - for (pc1 = PT_DEV1; !bflag && (*mc1 = *pc1); ++pc1) - for (pc2 = PT_DEV2; (*mc2 = *pc2) != '\0'; ++pc2) { + for (pc1 = PTY_DEV1; !bflag && (*mc1 = *pc1); ++pc1) + for (pc2 = PTY_DEV2; (*mc2 = *pc2) != '\0'; ++pc2) { /* * Break out if we successfully open a PTY, * or if open() fails due to limits. @@ -253,34 +246,44 @@ char * ptsname(int fildes) { - static char slave[] = _PATH_DEV PTS_PREFIX "XY"; - static char new_slave[] = _PATH_DEV NEWPTS_PREFIX "4294967295"; - char *retval; + static char pty_slave[] = _PATH_DEV PTYS_PREFIX "XY"; +#if 0 + static char ptmx_slave[] = _PATH_DEV PTMXS_PREFIX "4294967295"; +#endif + const char *master; struct stat sbuf; +#if 0 + int ptn; - retval = NULL; - - if (_fstat(fildes, &sbuf) == 0) { - if (!ISPTM(sbuf)) - errno = EINVAL; - else { - if (!is_pts(fildes)) { - (void)snprintf(slave, sizeof(slave), - _PATH_DEV PTS_PREFIX "%s", - devname(sbuf.st_rdev, S_IFCHR) + - strlen(PTM_PREFIX)); - retval = slave; - } else { - (void)snprintf(new_slave, sizeof(new_slave), - _PATH_DEV NEWPTS_PREFIX "%s", - devname(sbuf.st_rdev, S_IFCHR) + - strlen(PTM_PREFIX)); - retval = new_slave; - } - } + /* Handle pts(4) masters first. */ + if (_ioctl(fildes, TIOCGPTN, &ptn) == 0) { + (void)snprintf(ptmx_slave, sizeof(ptmx_slave), + _PATH_DEV PTMXS_PREFIX "%d", ptn); + return (ptmx_slave); } +#endif - return (retval); + /* All master pty's must be char devices. */ + if (_fstat(fildes, &sbuf) == -1) + goto invalid; + if (!S_ISCHR(sbuf.st_mode)) + goto invalid; + + /* Check to see if this device is a pty(4) master. */ + master = devname(sbuf.st_rdev, S_IFCHR); + if (strlen(master) != strlen(PTYM_PREFIX "XY")) + goto invalid; + if (strncmp(master, PTYM_PREFIX, strlen(PTYM_PREFIX)) != 0) + goto invalid; + + /* It is, so generate the corresponding pty(4) slave name. */ + (void)snprintf(pty_slave, sizeof(pty_slave), _PATH_DEV PTYS_PREFIX "%s", + master + strlen(PTYM_PREFIX)); + return (pty_slave); + +invalid: + errno = EINVAL; + return (NULL); } /* @@ -289,18 +292,14 @@ int unlockpt(int fildes) { - int retval; - struct stat sbuf; /* * Unlocking a master/slave pseudo-terminal pair has no meaning in a * non-streams PTY environment. However, we do ensure fildes is a * valid master pseudo-terminal device. */ - if ((retval = _fstat(fildes, &sbuf)) == 0 && !ISPTM(sbuf)) { - errno = EINVAL; - retval = -1; - } + if (ptsname(fildes) == NULL) + return (-1); - return (retval); + return (0); } Index: lib/libutil/pty.c =================================================================== RCS file: /home/ncvs/src/lib/libutil/pty.c,v retrieving revision 1.17.2.2 diff -u -d -r1.17.2.2 pty.c --- lib/libutil/pty.c 6 Dec 2007 10:15:29 -0000 1.17.2.2 +++ lib/libutil/pty.c 9 Jan 2008 14:41:48 -0000 @@ -49,13 +49,11 @@ #include #include -#if 0 -int __use_pts(void); - -static int -new_openpty(int *amaster, int *aslave, char *name, struct termios *termp, +int +openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) { + const char *slavename; int master, slave; master = posix_openpt(O_RDWR); @@ -67,7 +65,18 @@ return (-1); } - slave = open(ptsname(master), O_RDWR); + slavename = ptsname(master); + if (slavename == NULL) { + close(master); + return (-1); + } + + if (revoke(slavename) == -1) { + close(master); + return (-1); + } + + slave = open(slavename, O_RDWR); if (slave == -1) { close(master); return (-1); @@ -83,7 +92,7 @@ *aslave = slave; if (name) - strcpy(name, ptsname(master)); + strcpy(name, slavename); if (termp) tcsetattr(slave, TCSAFLUSH, termp); if (winp) @@ -91,59 +100,6 @@ return (0); } -#endif - -int -openpty(int *amaster, int *aslave, char *name, struct termios *termp, struct winsize *winp) -{ - char line[] = "/dev/ptyXX"; - const char *cp1, *cp2; - int master, slave, ttygid; - struct group *gr; - -#if 0 - if (__use_pts()) - return (new_openpty(amaster, aslave, name, termp, winp)); -#endif - - if ((gr = getgrnam("tty")) != NULL) - ttygid = gr->gr_gid; - else - ttygid = -1; - - for (cp1 = "pqrsPQRSlmnoLMNO"; *cp1; cp1++) { - line[8] = *cp1; - for (cp2 = "0123456789abcdefghijklmnopqrstuv"; *cp2; cp2++) { - line[5] = 'p'; - line[9] = *cp2; - if ((master = open(line, O_RDWR, 0)) == -1) { - if (errno == ENOENT) - break; /* try the next pty group */ - } else { - line[5] = 't'; - (void) chown(line, getuid(), ttygid); - (void) chmod(line, S_IRUSR|S_IWUSR|S_IWGRP); - (void) revoke(line); - if ((slave = open(line, O_RDWR, 0)) != -1) { - *amaster = master; - *aslave = slave; - if (name) - strcpy(name, line); - if (termp) - (void) tcsetattr(slave, - TCSAFLUSH, termp); - if (winp) - (void) ioctl(slave, TIOCSWINSZ, - (char *)winp); - return (0); - } - (void) close(master); - } - } - } - errno = ENOENT; /* out of ptys */ - return (-1); -} int forkpty(int *amaster, char *name, struct termios *termp, struct winsize *winp)