From owner-svn-src-all@FreeBSD.ORG  Sun Jan 10 21:59:07 2010
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 1C0B11065672;
	Sun, 10 Jan 2010 21:59:07 +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 0B9408FC12;
	Sun, 10 Jan 2010 21:59:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0ALx6PW052801;
	Sun, 10 Jan 2010 21:59:06 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0ALx6EH052799;
	Sun, 10 Jan 2010 21:59:06 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201001102159.o0ALx6EH052799@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 10 Jan 2010 21:59:06 +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: r202049 - head/usr.bin/lastcomm
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: Sun, 10 Jan 2010 21:59:07 -0000

Author: ed
Date: Sun Jan 10 21:59:06 2010
New Revision: 202049
URL: http://svn.freebsd.org/changeset/base/202049

Log:
  Let lastcomm(1) build without <utmp.h>.
  
  Use MAXLOGNAME - 1 instead of UTNAMESIZE. There is no definition for TTY
  name sizes, at least not as low as 8, so hardcode it for now.

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

Modified: head/usr.bin/lastcomm/lastcomm.c
==============================================================================
--- head/usr.bin/lastcomm/lastcomm.c	Sun Jan 10 21:41:37 2010	(r202048)
+++ head/usr.bin/lastcomm/lastcomm.c	Sun Jan 10 21:59:06 2010	(r202049)
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <utmp.h>
 #include "pathnames.h"
 
 /*XXX*/#include <inttypes.h>
@@ -154,11 +153,11 @@ main(int argc, char *argv[])
 		if (*argv && !requested(argv, &ab))
 			continue;
 
-		(void)printf("%-*.*s %-7s %-*s %-*s",
+		(void)printf("%-*.*s %-7s %-*s %-8s",
 			     AC_COMM_LEN, AC_COMM_LEN, ab.ac_comm,
 			     flagbits(ab.ac_flagx),
-			     UT_NAMESIZE, user_from_uid(ab.ac_uid, 0),
-			     UT_LINESIZE, getdev(ab.ac_tty));
+			     MAXLOGNAME - 1, user_from_uid(ab.ac_uid, 0),
+			     getdev(ab.ac_tty));
 		
 		
 		/* user + system time */