From 4ec73a122782516ae2bc361388b0dd1a22baff3a Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Tue, 22 Feb 2022 17:35:01 +0000
Subject: [PATCH] MAXCOMLEN is no longer needed in these programs, so remove
 the annotation from sys/param.h include lines, or remove the include lines
 entirely if it this was the least requirement. ok millert

---
 lib/libkvm/kvm.c               | 5 +++--
 lib/libkvm/kvm_file2.c         | 3 +--
 lib/libkvm/kvm_proc.c          | 4 ++--
 lib/libkvm/kvm_proc2.c         | 4 ++--
 usr.bin/kdump/mksubr           | 3 +--
 usr.bin/ktrace/ktrace.c        | 3 +--
 usr.bin/ktrace/subr.c          | 4 ++--
 usr.bin/systat/pigs.c          | 4 ++--
 usr.bin/systat/vmstat.c        | 3 +--
 usr.bin/tmux/procname.c        | 3 +--
 usr.bin/top/machine.c          | 4 ++--
 usr.bin/vmstat/vmstat.c        | 3 +--
 usr.bin/w/proc_compare.c       | 4 ++--
 usr.bin/w/w.c                  | 3 +--
 usr.sbin/procmap/procmap.c     | 3 +--
 usr.sbin/pstat/pstat.c         | 4 ++--
 usr.sbin/tcpdump/print-pflog.c | 4 ++--
 17 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/lib/libkvm/kvm.c b/lib/libkvm/kvm.c
index 2309ae95cd7..38e0571fb23 100644
--- a/lib/libkvm/kvm.c
+++ b/lib/libkvm/kvm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm.c,v 1.71 2022/02/20 00:09:29 deraadt Exp $ */
+/*	$OpenBSD: kvm.c,v 1.72 2022/02/22 17:35:01 deraadt Exp $ */
 /*	$NetBSD: kvm.c,v 1.43 1996/05/05 04:31:59 gwr Exp $	*/
 
 /*-
@@ -34,7 +34,8 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN MID_MACHINE */
+#include <sys/param.h>	/* MID_MACHINE */
+#include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
 #include <sys/ioctl.h>
diff --git a/lib/libkvm/kvm_file2.c b/lib/libkvm/kvm_file2.c
index 2a01b02e9c7..a1f1f919771 100644
--- a/lib/libkvm/kvm_file2.c
+++ b/lib/libkvm/kvm_file2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_file2.c,v 1.56 2021/09/10 00:02:43 deraadt Exp $	*/
+/*	$OpenBSD: kvm_file2.c,v 1.57 2022/02/22 17:35:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 2009 Todd C. Miller <millert@openbsd.org>
@@ -54,7 +54,6 @@
 
 #define __need_process
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/uio.h>
diff --git a/lib/libkvm/kvm_proc.c b/lib/libkvm/kvm_proc.c
index c6a70507177..f077a1461c9 100644
--- a/lib/libkvm/kvm_proc.c
+++ b/lib/libkvm/kvm_proc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc.c,v 1.62 2021/09/10 00:02:43 deraadt Exp $	*/
+/*	$OpenBSD: kvm_proc.c,v 1.63 2022/02/22 17:35:01 deraadt Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #define __need_process
-#include <sys/param.h>	/* MAXCOMLEN PAGE_SIZE */
+#include <sys/param.h>	/* VM_MIN_ADDRESS PAGE_SIZE */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
diff --git a/lib/libkvm/kvm_proc2.c b/lib/libkvm/kvm_proc2.c
index 8928910f5af..a9368345dc9 100644
--- a/lib/libkvm/kvm_proc2.c
+++ b/lib/libkvm/kvm_proc2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kvm_proc2.c,v 1.37 2022/02/14 18:09:08 rob Exp $	*/
+/*	$OpenBSD: kvm_proc2.c,v 1.38 2022/02/22 17:35:01 deraadt Exp $	*/
 /*	$NetBSD: kvm_proc.c,v 1.30 1999/03/24 05:50:50 mrg Exp $	*/
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #define __need_process
-#include <sys/param.h>	/* MAXCOMLEN NODEV */
+#include <sys/param.h>	/* NODEV */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
diff --git a/usr.bin/kdump/mksubr b/usr.bin/kdump/mksubr
index 4ccbbaddefc..d997b728f18 100644
--- a/usr.bin/kdump/mksubr
+++ b/usr.bin/kdump/mksubr
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: mksubr,v 1.37 2021/09/17 15:13:50 deraadt Exp $
+# $OpenBSD: mksubr,v 1.38 2022/02/22 17:35:01 deraadt Exp $
 #
 # Copyright (c) 2006 David Kirchner <dpk@dpk.net>
 #
@@ -259,7 +259,6 @@ _EOF_
 # C start
 
 cat <<_EOF_
-#include <sys/param.h>	 /* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/event.h>
diff --git a/usr.bin/ktrace/ktrace.c b/usr.bin/ktrace/ktrace.c
index 56fb8da6a19..8a4db886672 100644
--- a/usr.bin/ktrace/ktrace.c
+++ b/usr.bin/ktrace/ktrace.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ktrace.c,v 1.38 2021/09/01 15:54:40 deraadt Exp $	*/
+/*	$OpenBSD: ktrace.c,v 1.39 2022/02/22 17:35:01 deraadt Exp $	*/
 /*	$NetBSD: ktrace.c,v 1.4 1995/08/31 23:01:44 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/stat.h>
diff --git a/usr.bin/ktrace/subr.c b/usr.bin/ktrace/subr.c
index cfc23041cd0..0c5159781ca 100644
--- a/usr.bin/ktrace/subr.c
+++ b/usr.bin/ktrace/subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr.c,v 1.15 2021/09/01 15:54:40 deraadt Exp $	*/
+/*	$OpenBSD: subr.c,v 1.16 2022/02/22 17:35:01 deraadt Exp $	*/
 /*	$NetBSD: subr.c,v 1.6 1995/08/31 23:01:45 jtc Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
+#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <sys/ktrace.h>
diff --git a/usr.bin/systat/pigs.c b/usr.bin/systat/pigs.c
index 83c65ba4ec1..b65d0239174 100644
--- a/usr.bin/systat/pigs.c
+++ b/usr.bin/systat/pigs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pigs.c,v 1.32 2019/06/28 13:35:04 deraadt Exp $	*/
+/*	$OpenBSD: pigs.c,v 1.33 2022/02/22 17:35:01 deraadt Exp $	*/
 /*	$NetBSD: pigs.c,v 1.3 1995/04/29 05:54:50 cgd Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
  * Pigs display from Bill Reeves at Lucasfilm
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
+#include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
 #include <sys/resource.h>
diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c
index e1f3fd25c37..ce22f73d9c8 100644
--- a/usr.bin/systat/vmstat.c
+++ b/usr.bin/systat/vmstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vmstat.c,v 1.93 2022/02/22 03:33:12 deraadt Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.94 2022/02/22 17:35:01 deraadt Exp $	*/
 /*	$NetBSD: vmstat.c,v 1.5 1996/05/10 23:16:40 thorpej Exp $	*/
 
 /*-
@@ -34,7 +34,6 @@
  * Cursed vmstat -- from Robert Elz.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/namei.h>
 #include <sys/signal.h>
diff --git a/usr.bin/tmux/procname.c b/usr.bin/tmux/procname.c
index 8871abfc74c..0ef484fb836 100644
--- a/usr.bin/tmux/procname.c
+++ b/usr.bin/tmux/procname.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: procname.c,v 1.19 2021/12/07 00:40:03 deraadt Exp $ */
+/* $OpenBSD: procname.c,v 1.20 2022/02/22 17:35:01 deraadt Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -16,7 +16,6 @@
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
diff --git a/usr.bin/top/machine.c b/usr.bin/top/machine.c
index 93105d6577c..079560a8d3b 100644
--- a/usr.bin/top/machine.c
+++ b/usr.bin/top/machine.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machine.c,v 1.110 2020/08/26 16:21:28 kn Exp $	 */
+/* $OpenBSD: machine.c,v 1.111 2022/02/22 17:35:01 deraadt Exp $	 */
 
 /*-
  * Copyright (c) 1994 Thorsten Lockert <tholo@sigmasoft.com>
@@ -33,7 +33,7 @@
  *	    Patch for new swapctl(2) by Tobias Weingartner <weingart@openbsd.org>
  */
 
-#include <sys/param.h>	/* DEV_BSIZE MAXCOMLEN PZERO */
+#include <sys/param.h>	/* DEV_BSIZE PZERO */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/mount.h>
diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c
index a17c8379fa7..17c8f061a8b 100644
--- a/usr.bin/vmstat/vmstat.c
+++ b/usr.bin/vmstat/vmstat.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: vmstat.c,v 1.29.4.1 1996/06/05 00:21:05 cgd Exp $	*/
-/*	$OpenBSD: vmstat.c,v 1.152 2022/02/20 00:09:29 deraadt Exp $	*/
+/*	$OpenBSD: vmstat.c,v 1.153 2022/02/22 17:35:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1980, 1986, 1991, 1993
@@ -30,7 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/time.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
diff --git a/usr.bin/w/proc_compare.c b/usr.bin/w/proc_compare.c
index 4cc4ea6459e..0018ca70c20 100644
--- a/usr.bin/w/proc_compare.c
+++ b/usr.bin/w/proc_compare.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc_compare.c,v 1.16 2022/02/20 00:09:29 deraadt Exp $	*/
+/*	$OpenBSD: proc_compare.c,v 1.17 2022/02/22 17:35:01 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
+#include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
 #include <sys/sysctl.h>
diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c
index 4060b4d38f8..92afe2c2dd0 100644
--- a/usr.bin/w/w.c
+++ b/usr.bin/w/w.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: w.c,v 1.66 2019/06/28 13:35:05 deraadt Exp $	*/
+/*	$OpenBSD: w.c,v 1.67 2022/02/22 17:35:01 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1980, 1991, 1993, 1994
@@ -35,7 +35,6 @@
  * This program is similar to the systat command on Tenex/Tops 10/20
  *
  */
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
diff --git a/usr.sbin/procmap/procmap.c b/usr.sbin/procmap/procmap.c
index be1df69f9a7..16a601eb073 100644
--- a/usr.sbin/procmap/procmap.c
+++ b/usr.sbin/procmap/procmap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procmap.c,v 1.68 2022/02/20 00:09:29 deraadt Exp $ */
+/*	$OpenBSD: procmap.c,v 1.69 2022/02/22 17:35:01 deraadt Exp $ */
 /*	$NetBSD: pmap.c,v 1.1 2002/09/01 20:32:44 atatat Exp $ */
 
 /*
@@ -34,7 +34,6 @@
 #include <sys/tree.h>
 #undef _KERNEL
 
-#include <sys/param.h>	/* MAXCOMLEN */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/exec.h>
diff --git a/usr.sbin/pstat/pstat.c b/usr.sbin/pstat/pstat.c
index 3a4c09e4298..5e24424cf83 100644
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pstat.c,v 1.128 2022/02/20 00:09:30 deraadt Exp $	*/
+/*	$OpenBSD: pstat.c,v 1.129 2022/02/22 17:35:01 deraadt Exp $	*/
 /*	$NetBSD: pstat.c,v 1.27 1996/10/23 22:50:06 cgd Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN DEV_BSIZE */
+#include <sys/param.h>	/* DEV_BSIZE */
 #include <sys/types.h>
 #include <sys/signal.h>
 #include <sys/proc.h>
diff --git a/usr.sbin/tcpdump/print-pflog.c b/usr.sbin/tcpdump/print-pflog.c
index 4f91101578a..d8c0b824334 100644
--- a/usr.sbin/tcpdump/print-pflog.c
+++ b/usr.sbin/tcpdump/print-pflog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-pflog.c,v 1.34 2021/12/01 18:28:46 deraadt Exp $	*/
+/*	$OpenBSD: print-pflog.c,v 1.35 2022/02/22 17:35:01 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996
@@ -21,7 +21,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <sys/param.h>	/* MAXCOMLEN */
+#include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <sys/file.h>
-- 
2.20.1