diff options
Diffstat (limited to 'sbin/mount_unionfs')
-rw-r--r-- | sbin/mount_unionfs/Makefile | 9 | ||||
-rw-r--r-- | sbin/mount_unionfs/mount_unionfs.8 | 2 | ||||
-rw-r--r-- | sbin/mount_unionfs/mount_unionfs.c | 18 |
3 files changed, 2 insertions, 27 deletions
diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile index 6cd7eeace1e0..35e7e8fa75b7 100644 --- a/sbin/mount_unionfs/Makefile +++ b/sbin/mount_unionfs/Makefile @@ -1,13 +1,6 @@ -# @(#)Makefile 8.3 (Berkeley) 3/27/94 - PACKAGE=runtime PROG= mount_unionfs -SRCS= mount_unionfs.c getmntopts.c MAN= mount_unionfs.8 - -MOUNT= ${.CURDIR:H}/mount -CFLAGS+=-I${MOUNT} - -.PATH: ${MOUNT} +LIBADD= util .include <bsd.prog.mk> diff --git a/sbin/mount_unionfs/mount_unionfs.8 b/sbin/mount_unionfs/mount_unionfs.8 index 879198f51a89..5469fef4ad35 100644 --- a/sbin/mount_unionfs/mount_unionfs.8 +++ b/sbin/mount_unionfs/mount_unionfs.8 @@ -28,8 +28,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" @(#)mount_union.8 8.6 (Berkeley) 3/27/94 -.\" .Dd October 3, 2016 .Dt MOUNT_UNIONFS 8 .Os diff --git a/sbin/mount_unionfs/mount_unionfs.c b/sbin/mount_unionfs/mount_unionfs.c index 9aafaf13d81f..d207e5581745 100644 --- a/sbin/mount_unionfs/mount_unionfs.c +++ b/sbin/mount_unionfs/mount_unionfs.c @@ -35,27 +35,13 @@ * SUCH DAMAGE. */ -#ifndef lint -static const char copyright[] = -"@(#) Copyright (c) 1992, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -#if 0 -static char sccsid[] = "@(#)mount_union.c 8.5 (Berkeley) 3/27/94"; -#else -static const char rcsid[] = - "$FreeBSD$"; -#endif -#endif /* not lint */ - #include <sys/param.h> #include <sys/mount.h> #include <sys/uio.h> #include <sys/errno.h> #include <err.h> +#include <mntopts.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -64,8 +50,6 @@ static const char rcsid[] = #include <grp.h> #include <pwd.h> -#include "mntopts.h" - static int subdir(const char *p, const char *dir) { |