From owner-svn-src-all@FreeBSD.ORG  Sun Dec  6 01:29:49 2009
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 7CDFC1065672;
	Sun,  6 Dec 2009 01:29:49 +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 6C5E28FC0A;
	Sun,  6 Dec 2009 01:29:49 +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 nB61Tnfi006056;
	Sun, 6 Dec 2009 01:29:49 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB61TnVw006054;
	Sun, 6 Dec 2009 01:29:49 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <200912060129.nB61TnVw006054@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Sun, 6 Dec 2009 01:29:49 +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: r200174 - head/usr.sbin/repquota
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, 06 Dec 2009 01:29:49 -0000

Author: ed
Date: Sun Dec  6 01:29:49 2009
New Revision: 200174
URL: http://svn.freebsd.org/changeset/base/200174

Log:
  Don't depend on <utmp.h>.
  
  MAXLOGNAME seems more applicable in this case, because UT_NAMESIZE
  refers to the username field in utmp files, which is clearly unrelated
  to repquota(8).

Modified:
  head/usr.sbin/repquota/repquota.c

Modified: head/usr.sbin/repquota/repquota.c
==============================================================================
--- head/usr.sbin/repquota/repquota.c	Sun Dec  6 01:27:28 2009	(r200173)
+++ head/usr.sbin/repquota/repquota.c	Sun Dec  6 01:29:49 2009	(r200174)
@@ -60,7 +60,6 @@ __FBSDID("$FreeBSD$");
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <utmp.h>
 
 /* Let's be paranoid about block size */
 #if 10 > DEV_BSHIFT
@@ -227,9 +226,9 @@ repquota(struct fstab *fs, int type, cha
 	}
 	fclose(qf);
 	printf("%*s                 Block  limits                    File  limits\n",
-		max(UT_NAMESIZE,10), " ");
+		max(MAXLOGNAME-1,10), " ");
 	printf("%s%*s   used     soft     hard  grace     used    soft    hard  grace\n",
-		type == USRQUOTA ? "User " : "Group", max(UT_NAMESIZE,10), " ");
+		type == USRQUOTA ? "User " : "Group", max(MAXLOGNAME-1,10), " ");
 	for (id = 0; id <= highid[type]; id++) {
 		fup = lookup(id, type);
 		if (fup == 0)
@@ -237,7 +236,7 @@ repquota(struct fstab *fs, int type, cha
 		if (fup->fu_dqblk.dqb_curinodes == 0 &&
 		    fup->fu_dqblk.dqb_curblocks == 0)
 			continue;
-		printf("%-*s ", max(UT_NAMESIZE,10), fup->fu_name);
+		printf("%-*s ", max(MAXLOGNAME-1,10), fup->fu_name);
 		printf("%c%c %8lu %8lu %8lu %6s",
 			fup->fu_dqblk.dqb_bsoftlimit &&
 			    fup->fu_dqblk.dqb_curblocks >=