d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated mount_msdos to use the Lite2 getvfsbyname() interface.

Browse Source
This commit is contained in:
bde 1997-03-03 13:23:54 +00:00
parent 1d929b9ddb
commit 7de8df2b4b
6 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/i386/mount_msdos/Makefile
View File

@ -1,5 +1,5 @@
#
# $Id$
# $Id: Makefile,v 1.4 1997/02/22 14:32:29 peter Exp $
#
PROG= mount_msdos
@ -10,6 +10,7 @@ BINOWN= root
BINMODE= 4555
MOUNT= ${.CURDIR}/../../mount
CFLAGS+= -D_NEW_VFSCONF
CFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}

23
sbin/i386/mount_msdos/mount_msdos.c
View File

@ -30,14 +30,15 @@
#ifndef lint
static const char rcsid[] =
"$Id$";
"$Id: mount_msdos.c,v 1.7 1997/02/22 14:32:30 peter Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
#include <sys/param.h>
#define MSDOSFS
#include <sys/mount.h>
#include <sys/stat.h>
#include <msdosfs/msdosfsmount.h>
#include <ctype.h>
#include <err.h>
#include <grp.h>
@ -67,9 +68,9 @@ main(argc, argv)
{
struct msdosfs_args args;
struct stat sb;
int c, mntflags, set_gid, set_uid, set_mask;
int c, error, mntflags, set_gid, set_uid, set_mask;
char *dev, *dir, ndir[MAXPATHLEN+1];
struct vfsconf *vfc;
struct vfsconf vfc;
mntflags = set_gid = set_uid = set_mask = 0;
(void)memset(&args, '\0', sizeof(args));
@ -131,17 +132,17 @@ main(argc, argv)
args.mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
}
vfc = getvfsbyname("msdos");
if(!vfc && vfsisloadable("msdos")) {
if(vfsload("msdos"))
error = getvfsbyname("msdos", &vfc);
if (error && vfsisloadable("msdos")) {
if (vfsload("msdos"))
err(EX_OSERR, "vfsload(msdos)");
endvfsent(); /* clear cache */
vfc = getvfsbyname("msdos");
error = getvfsbyname("msdos", &vfc);
}
if (!vfc)
if (error)
errx(EX_OSERR, "msdos filesystem is not available");
if (mount(vfc->vfc_index, dir, mntflags, &args) < 0)
if (mount(vfc.vfc_name, dir, mntflags, &args) < 0)
err(EX_OSERR, "%s", dev);
exit (0);

3
sbin/mount_msdos/Makefile
View File

@ -1,5 +1,5 @@
#
# $Id$
# $Id: Makefile,v 1.4 1997/02/22 14:32:29 peter Exp $
#
PROG= mount_msdos
@ -10,6 +10,7 @@ BINOWN= root
BINMODE= 4555
MOUNT= ${.CURDIR}/../../mount
CFLAGS+= -D_NEW_VFSCONF
CFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}

23
sbin/mount_msdos/mount_msdos.c
View File

@ -30,14 +30,15 @@
#ifndef lint
static const char rcsid[] =
"$Id$";
"$Id: mount_msdos.c,v 1.7 1997/02/22 14:32:30 peter Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
#include <sys/param.h>
#define MSDOSFS
#include <sys/mount.h>
#include <sys/stat.h>
#include <msdosfs/msdosfsmount.h>
#include <ctype.h>
#include <err.h>
#include <grp.h>
@ -67,9 +68,9 @@ main(argc, argv)
{
struct msdosfs_args args;
struct stat sb;
int c, mntflags, set_gid, set_uid, set_mask;
int c, error, mntflags, set_gid, set_uid, set_mask;
char *dev, *dir, ndir[MAXPATHLEN+1];
struct vfsconf *vfc;
struct vfsconf vfc;
mntflags = set_gid = set_uid = set_mask = 0;
(void)memset(&args, '\0', sizeof(args));
@ -131,17 +132,17 @@ main(argc, argv)
args.mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
}
vfc = getvfsbyname("msdos");
if(!vfc && vfsisloadable("msdos")) {
if(vfsload("msdos"))
error = getvfsbyname("msdos", &vfc);
if (error && vfsisloadable("msdos")) {
if (vfsload("msdos"))
err(EX_OSERR, "vfsload(msdos)");
endvfsent(); /* clear cache */
vfc = getvfsbyname("msdos");
error = getvfsbyname("msdos", &vfc);
}
if (!vfc)
if (error)
errx(EX_OSERR, "msdos filesystem is not available");
if (mount(vfc->vfc_index, dir, mntflags, &args) < 0)
if (mount(vfc.vfc_name, dir, mntflags, &args) < 0)
err(EX_OSERR, "%s", dev);
exit (0);

3
sbin/mount_msdosfs/Makefile
View File

@ -1,5 +1,5 @@
#
# $Id$
# $Id: Makefile,v 1.4 1997/02/22 14:32:29 peter Exp $
#
PROG= mount_msdos
@ -10,6 +10,7 @@ BINOWN= root
BINMODE= 4555
MOUNT= ${.CURDIR}/../../mount
CFLAGS+= -D_NEW_VFSCONF
CFLAGS+= -I${MOUNT}
.PATH: ${MOUNT}

23
sbin/mount_msdosfs/mount_msdosfs.c
View File

@ -30,14 +30,15 @@
#ifndef lint
static const char rcsid[] =
"$Id$";
"$Id: mount_msdos.c,v 1.7 1997/02/22 14:32:30 peter Exp $";
#endif /* not lint */
#include <sys/cdefs.h>
#include <sys/param.h>
#define MSDOSFS
#include <sys/mount.h>
#include <sys/stat.h>
#include <msdosfs/msdosfsmount.h>
#include <ctype.h>
#include <err.h>
#include <grp.h>
@ -67,9 +68,9 @@ main(argc, argv)
{
struct msdosfs_args args;
struct stat sb;
int c, mntflags, set_gid, set_uid, set_mask;
int c, error, mntflags, set_gid, set_uid, set_mask;
char *dev, *dir, ndir[MAXPATHLEN+1];
struct vfsconf *vfc;
struct vfsconf vfc;
mntflags = set_gid = set_uid = set_mask = 0;
(void)memset(&args, '\0', sizeof(args));
@ -131,17 +132,17 @@ main(argc, argv)
args.mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
}
vfc = getvfsbyname("msdos");
if(!vfc && vfsisloadable("msdos")) {
if(vfsload("msdos"))
error = getvfsbyname("msdos", &vfc);
if (error && vfsisloadable("msdos")) {
if (vfsload("msdos"))
err(EX_OSERR, "vfsload(msdos)");
endvfsent(); /* clear cache */
vfc = getvfsbyname("msdos");
error = getvfsbyname("msdos", &vfc);
}
if (!vfc)
if (error)
errx(EX_OSERR, "msdos filesystem is not available");
if (mount(vfc->vfc_index, dir, mntflags, &args) < 0)
if (mount(vfc.vfc_name, dir, mntflags, &args) < 0)
err(EX_OSERR, "%s", dev);
exit (0);