diff options
author | ed <ed@FreeBSD.org> | 2009-02-12 19:00:13 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2009-02-12 19:00:13 +0000 |
commit | df6314fc7947b16e5c38f201c2264d2a92778156 (patch) | |
tree | bea7cb06b1ccf5fcb4c1213010f6713590a9fad7 /lib/libc/gen/ttyslot.c | |
parent | 251dd2ca418183142f0f78ada90a77fa46a3b88f (diff) | |
download | FreeBSD-src-df6314fc7947b16e5c38f201c2264d2a92778156.zip FreeBSD-src-df6314fc7947b16e5c38f201c2264d2a92778156.tar.gz |
Make ttyslot(3) work with pts(4) devices.
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.
Diffstat (limited to 'lib/libc/gen/ttyslot.c')
-rw-r--r-- | lib/libc/gen/ttyslot.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/libc/gen/ttyslot.c b/lib/libc/gen/ttyslot.c index a434626..31cc156 100644 --- a/lib/libc/gen/ttyslot.c +++ b/lib/libc/gen/ttyslot.c @@ -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); } |