d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put back the openpty(3) and ptsname(3) fixes but don't disable ptsname(3)

Browse Source 
on pts(4) devices this time.  This fixes the issues while leaving pts(4)
enabled on HEAD.
This commit is contained in:
John Baldwin 2008-01-15 15:36:23 +00:00
parent 93143d572a
commit c50897c392
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=175352
2 changed files with 34 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/libc/stdlib/grantpt.c
View File

@ -75,23 +75,6 @@ __FBSDID("$FreeBSD$");
*/
#define _PATH_PTCHOWN "/usr/libexec/pt_chown"
/*
* ISPTM(x) returns 0 for struct stat x if x is not a pty master.
* The bounds checking may be unnecessary but it does eliminate doubt.
*/
#define ISPTM(x) (S_ISCHR((x).st_mode) && \
minor((x).st_rdev) >= 0 && \
minor((x).st_rdev) < PTY_MAX)
static int
is_pts(int fd)
{
int nb;
return (_ioctl(fd, TIOCGPTN, &nb) == 0);
}
int
__use_pts(void)
{
@ -252,32 +235,38 @@ ptsname(int fildes)
{
static char pty_slave[] = _PATH_DEV PTYS_PREFIX "XY";
static char ptmx_slave[] = _PATH_DEV PTMXS_PREFIX "4294967295";
char *retval;
const char *master;
struct stat sbuf;
int ptn;
retval = NULL;
if (_fstat(fildes, &sbuf) == 0) {
if (!ISPTM(sbuf))
errno = EINVAL;
else {
if (!is_pts(fildes)) {
(void)snprintf(pty_slave, sizeof(pty_slave),
_PATH_DEV PTYS_PREFIX "%s",
devname(sbuf.st_rdev, S_IFCHR) +
strlen(PTYM_PREFIX));
retval = pty_slave;
} else {
(void)snprintf(ptmx_slave, sizeof(ptmx_slave),
_PATH_DEV PTMXS_PREFIX "%s",
devname(sbuf.st_rdev, S_IFCHR) +
strlen(PTMXM_PREFIX));
retval = ptmx_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);
}
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);
}
/*
@ -286,18 +275,14 @@ ptsname(int fildes)
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);
}

58
lib/libutil/pty.c
View File

@ -49,10 +49,8 @@ static char sccsid[] = "@(#)pty.c 8.3 (Berkeley) 5/16/94";
#include <termios.h>
#include <unistd.h>
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;
@ -94,7 +92,7 @@ new_openpty(int *amaster, int *aslave, char *name, struct termios *termp,
*aslave = slave;
if (name)
strcpy(name, ptsname(master));
strcpy(name, slavename);
if (termp)
tcsetattr(slave, TCSAFLUSH, termp);
if (winp)
@ -103,56 +101,6 @@ new_openpty(int *amaster, int *aslave, char *name, struct termios *termp,
return (0);
}
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 (__use_pts())
return (new_openpty(amaster, aslave, name, termp, winp));
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)
{