D26921.id78739.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26921.id78739.diff
View Options

	Index: head/sbin/mount_nullfs/mount_nullfs.c
	===================================================================
	--- head/sbin/mount_nullfs/mount_nullfs.c
	+++ head/sbin/mount_nullfs/mount_nullfs.c
	@@ -59,7 +59,6 @@

	#include "mntopts.h"

	-int subdir(const char , const char );
	static void usage(void) __dead2;

	int
	@@ -104,10 +103,6 @@
	if (checkpath(argv[1], source) != 0)
	err(EX_USAGE, "%s", source);

	- if (subdir(target, source) \|\| subdir(source, target))
	- errx(EX_USAGE, "%s (%s) and %s are not distinct paths",
	- argv[0], target, argv[1]);
	-
	build_iovec(&iov, &iovlen, "fstype", nullfs, (size_t)-1);
	build_iovec(&iov, &iovlen, "fspath", source, (size_t)-1);
	build_iovec(&iov, &iovlen, "target", target, (size_t)-1);
	@@ -119,21 +114,6 @@
	err(1, "%s", source);
	}
	exit(0);
	-}
	-
	-int
	-subdir(const char p, const char dir)
	-{
	- int l;
	-
	- l = strlen(dir);
	- if (l <= 1)
	- return (1);
	-
	- if ((strncmp(p, dir, l) == 0) && (p[l] == '/' \|\| p[l] == '\0'))
	- return (1);
	-
	- return (0);
	}

	static void