mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-26 21:13:11 +01:00
73dd316734
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
148 lines
4.1 KiB
C
148 lines
4.1 KiB
C
/*-
|
|
* Copyright (c) 1994
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* 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
|
|
#if 0
|
|
static char sccsid[] = "@(#)getmntopts.c 8.3 (Berkeley) 3/29/95";
|
|
#else
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif
|
|
#endif /* not lint */
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sysexits.h>
|
|
|
|
#include "mntopts.h"
|
|
|
|
int getmnt_silent = 0;
|
|
|
|
void
|
|
getmntopts(options, m0, flagp, altflagp)
|
|
const char *options;
|
|
const struct mntopt *m0;
|
|
int *flagp;
|
|
int *altflagp;
|
|
{
|
|
const struct mntopt *m;
|
|
int negative, len;
|
|
char *opt, *optbuf, *p;
|
|
int *thisflagp;
|
|
|
|
/* Copy option string, since it is about to be torn asunder... */
|
|
if ((optbuf = strdup(options)) == NULL)
|
|
err(1, NULL);
|
|
|
|
for (opt = optbuf; (opt = strtok(opt, ",")) != NULL; opt = NULL) {
|
|
/* Check for "no" prefix. */
|
|
if (opt[0] == 'n' && opt[1] == 'o') {
|
|
negative = 1;
|
|
opt += 2;
|
|
} else
|
|
negative = 0;
|
|
|
|
/*
|
|
* for options with assignments in them (ie. quotas)
|
|
* ignore the assignment as it's handled elsewhere
|
|
*/
|
|
p = strchr(opt, '=');
|
|
if (p)
|
|
*++p = '\0';
|
|
|
|
/* Scan option table. */
|
|
for (m = m0; m->m_option != NULL; ++m) {
|
|
len = strlen(m->m_option);
|
|
if (strncasecmp(opt, m->m_option, len) == 0)
|
|
if ( m->m_option[len] == '\0'
|
|
|| m->m_option[len] == '='
|
|
)
|
|
break;
|
|
}
|
|
|
|
/* Save flag, or fail if option is not recognized. */
|
|
if (m->m_option) {
|
|
thisflagp = m->m_altloc ? altflagp : flagp;
|
|
if (negative == m->m_inverse)
|
|
*thisflagp |= m->m_flag;
|
|
else
|
|
*thisflagp &= ~m->m_flag;
|
|
} else if (!getmnt_silent) {
|
|
errx(1, "-o %s: option not supported", opt);
|
|
}
|
|
}
|
|
|
|
free(optbuf);
|
|
}
|
|
|
|
void
|
|
rmslashes(rrpin, rrpout)
|
|
char *rrpin;
|
|
char *rrpout;
|
|
{
|
|
char *rrpoutstart;
|
|
|
|
*rrpout = *rrpin;
|
|
for (rrpoutstart = rrpout; *rrpin != '\0'; *rrpout++ = *rrpin++) {
|
|
|
|
/* skip all double slashes */
|
|
while (*rrpin == '/' && *(rrpin + 1) == '/')
|
|
rrpin++;
|
|
}
|
|
|
|
/* remove trailing slash if necessary */
|
|
if (rrpout - rrpoutstart > 1 && *(rrpout - 1) == '/')
|
|
*(rrpout - 1) = '\0';
|
|
else
|
|
*rrpout = '\0';
|
|
}
|
|
|
|
void
|
|
checkpath(path, resolved)
|
|
const char *path;
|
|
char *resolved;
|
|
{
|
|
struct stat sb;
|
|
|
|
if (realpath(path, resolved) != NULL && stat(resolved, &sb) == 0) {
|
|
if (!S_ISDIR(sb.st_mode))
|
|
errx(EX_USAGE, "%s: not a directory", resolved);
|
|
} else
|
|
errx(EX_USAGE, "%s: %s", resolved, strerror(errno));
|
|
}
|