Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

convert to parseargs

Browse Source
This commit is contained in:
pooka 2010-03-31 13:33:14 +00:00
parent 9955f57940
commit 4ec51947cc
2 changed files with 56 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sbin/mount_kernfs/mount_kernfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mount_kernfs.c,v 1.23 2008/07/21 13:29:05 lukem Exp $ */
/* $NetBSD: mount_kernfs.c,v 1.24 2010/03/31 13:33:14 pooka Exp $ */
/*
* Copyright (c) 1992, 1993, 1994
@ -77,7 +77,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#if 0
static char sccsid[] = "@(#)mount_kernfs.c 8.3 (Berkeley) 5/4/95";
#else
__RCSID("$NetBSD: mount_kernfs.c,v 1.23 2008/07/21 13:29:05 lukem Exp $");
__RCSID("$NetBSD: mount_kernfs.c,v 1.24 2010/03/31 13:33:14 pooka Exp $");
#endif
#endif /* not lint */
@ -92,6 +92,8 @@ __RCSID("$NetBSD: mount_kernfs.c,v 1.23 2008/07/21 13:29:05 lukem Exp $");
#include <mntopts.h>
#include "mount_kernfs.h"
static const struct mntopt mopts[] = {
MOPT_STDOPTS,
MOPT_GETARGS,
@ -109,18 +111,18 @@ main(int argc, char **argv)
}
#endif
int
mount_kernfs(int argc, char *argv[])
void
mount_kernfs_parseargs(int argc, char *argv[], void *dummy, int *mntflags,
char *canon_dev, char *canon_dir)
{
int ch, mntflags;
char canon_dir[MAXPATHLEN];
int ch;
mntoptparse_t mp;
mntflags = 0;
*mntflags = 0;
while ((ch = getopt(argc, argv, "o:")) != -1)
switch (ch) {
case 'o':
mp = getmntopts(optarg, mopts, &mntflags, 0);
mp = getmntopts(optarg, mopts, mntflags, 0);
if (mp == NULL)
err(1, "getmntopts");
freemntopts(mp);
@ -136,16 +138,26 @@ mount_kernfs(int argc, char *argv[])
usage();
/* not supported, fail silently */
if (mntflags & MNT_GETARGS)
if (*mntflags & MNT_GETARGS)
exit(0);
strlcpy(canon_dev, argv[0], MAXPATHLEN);
if (realpath(argv[1], canon_dir) == NULL) /* Check mounton path */
err(1, "realpath %s", argv[1]);
if (strncmp(argv[1], canon_dir, MAXPATHLEN)) {
warnx("\"%s\" is a relative path.", argv[1]);
warnx("using \"%s\" instead.", canon_dir);
}
}
int
mount_kernfs(int argc, char *argv[])
{
char canon_dev[MAXPATHLEN], canon_dir[MAXPATHLEN];
int mntflags;
mount_kernfs_parseargs(argc, argv, NULL, &mntflags,
canon_dev, canon_dir);
if (mount(MOUNT_KERNFS, canon_dir, mntflags, NULL, 0) == -1)
err(1, "kernfs on %s", argv[1]);
exit(0);

35
sbin/mount_kernfs/mount_kernfs.h Normal file
View File

@ -0,0 +1,35 @@
/* $NetBSD: mount_kernfs.h,v 1.1 2010/03/31 13:33:14 pooka Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation. 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.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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 _SBIN_MOUNT_KERNFS_MOUNT_KERNFS_H_
#define _SBIN_MOUNT_KERNFS_MOUNT_KERNFS_H_
int mount_kernfs(int, char **);
void mount_kernfs_parseargs(int, char **, void *, int *,
char *, char *);
#endif /* _SBIN_MOUNT_KERNFS_MOUNT_KERNFS_H_ */