From 1c897dd14646c0898569d2a1a867197baff8229c Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Thu, 13 May 2021 14:36:08 -0400
Subject: diskdev_cmds: use libiosexec

---
 diskdev_cmds/edquota.tproj/Makefile         | 2 ++
 diskdev_cmds/edquota.tproj/edquota.c        | 2 ++
 diskdev_cmds/fsck.tproj/Makefile            | 2 ++
 diskdev_cmds/fsck.tproj/fsck.c              | 6 ++++++
 diskdev_cmds/vsdbutil.tproj/Makefile        | 2 ++
 diskdev_cmds/vsdbutil.tproj/vsdbutil_main.c | 2 ++
 6 files changed, 16 insertions(+)

diff --git a/diskdev_cmds/edquota.tproj/Makefile b/diskdev_cmds/edquota.tproj/Makefile
index 5d063c1..87c954b 100644
--- a/diskdev_cmds/edquota.tproj/Makefile
+++ b/diskdev_cmds/edquota.tproj/Makefile
@@ -1,6 +1,8 @@
 PROG=	edquota
 MAN=	edquota.8
 
+LDADD+=-liosexec
+
 BINDIR=/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/diskdev_cmds/edquota.tproj/edquota.c b/diskdev_cmds/edquota.tproj/edquota.c
index 6dad1cb..0071e76 100644
--- a/diskdev_cmds/edquota.tproj/edquota.c
+++ b/diskdev_cmds/edquota.tproj/edquota.c
@@ -96,6 +96,8 @@ __unused static char sccsid[] = "@(#)edquota.c	8.3 (Berkeley) 4/27/95";
 #include <libkern/OSByteOrder.h>
 #endif /* __APPLE__ */
 
+#include <libiosexec.h>
+
 char *qfname = QUOTAFILENAME;
 char *qfextension[] = INITQFNAMES;
 char *quotagroup = QUOTAGROUP;
diff --git a/diskdev_cmds/fsck.tproj/Makefile b/diskdev_cmds/fsck.tproj/Makefile
index 445c335..30077d0 100644
--- a/diskdev_cmds/fsck.tproj/Makefile
+++ b/diskdev_cmds/fsck.tproj/Makefile
@@ -3,6 +3,8 @@ MAN=	fsck.8
 
 CFLAGS+=-DTARGET_OS_SIMULATOR -DTARGET_OS_IPHONE=0
 
+LDADD+=-liosexec
+
 BINDIR=/sbin
 
 .include <bsd.prog.mk>
diff --git a/diskdev_cmds/fsck.tproj/fsck.c b/diskdev_cmds/fsck.tproj/fsck.c
index 9d2114b..1b3dfee 100644
--- a/diskdev_cmds/fsck.tproj/fsck.c
+++ b/diskdev_cmds/fsck.tproj/fsck.c
@@ -72,6 +72,12 @@
 #include <sys/time.h>
 #include <signal.h>
 
+/* libiosexec.h will include TargetConditionals.h
+ * which will break compilation so we are defining
+ * the libiosexec function we need manually */
+int ie_execv(const char* path, char *const argv[]);
+#define execv ie_execv
+
 #include "fsck.h"
 #include "../edt_fstab/edt_fstab.h"
 
diff --git a/diskdev_cmds/vsdbutil.tproj/Makefile b/diskdev_cmds/vsdbutil.tproj/Makefile
index 5d5a95f..621ce78 100644
--- a/diskdev_cmds/vsdbutil.tproj/Makefile
+++ b/diskdev_cmds/vsdbutil.tproj/Makefile
@@ -5,6 +5,8 @@ SRCS=	vsdbutil_main.c \
 
 .PATH: ${.CURDIR}/../mount_flags_dir
 
+LDADD+=-liosexec
+
 BINDIR=/usr/sbin
 
 .include <bsd.prog.mk>
diff --git a/diskdev_cmds/vsdbutil.tproj/vsdbutil_main.c b/diskdev_cmds/vsdbutil.tproj/vsdbutil_main.c
index c9647fe..efaf032 100644
--- a/diskdev_cmds/vsdbutil.tproj/vsdbutil_main.c
+++ b/diskdev_cmds/vsdbutil.tproj/vsdbutil_main.c
@@ -56,6 +56,8 @@
 #include <uuid/uuid.h>
 #include <System/uuid/namespace.h>
 
+#include <libiosexec.h>
+
 // This flags array is shared with the mount(8) tool. 
 #include "../mount_flags_dir/mount_flags.h"
 
-- 
cgit v1.2.3-56-ge451