From owner-svn-src-all@FreeBSD.ORG  Tue Jul  5 14:12:48 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6C103106566B;
	Tue,  5 Jul 2011 14:12:48 +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 5CE288FC16;
	Tue,  5 Jul 2011 14:12:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p65ECmWt072516;
	Tue, 5 Jul 2011 14:12:48 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p65ECmhE072514;
	Tue, 5 Jul 2011 14:12:48 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201107051412.p65ECmhE072514@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Tue, 5 Jul 2011 14:12:48 +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: r223786 - head/usr.bin/w
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2011 14:12:48 -0000

Author: ed
Date: Tue Jul  5 14:12:48 2011
New Revision: 223786
URL: http://svn.freebsd.org/changeset/base/223786

Log:
  Only print entries for which ut_host points to a character device.
  
  Now that we use utmpx, we more often have entries for which the ut_line
  is left blank. To prevent us from returning struct stat for "/dev/",
  check that the resulting stat structure belongs to a character device.

Modified:
  head/usr.bin/w/w.c

Modified: head/usr.bin/w/w.c
==============================================================================
--- head/usr.bin/w/w.c	Tue Jul  5 13:45:10 2011	(r223785)
+++ head/usr.bin/w/w.c	Tue Jul  5 14:12:48 2011	(r223786)
@@ -497,7 +497,7 @@ ttystat(char *line)
 	char ttybuf[MAXPATHLEN];
 
 	(void)snprintf(ttybuf, sizeof(ttybuf), "%s%s", _PATH_DEV, line);
-	if (stat(ttybuf, &sb) == 0) {
+	if (stat(ttybuf, &sb) == 0 && S_ISCHR(sb.st_mode)) {
 		return (&sb);
 	} else
 		return (NULL);