From 8cfe1b37d3204622c34f7404414d8b408c345ef2 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Mon, 6 Jan 2014 05:30:34 +0100
Subject: [PATCH] ps(1): Build without <utmp.h>.

---
 bin/ps/keyword.c | 4 +---
 bin/ps/ps.c      | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bin/ps/keyword.c b/bin/ps/keyword.c
index 65c16da559..2ab6220ec6 100644
--- a/bin/ps/keyword.c
+++ b/bin/ps/keyword.c
@@ -28,7 +28,6 @@
  *
  * @(#)keyword.c	8.5 (Berkeley) 4/2/94
  * $FreeBSD: src/bin/ps/keyword.c,v 1.24.2.3 2002/10/10 20:05:32 jmallett Exp $
- * $DragonFly: src/bin/ps/keyword.c,v 1.30 2007/11/25 18:10:06 swildner Exp $
  */
 
 #include <sys/user.h>
@@ -46,7 +45,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <utmp.h>
 
 #include "ps.h"
 
@@ -73,7 +71,7 @@ int	utime(), stime(), ixrss(), idrss(), isrss();
 #define	UIDLEN	5
 #define	PIDFMT	"d"
 #define	PIDLEN	5
-#define USERLEN UT_NAMESIZE
+#define USERLEN (MAXLOGNAME-1)
 
 static const VAR var[] = {
 	{"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, 0, NULL, NULL},
diff --git a/bin/ps/ps.c b/bin/ps/ps.c
index fc91d3b137..a98a399b33 100644
--- a/bin/ps/ps.c
+++ b/bin/ps/ps.c
@@ -55,7 +55,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <pwd.h>
-#include <utmp.h>
 
 #include "ps.h"
 
@@ -469,7 +468,7 @@ main(int argc, char **argv)
 uid_t *
 getuids(const char *arg, int *nuids)
 {
-	char name[UT_NAMESIZE + 1];
+	char name[MAXLOGNAME];
 	struct passwd *pwd;
 	uid_t *uids, *moreuids;
 	size_t l;
-- 
2.41.0