diskdev_cmds: use libiosexec

diff --git a/diskdev_cmds/edquota.tproj/Makefile b/diskdev_cmds/edquota.tproj/Makefile
index 5d063c13ee24e7a7728f5bbab17b9971dfa9b7eb..87c954bde058fbb3e7f84e8dc8af484806bb4fb9 100644 (file)
--- 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 6dad1cbe611d95a24b6e3706f55c0582954a1d7a..0071e766598d830115e1c0a9829d6c911efe236c 100644 (file)
--- 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 445c335bcbbefeeb276357f7c39471ab63debe12..30077d07ee5a909ca24bff0b1f651a435d4fce9e 100644 (file)
--- 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 9d2114b8e429586fa68d14e0dbcb9c1a14d11c6d..1b3dfeedb7db02bfbf14029ac0b9de1450823dcb 100644 (file)
--- 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 5d5a95f931e7acfb03039e9ce720e2dad916f67c..621ce78df63d743233942739d03bb9d14233be48 100644 (file)
--- 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 c9647fe369d6e40e4ade70679f3fabcfb977ce78..efaf032324797a24091eb1c7170690d0fd145472 100644 (file)
--- 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"