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

Make ttyslot(3) work with pts(4) devices.

Browse Source 
It seems ttyslot() calls rindex(), to strip the device name to the last
slash, but this is obviously invalid. /dev/pts/0 should be stripped
until pts/0. Because /etc/ttys only supports TTY names in /dev/, just
strip this piece of the pathname.
This commit is contained in:
ed 2009-02-12 19:00:13 +00:00
parent 251dd2ca41
commit df6314fc79
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libc/gen/ttyslot.c
View File

@ -33,6 +33,7 @@ static char sccsid[] = "@(#)ttyslot.c 8.1 (Berkeley) 6/4/93";
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include <paths.h>
#include <ttyent.h>
#include <stdio.h>
#include <string.h>
@ -43,19 +44,17 @@ ttyslot()
{
struct ttyent *ttyp;
int slot;
char *p;
int cnt;
char *name;
setttyent();
for (cnt = 0; cnt < 3; ++cnt)
if ( (name = ttyname(cnt)) ) {
if ( (p = rindex(name, '/')) )
++p;
else
p = name;
if (strncmp(name, _PATH_DEV, sizeof _PATH_DEV - 1) != 0)
break;
name += sizeof _PATH_DEV - 1;
for (slot = 1; (ttyp = getttyent()); ++slot)
if (!strcmp(ttyp->ty_name, p)) {
if (!strcmp(ttyp->ty_name, name)) {
endttyent();
return(slot);
}