From b7df78817738fb21678b14444f823293f2dd2b52 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Wed, 1 Sep 2021 15:19:00 +0000
Subject: [PATCH] remove sys/param.h use (few small repairs)

---
 usr.sbin/makefs/cd9660.h | 8 ++++----
 usr.sbin/makefs/ffs.c    | 4 ++--
 usr.sbin/makefs/msdos.c  | 4 +---
 usr.sbin/makefs/walk.c   | 7 ++++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/usr.sbin/makefs/cd9660.h b/usr.sbin/makefs/cd9660.h
index 1889889f455..f3b8d2238be 100644
--- a/usr.sbin/makefs/cd9660.h
+++ b/usr.sbin/makefs/cd9660.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660.h,v 1.14 2017/04/09 09:58:53 natano Exp $	*/
+/*	$OpenBSD: cd9660.h,v 1.15 2021/09/01 15:19:00 deraadt Exp $	*/
 /*	$NetBSD: cd9660.h,v 1.21 2015/12/24 15:52:37 christos Exp $	*/
 
 /*
@@ -36,6 +36,9 @@
 #ifndef _MAKEFS_CD9660_H
 #define _MAKEFS_CD9660_H
 
+#include <sys/queue.h>
+#include <sys/endian.h>
+
 #include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -46,9 +49,6 @@
 #include <unistd.h>
 #include <time.h>
 #include <limits.h>
-#include <sys/queue.h>
-#include <sys/param.h>
-#include <sys/endian.h>
 
 #include "makefs.h"
 #include "cd9660/iso.h"
diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c
index 8c9c00d6dc7..6ea3896c38f 100644
--- a/usr.sbin/makefs/ffs.c
+++ b/usr.sbin/makefs/ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs.c,v 1.32 2020/04/09 16:19:00 krw Exp $	*/
+/*	$OpenBSD: ffs.c,v 1.33 2021/09/01 15:19:00 deraadt Exp $	*/
 /*	$NetBSD: ffs.c,v 1.66 2015/12/21 00:58:08 christos Exp $	*/
 
 /*
@@ -66,7 +66,7 @@
  *	@(#)ffs_alloc.c	8.19 (Berkeley) 7/13/95
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/disklabel.h>
 
 #include <assert.h>
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index 929b4b86c11..b78b1a7a2a9 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdos.c,v 1.11 2017/03/23 18:16:06 patrick Exp $	*/
+/*	$OpenBSD: msdos.c,v 1.12 2021/09/01 15:19:00 deraadt Exp $	*/
 /*	$NetBSD: msdos.c,v 1.16 2016/01/30 09:59:27 mlelstv Exp $	*/
 
 /*-
@@ -30,8 +30,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
-
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/usr.sbin/makefs/walk.c b/usr.sbin/makefs/walk.c
index e8a59ecc64a..d9bc8062006 100644
--- a/usr.sbin/makefs/walk.c
+++ b/usr.sbin/makefs/walk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: walk.c,v 1.9 2016/12/17 16:12:15 krw Exp $	*/
+/*	$OpenBSD: walk.c,v 1.10 2021/09/01 15:19:00 deraadt Exp $	*/
 /*	$NetBSD: walk.c,v 1.29 2015/11/25 00:48:49 christos Exp $	*/
 
 /*
@@ -36,13 +36,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/param.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 
 #include <assert.h>
 #include <stdio.h>
 #include <dirent.h>
 #include <stdlib.h>
+#include <limits.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -67,7 +68,7 @@ walk_dir(const char *root, const char *dir, fsnode *parent, fsnode *join)
 	fsnode		*first, *cur, *prev, *last;
 	DIR		*dirp;
 	struct dirent	*dent;
-	char		path[MAXPATHLEN + 1];
+	char		path[PATH_MAX+1];
 	struct stat	stbuf;
 	char		*name, *rp;
 	int		dot, len;
-- 
2.20.1