41c4f3920e
Made mount more userfriendly (bad slashes are now filtered out)
and we remove in mount_nfs trailing slashes if there are any.
Fixed mount_xxx binarys to resolve with realpath(3)
the mountpoint.
Translate the deprecated nfs-syntax with '@' to ':' .
The ':' syntax has now precedence, but '@' still works.
Notify the user that the '@' syntax should not be used.
PR: 7846
PR: 13692
Submitted by: Martin Blapp <mb@imp.ch>
Reviewed by: phk
161 lines
4.2 KiB
C
161 lines
4.2 KiB
C
/*
|
|
* Copyright (c) 1992, 1993, 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software donated to Berkeley by
|
|
* Jan-Simon Pendry.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* 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 <miscfs/union/union.h>
|
|
|
|
#include <err.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sysexits.h>
|
|
#include <unistd.h>
|
|
|
|
#include "mntopts.h"
|
|
|
|
static struct mntopt mopts[] = {
|
|
MOPT_STDOPTS,
|
|
{ NULL }
|
|
};
|
|
|
|
static int subdir __P((const char *, const char *));
|
|
static void usage __P((void)) __dead2;
|
|
|
|
int
|
|
main(argc, argv)
|
|
int argc;
|
|
char *argv[];
|
|
{
|
|
struct union_args args;
|
|
int ch, mntflags;
|
|
char source[MAXPATHLEN];
|
|
char target[MAXPATHLEN];
|
|
struct vfsconf vfc;
|
|
int error;
|
|
|
|
mntflags = 0;
|
|
args.mntflags = UNMNT_ABOVE;
|
|
while ((ch = getopt(argc, argv, "bo:r")) != -1)
|
|
switch (ch) {
|
|
case 'b':
|
|
args.mntflags &= ~UNMNT_OPMASK;
|
|
args.mntflags |= UNMNT_BELOW;
|
|
break;
|
|
case 'o':
|
|
getmntopts(optarg, mopts, &mntflags, 0);
|
|
break;
|
|
case 'r':
|
|
args.mntflags &= ~UNMNT_OPMASK;
|
|
args.mntflags |= UNMNT_REPLACE;
|
|
break;
|
|
case '?':
|
|
default:
|
|
usage();
|
|
/* NOTREACHED */
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (argc != 2)
|
|
usage();
|
|
|
|
/* resolve both target and source with realpath(3) */
|
|
(void)checkpath(argv[0], target);
|
|
(void)checkpath(argv[1], source);
|
|
|
|
if (subdir(target, source) || subdir(source, target))
|
|
errx(EX_USAGE, "%s (%s) and %s (%s) are not distinct paths",
|
|
argv[0], target, argv[1], source);
|
|
|
|
args.target = target;
|
|
|
|
error = getvfsbyname("union", &vfc);
|
|
if (error && vfsisloadable("union")) {
|
|
if (vfsload("union"))
|
|
err(EX_OSERR, "vfsload(union)");
|
|
endvfsent(); /* flush cache */
|
|
error = getvfsbyname("union", &vfc);
|
|
}
|
|
if (error)
|
|
errx(EX_OSERR, "union filesystem is not available");
|
|
|
|
if (mount(vfc.vfc_name, source, mntflags, &args))
|
|
err(EX_OSERR, "%s", target);
|
|
exit(0);
|
|
}
|
|
|
|
int
|
|
subdir(p, dir)
|
|
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);
|
|
}
|
|
|
|
void
|
|
usage()
|
|
{
|
|
(void)fprintf(stderr,
|
|
"usage: mount_union [-br] [-o options] target_fs mount_point\n");
|
|
exit(EX_USAGE);
|
|
}
|