diff options
Diffstat (limited to 'diskdev_cmds')
24 files changed, 160 insertions, 7 deletions
diff --git a/diskdev_cmds/Makefile b/diskdev_cmds/Makefile new file mode 100644 index 0000000..0ea0640 --- /dev/null +++ b/diskdev_cmds/Makefile @@ -0,0 +1,18 @@ +SUBDIR= dev_mkdb.tproj \ + edquota.tproj \ + fdisk.tproj \ + fsck.tproj \ + fstyp.tproj \ + fuser.tproj \ + mount_devfs.tproj \ + mount_fdesc.tproj \ + mount.tproj \ + quota.tproj \ + quotacheck.tproj \ + quotaon.tproj \ + repquota.tproj \ + setclass.tproj \ + vndevice.tproj \ + vsdbutil.tproj + +.include <bsd.subdir.mk> diff --git a/diskdev_cmds/Makefile.inc b/diskdev_cmds/Makefile.inc new file mode 100644 index 0000000..01b5f23 --- /dev/null +++ b/diskdev_cmds/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/diskdev_cmds/dev_mkdb.tproj/Makefile b/diskdev_cmds/dev_mkdb.tproj/Makefile new file mode 100644 index 0000000..141726f --- /dev/null +++ b/diskdev_cmds/dev_mkdb.tproj/Makefile @@ -0,0 +1,6 @@ +PROG= dev_mkdb +MAN= dev_mkdb.8 + +BINDIR=/usr/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/disklib/preen.c b/diskdev_cmds/disklib/preen.c index f7128e0..34a10a4 100644 --- a/diskdev_cmds/disklib/preen.c +++ b/diskdev_cmds/disklib/preen.c @@ -66,7 +66,6 @@ #include <string.h> #include <TargetConditionals.h> -#if TARGET_OS_OSX struct part { struct part *next; /* forward link of partitions on disk */ char *name; /* device name */ @@ -387,6 +386,3 @@ rawname(name) (void)strlcat(rawbuf, &dp[1], sizeof(rawbuf)); return (rawbuf); } - -#endif /* TARGET_OS_OSX */ - diff --git a/diskdev_cmds/edquota.tproj/Makefile b/diskdev_cmds/edquota.tproj/Makefile new file mode 100644 index 0000000..87c954b --- /dev/null +++ b/diskdev_cmds/edquota.tproj/Makefile @@ -0,0 +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/edt_fstab/edt_fstab.h b/diskdev_cmds/edt_fstab/edt_fstab.h index 1fd4926..ef69480 100644 --- a/diskdev_cmds/edt_fstab/edt_fstab.h +++ b/diskdev_cmds/edt_fstab/edt_fstab.h @@ -29,8 +29,6 @@ #ifndef edt_fstab_h #define edt_fstab_h -#include <TargetConditionals.h> - #if (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR) #define RAMDISK_FS_SPEC "ramdisk" diff --git a/diskdev_cmds/fdisk.tproj/Makefile b/diskdev_cmds/fdisk.tproj/Makefile new file mode 100644 index 0000000..a623892 --- /dev/null +++ b/diskdev_cmds/fdisk.tproj/Makefile @@ -0,0 +1,16 @@ +PROG= fdisk +MAN= fdisk.8 +SRCS= auto.c \ + cmd.c \ + disk.c \ + fdisk.c \ + getrawpartition.c \ + mbr.c \ + misc.c \ + opendev.c \ + part.c \ + user.c + +BINDIR=/usr/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/fsck.tproj/Makefile b/diskdev_cmds/fsck.tproj/Makefile new file mode 100644 index 0000000..3603f3a --- /dev/null +++ b/diskdev_cmds/fsck.tproj/Makefile @@ -0,0 +1,3 @@ +MAN= fsck.8 + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/fsck.tproj/fsck.c b/diskdev_cmds/fsck.tproj/fsck.c index dc44e77..1b3dfee 100644 --- a/diskdev_cmds/fsck.tproj/fsck.c +++ b/diskdev_cmds/fsck.tproj/fsck.c @@ -72,7 +72,11 @@ #include <sys/time.h> #include <signal.h> -#include <TargetConditionals.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/fstyp.tproj/Makefile b/diskdev_cmds/fstyp.tproj/Makefile new file mode 100644 index 0000000..66f4830 --- /dev/null +++ b/diskdev_cmds/fstyp.tproj/Makefile @@ -0,0 +1,19 @@ +all: + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_msdos MAN=fstyp_msdos.8 all) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_ntfs MAN=fstyp_ntfs.8 all) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_udf MAN=fstyp_udf.8 all) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp MAN=fstyp.8 all) + +clean: + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_msdos MAN=fstyp_msdos.8 clean) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_ntfs MAN=fstyp_ntfs.8 clean) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_udf MAN=fstyp_udf.8 clean) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp MAN=fstyp.8 clean) + +install: + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_msdos MAN=fstyp_msdos.8 install) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_ntfs MAN=fstyp_ntfs.8 install) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp_udf MAN=fstyp_udf.8 install) + (${MAKE} ${.MAKEFLAGS} -f progs.mk PROG=fstyp MAN=fstyp.8 install) + +.PHONY: all clean install diff --git a/diskdev_cmds/fstyp.tproj/progs.mk b/diskdev_cmds/fstyp.tproj/progs.mk new file mode 100644 index 0000000..1fe9f5f --- /dev/null +++ b/diskdev_cmds/fstyp.tproj/progs.mk @@ -0,0 +1 @@ +.include <bsd.prog.mk> diff --git a/diskdev_cmds/fuser.tproj/Makefile b/diskdev_cmds/fuser.tproj/Makefile new file mode 100644 index 0000000..19b1df9 --- /dev/null +++ b/diskdev_cmds/fuser.tproj/Makefile @@ -0,0 +1,5 @@ +SCRIPTS= fuser.pl + +BINDIR=/usr/bin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/mount.tproj/Makefile b/diskdev_cmds/mount.tproj/Makefile new file mode 100644 index 0000000..172c51d --- /dev/null +++ b/diskdev_cmds/mount.tproj/Makefile @@ -0,0 +1,5 @@ +MAN= fstab.5 + +BINDIR=/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/mount_devfs.tproj/Makefile b/diskdev_cmds/mount_devfs.tproj/Makefile new file mode 100644 index 0000000..3f4c03c --- /dev/null +++ b/diskdev_cmds/mount_devfs.tproj/Makefile @@ -0,0 +1,8 @@ +PROG= mount_devfs +MAN= + +LDADD=-lutil + +BINDIR=/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/mount_fdesc.tproj/Makefile b/diskdev_cmds/mount_fdesc.tproj/Makefile new file mode 100644 index 0000000..7ed9671 --- /dev/null +++ b/diskdev_cmds/mount_fdesc.tproj/Makefile @@ -0,0 +1,8 @@ +PROG= mount_fdesc +MAN= mount_fdesc.8 + +LDADD=-lutil + +BINDIR=/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/quota.tproj/Makefile b/diskdev_cmds/quota.tproj/Makefile new file mode 100644 index 0000000..ba137fe --- /dev/null +++ b/diskdev_cmds/quota.tproj/Makefile @@ -0,0 +1,6 @@ +PROG= quota +MAN= quota.1 + +BINDIR=/usr/bin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/quotacheck.tproj/Makefile b/diskdev_cmds/quotacheck.tproj/Makefile new file mode 100644 index 0000000..b90f20e --- /dev/null +++ b/diskdev_cmds/quotacheck.tproj/Makefile @@ -0,0 +1,9 @@ +PROG= quotacheck +MAN= quotacheck.8 +SRCS= quotacheck.c hfs_quotacheck.c preen.c + +.PATH: ${.CURDIR}/../disklib + +BINDIR=/usr/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/quotaon.tproj/Makefile b/diskdev_cmds/quotaon.tproj/Makefile new file mode 100644 index 0000000..8cda80c --- /dev/null +++ b/diskdev_cmds/quotaon.tproj/Makefile @@ -0,0 +1,8 @@ +PROG= quotaon +LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff +MAN= quotaon.8 +MLINKS= quotaon.8 quotaoff.8 + +BINDIR=/usr/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/repquota.tproj/Makefile b/diskdev_cmds/repquota.tproj/Makefile new file mode 100644 index 0000000..0cc629b --- /dev/null +++ b/diskdev_cmds/repquota.tproj/Makefile @@ -0,0 +1,6 @@ +PROG= repquota +MAN= repquota.8 + +BINDIR=/usr/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/setclass.tproj/Makefile b/diskdev_cmds/setclass.tproj/Makefile new file mode 100644 index 0000000..e9b7c86 --- /dev/null +++ b/diskdev_cmds/setclass.tproj/Makefile @@ -0,0 +1,6 @@ +PROG= setclass +MAN= setclass.8 + +BINDIR=/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/vndevice.tproj/Makefile b/diskdev_cmds/vndevice.tproj/Makefile new file mode 100644 index 0000000..740631d --- /dev/null +++ b/diskdev_cmds/vndevice.tproj/Makefile @@ -0,0 +1,6 @@ +PROG= vndevice +MAN= + +BINDIR=/sbin + +.include <bsd.prog.mk> diff --git a/diskdev_cmds/vsdbutil.tproj/Makefile b/diskdev_cmds/vsdbutil.tproj/Makefile new file mode 100644 index 0000000..621ce78 --- /dev/null +++ b/diskdev_cmds/vsdbutil.tproj/Makefile @@ -0,0 +1,12 @@ +PROG= vsdbutil +MAN= vsdbutil.8 +SRCS= vsdbutil_main.c \ + mount_flags.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" |