From owner-svn-src-head@FreeBSD.ORG  Thu Feb 12 19:00:13 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DC111065675;
	Thu, 12 Feb 2009 19:00:13 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7C3A08FC12;
	Thu, 12 Feb 2009 19:00:13 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1CJ0DnP064702;
	Thu, 12 Feb 2009 19:00:13 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1CJ0Dn8064701;
	Thu, 12 Feb 2009 19:00:13 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200902121900.n1CJ0Dn8064701@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Thu, 12 Feb 2009 19:00:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188534 - head/lib/libc/gen
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2009 19:00:14 -0000

Author: ed
Date: Thu Feb 12 19:00:13 2009
New Revision: 188534
URL: http://svn.freebsd.org/changeset/base/188534

Log:
  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.

Modified:
  head/lib/libc/gen/ttyslot.c

Modified: head/lib/libc/gen/ttyslot.c
==============================================================================
--- head/lib/libc/gen/ttyslot.c	Thu Feb 12 18:57:18 2009	(r188533)
+++ head/lib/libc/gen/ttyslot.c	Thu Feb 12 19:00:13 2009	(r188534)
@@ -33,6 +33,7 @@ static char sccsid[] = "@(#)ttyslot.c	8.
 #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);
 				}