diff options
| -rw-r--r-- | sbin/Makefile | 6 | ||||
| -rw-r--r-- | sbin/i386/mount_msdos/Makefile | 16 | ||||
| -rw-r--r-- | sbin/i386/mount_msdos/mount_msdos.8 | 111 | ||||
| -rw-r--r-- | sbin/i386/mount_msdos/mount_msdos.c | 199 | ||||
| -rw-r--r-- | sbin/mount_msdos/Makefile | 16 | ||||
| -rw-r--r-- | sbin/mount_msdos/mount_msdos.8 | 111 | ||||
| -rw-r--r-- | sbin/mount_msdos/mount_msdos.c | 199 | ||||
| -rw-r--r-- | sbin/mount_msdosfs/Makefile | 16 | ||||
| -rw-r--r-- | sbin/mount_msdosfs/mount_msdosfs.8 | 111 | ||||
| -rw-r--r-- | sbin/mount_msdosfs/mount_msdosfs.c | 199 |
10 files changed, 981 insertions, 3 deletions
diff --git a/sbin/Makefile b/sbin/Makefile index cd2eadf..726cbdb 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -4,9 +4,9 @@ # XXX NEEDS CONVERSION: scsiformat SUBDIR= adjkerntz badsect clri comcontrol disklabel dmesg dump dumpfs dumplfs \ fdisk fsck ifconfig init mknod modload modunload mount mount_cd9660 \ - mount_fdesc mount_kernfs mount_lfs mount_nfs mount_null mount_portal \ - mount_procfs mount_umap mount_union mountd newfs newlfs nfsd \ - nfsiod nologin ping quotacheck reboot restore route savecore \ + mount_fdesc mount_kernfs mount_lfs mount_nfs mount_null mount_msdos \ + mount_portal mount_procfs mount_umap mount_union mountd newfs newlfs \ + nfsd nfsiod nologin ping quotacheck reboot restore route savecore \ shutdown slattach startslip swapon tunefs umount .include <bsd.subdir.mk> diff --git a/sbin/i386/mount_msdos/Makefile b/sbin/i386/mount_msdos/Makefile new file mode 100644 index 0000000..54b3aaf --- /dev/null +++ b/sbin/i386/mount_msdos/Makefile @@ -0,0 +1,16 @@ +# +# $Id: Makefile,v 1.6 1994/07/16 21:32:06 cgd Exp $ +# + +PROG= mount_msdos +SRCS= mount_msdos.c getmntopts.c +MAN8= mount_msdos.8 + +BINOWN= root +BINMODE= 4555 + +MOUNT= ${.CURDIR}/../mount +CFLAGS+= -I${MOUNT} +.PATH: ${MOUNT} + +.include <bsd.prog.mk> diff --git a/sbin/i386/mount_msdos/mount_msdos.8 b/sbin/i386/mount_msdos/mount_msdos.8 new file mode 100644 index 0000000..f712e9d --- /dev/null +++ b/sbin/i386/mount_msdos/mount_msdos.8 @@ -0,0 +1,111 @@ +.\" +.\" Copyright (c) 1993,1994 Christopher G. Demetriou +.\" 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 Christopher G. Demetriou. +.\" 3. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission +.\" +.\" 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 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. +.\" +.\" $Id: mount_msdos.8,v 1.5 1994/07/16 21:32:07 cgd Exp $ +.\" +.Dd April 7, 1994 +.Dt MOUNT_MSDOS 8 +.Os NetBSD 0.9a +.Sh NAME +.Nm mount_msdos +.Nd mount an MS-DOS file system +.Sh SYNOPSIS +.Nm mount_msdos +.Op Fl u Ar uid +.Op Fl g Ar gid +.Op Fl m Ar mask +.Pa special +.Pa node +.Sh DESCRIPTION +The +.Nm mount_msdos +command attaches the MS-DOS filesystem residing on +the device +.Pa special +to the global filesystem namespace at the location +indicated by +.Pa node . +This command is normally executed by +.Xr mount 8 +at boot time, but can be used by any user to mount an +MS-DOS file system on any directory that they own (provided, +of course, that they have appropriate access to the device that +contains the file system). +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl u +Set the owner of the files in the file system to +.Ar uid . +The default owner is the owner of the directory +on which the file system is being mounted. +.It Fl g +Set the group of the files in the file system to +.Ar gid . +The default group is the group of the directory +on which the file system is being mounted. +.It Fl m +Specify the maximum file permissions for files +in the file system. +(For example, a mask of +.Li 755 +specifies that, by default, the owner should have +read, write, and execute permissions for files, but +others should only have read and execute permissions. +See +.Xr chmod 1 +for more information about octal file modes.) +Only the nine low-order bits of +.Ar mask +are used. +The default mask is taken from the +directory on which the file system is being mounted. +.El +.Sh SEE ALSO +.Xr mount 2 , +.Xr unmount 2 , +.Xr fstab 5 +.Sh CAVEATS +The +.Nm msdos +filesystem is not known to work reliably with filesystems created by versions +of MS-DOS later than version 3.3. +.Pp +The limitations on file names imposed by MS-DOS are strange, at best. +For instance, they are +limited to single-case, 8 character names with 3 character extensions. +.Sh HISTORY +The +.Nm mount_msdos +utility first appeared in NetBSD 0.9. +Its predecessor, the +.Nm mount_pcfs +utility appeared in NetBSD 0.8, and was abandoned in favor +of the more aptly-named +.Nm mount_msdos . diff --git a/sbin/i386/mount_msdos/mount_msdos.c b/sbin/i386/mount_msdos/mount_msdos.c new file mode 100644 index 0000000..075a512 --- /dev/null +++ b/sbin/i386/mount_msdos/mount_msdos.c @@ -0,0 +1,199 @@ +/* + * Copyright (c) 1994 Christopher G. Demetriou + * 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 Christopher G. Demetriou. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * 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 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 char rcsid[] = "$Id: mount_msdos.c,v 1.8 1994/07/16 21:32:08 cgd Exp $"; +#endif /* not lint */ + +#include <sys/cdefs.h> +#include <sys/param.h> +#define MSDOSFS +#include <sys/mount.h> +#include <sys/stat.h> +#include <ctype.h> +#include <err.h> +#include <grp.h> +#include <pwd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "mntopts.h" + +struct mntopt mopts[] = { + MOPT_STDOPTS, + { NULL } +}; + +gid_t a_gid __P((char *)); +uid_t a_uid __P((char *)); +mode_t a_mask __P((char *)); +void usage __P((void)); + +int +main(argc, argv) + int argc; + char **argv; +{ + struct msdosfs_args args; + struct stat sb; + int c, mntflags, set_gid, set_uid, set_mask; + char *dev, *dir, ndir[MAXPATHLEN+1]; + + mntflags = set_gid = set_uid = set_mask = 0; + (void)memset(&args, '\0', sizeof(args)); + + while ((c = getopt(argc, argv, "u:g:m:o:")) != EOF) { + switch (c) { + case 'u': + args.uid = a_uid(optarg); + set_uid = 1; + break; + case 'g': + args.gid = a_gid(optarg); + set_gid = 1; + break; + case 'm': + args.mask = a_mask(optarg); + set_mask = 1; + break; + case 'o': + getmntopts(optarg, mopts, &mntflags); + break; + case '?': + default: + usage(); + break; + } + } + + if (optind + 2 != argc) + usage(); + + dev = argv[optind]; + dir = argv[optind + 1]; + if (dir[0] != '/') { + warnx("\"%s\" is a relative path.", dir); + if (getcwd(ndir, sizeof(ndir)) == NULL) + err(1, "getcwd"); + strncat(ndir, "/", sizeof(ndir) - strlen(ndir) - 1); + strncat(ndir, dir, sizeof(ndir) - strlen(ndir) - 1); + dir = ndir; + warnx("using \"%s\" instead.", dir); + } + + args.fspec = dev; + args.export.ex_root = -2; /* unchecked anyway on DOS fs */ + if (mntflags & MNT_RDONLY) + args.export.ex_flags = MNT_EXRDONLY; + else + args.export.ex_flags = 0; + if (!set_gid || !set_uid || !set_mask) { + if (stat(dir, &sb) == -1) + err(1, "stat %s", dir); + + if (!set_uid) + args.uid = sb.st_uid; + if (!set_gid) + args.gid = sb.st_gid; + if (!set_mask) + args.mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); + } + + if (mount(MOUNT_MSDOS, dir, mntflags, &args) < 0) + err(1, "mount"); + + exit (0); +} + +gid_t +a_gid(s) + char *s; +{ + struct group *gr; + char *gname; + gid_t gid; + + if ((gr = getgrnam(s)) != NULL) + gid = gr->gr_gid; + else { + for (gname = s; *s && isdigit(*s); ++s); + if (!*s) + gid = atoi(gname); + else + errx(1, "unknown group id: %s", gname); + } + return (gid); +} + +uid_t +a_uid(s) + char *s; +{ + struct passwd *pw; + char *uname; + uid_t uid; + + if ((pw = getpwnam(s)) != NULL) + uid = pw->pw_uid; + else { + for (uname = s; *s && isdigit(*s); ++s); + if (!*s) + uid = atoi(uname); + else + errx(1, "unknown user id: %s", uname); + } + return (uid); +} + +mode_t +a_mask(s) + char *s; +{ + int done, rv; + char *ep; + + done = 0; + if (*s >= '0' && *s <= '7') { + done = 1; + rv = strtol(optarg, &ep, 8); + } + if (!done || rv < 0 || *ep) + errx(1, "invalid file mode: %s", s); + return (rv); +} + +void +usage() +{ + fprintf(stderr, "usage: mount_msdos [-F flags] [-u user] [-g group] [-m mask] bdev dir\n"); + exit(1); +} diff --git a/sbin/mount_msdos/Makefile b/sbin/mount_msdos/Makefile new file mode 100644 index 0000000..54b3aaf --- /dev/null +++ b/sbin/mount_msdos/Makefile @@ -0,0 +1,16 @@ +# +# $Id: Makefile,v 1.6 1994/07/16 21:32:06 cgd Exp $ +# + +PROG= mount_msdos +SRCS= mount_msdos.c getmntopts.c +MAN8= mount_msdos.8 + +BINOWN= root +BINMODE= 4555 + +MOUNT= ${.CURDIR}/../mount +CFLAGS+= -I${MOUNT} +.PATH: ${MOUNT} + +.include <bsd.prog.mk> diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8 new file mode 100644 index 0000000..f712e9d --- /dev/null +++ b/sbin/mount_msdos/mount_msdos.8 @@ -0,0 +1,111 @@ +.\" +.\" Copyright (c) 1993,1994 Christopher G. Demetriou +.\" 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 Christopher G. Demetriou. +.\" 3. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission +.\" +.\" 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 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. +.\" +.\" $Id: mount_msdos.8,v 1.5 1994/07/16 21:32:07 cgd Exp $ +.\" +.Dd April 7, 1994 +.Dt MOUNT_MSDOS 8 +.Os NetBSD 0.9a +.Sh NAME +.Nm mount_msdos +.Nd mount an MS-DOS file system +.Sh SYNOPSIS +.Nm mount_msdos +.Op Fl u Ar uid +.Op Fl g Ar gid +.Op Fl m Ar mask +.Pa special +.Pa node +.Sh DESCRIPTION +The +.Nm mount_msdos +command attaches the MS-DOS filesystem residing on +the device +.Pa special +to the global filesystem namespace at the location +indicated by +.Pa node . +This command is normally executed by +.Xr mount 8 +at boot time, but can be used by any user to mount an +MS-DOS file system on any directory that they own (provided, +of course, that they have appropriate access to the device that +contains the file system). +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl u +Set the owner of the files in the file system to +.Ar uid . +The default owner is the owner of the directory +on which the file system is being mounted. +.It Fl g +Set the group of the files in the file system to +.Ar gid . +The default group is the group of the directory +on which the file system is being mounted. +.It Fl m +Specify the maximum file permissions for files +in the file system. +(For example, a mask of +.Li 755 +specifies that, by default, the owner should have +read, write, and execute permissions for files, but +others should only have read and execute permissions. +See +.Xr chmod 1 +for more information about octal file modes.) +Only the nine low-order bits of +.Ar mask +are used. +The default mask is taken from the +directory on which the file system is being mounted. +.El +.Sh SEE ALSO +.Xr mount 2 , +.Xr unmount 2 , +.Xr fstab 5 +.Sh CAVEATS +The +.Nm msdos +filesystem is not known to work reliably with filesystems created by versions +of MS-DOS later than version 3.3. +.Pp +The limitations on file names imposed by MS-DOS are strange, at best. +For instance, they are +limited to single-case, 8 character names with 3 character extensions. +.Sh HISTORY +The +.Nm mount_msdos +utility first appeared in NetBSD 0.9. +Its predecessor, the +.Nm mount_pcfs +utility appeared in NetBSD 0.8, and was abandoned in favor +of the more aptly-named +.Nm mount_msdos . diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c new file mode 100644 index 0000000..075a512 --- /dev/null +++ b/sbin/mount_msdos/mount_msdos.c @@ -0,0 +1,199 @@ +/* + * Copyright (c) 1994 Christopher G. Demetriou + * 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 Christopher G. Demetriou. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * 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 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 char rcsid[] = "$Id: mount_msdos.c,v 1.8 1994/07/16 21:32:08 cgd Exp $"; +#endif /* not lint */ + +#include <sys/cdefs.h> +#include <sys/param.h> +#define MSDOSFS +#include <sys/mount.h> +#include <sys/stat.h> +#include <ctype.h> +#include <err.h> +#include <grp.h> +#include <pwd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "mntopts.h" + +struct mntopt mopts[] = { + MOPT_STDOPTS, + { NULL } +}; + +gid_t a_gid __P((char *)); +uid_t a_uid __P((char *)); +mode_t a_mask __P((char *)); +void usage __P((void)); + +int +main(argc, argv) + int argc; + char **argv; +{ + struct msdosfs_args args; + struct stat sb; + int c, mntflags, set_gid, set_uid, set_mask; + char *dev, *dir, ndir[MAXPATHLEN+1]; + + mntflags = set_gid = set_uid = set_mask = 0; + (void)memset(&args, '\0', sizeof(args)); + + while ((c = getopt(argc, argv, "u:g:m:o:")) != EOF) { + switch (c) { + case 'u': + args.uid = a_uid(optarg); + set_uid = 1; + break; + case 'g': + args.gid = a_gid(optarg); + set_gid = 1; + break; + case 'm': + args.mask = a_mask(optarg); + set_mask = 1; + break; + case 'o': + getmntopts(optarg, mopts, &mntflags); + break; + case '?': + default: + usage(); + break; + } + } + + if (optind + 2 != argc) + usage(); + + dev = argv[optind]; + dir = argv[optind + 1]; + if (dir[0] != '/') { + warnx("\"%s\" is a relative path.", dir); + if (getcwd(ndir, sizeof(ndir)) == NULL) + err(1, "getcwd"); + strncat(ndir, "/", sizeof(ndir) - strlen(ndir) - 1); + strncat(ndir, dir, sizeof(ndir) - strlen(ndir) - 1); + dir = ndir; + warnx("using \"%s\" instead.", dir); + } + + args.fspec = dev; + args.export.ex_root = -2; /* unchecked anyway on DOS fs */ + if (mntflags & MNT_RDONLY) + args.export.ex_flags = MNT_EXRDONLY; + else + args.export.ex_flags = 0; + if (!set_gid || !set_uid || !set_mask) { + if (stat(dir, &sb) == -1) + err(1, "stat %s", dir); + + if (!set_uid) + args.uid = sb.st_uid; + if (!set_gid) + args.gid = sb.st_gid; + if (!set_mask) + args.mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); + } + + if (mount(MOUNT_MSDOS, dir, mntflags, &args) < 0) + err(1, "mount"); + + exit (0); +} + +gid_t +a_gid(s) + char *s; +{ + struct group *gr; + char *gname; + gid_t gid; + + if ((gr = getgrnam(s)) != NULL) + gid = gr->gr_gid; + else { + for (gname = s; *s && isdigit(*s); ++s); + if (!*s) + gid = atoi(gname); + else + errx(1, "unknown group id: %s", gname); + } + return (gid); +} + +uid_t +a_uid(s) + char *s; +{ + struct passwd *pw; + char *uname; + uid_t uid; + + if ((pw = getpwnam(s)) != NULL) + uid = pw->pw_uid; + else { + for (uname = s; *s && isdigit(*s); ++s); + if (!*s) + uid = atoi(uname); + else + errx(1, "unknown user id: %s", uname); + } + return (uid); +} + +mode_t +a_mask(s) + char *s; +{ + int done, rv; + char *ep; + + done = 0; + if (*s >= '0' && *s <= '7') { + done = 1; + rv = strtol(optarg, &ep, 8); + } + if (!done || rv < 0 || *ep) + errx(1, "invalid file mode: %s", s); + return (rv); +} + +void +usage() +{ + fprintf(stderr, "usage: mount_msdos [-F flags] [-u user] [-g group] [-m mask] bdev dir\n"); + exit(1); +} diff --git a/sbin/mount_msdosfs/Makefile b/sbin/mount_msdosfs/Makefile new file mode 100644 index 0000000..54b3aaf --- /dev/null +++ b/sbin/mount_msdosfs/Makefile @@ -0,0 +1,16 @@ +# +# $Id: Makefile,v 1.6 1994/07/16 21:32:06 cgd Exp $ +# + +PROG= mount_msdos +SRCS= mount_msdos.c getmntopts.c +MAN8= mount_msdos.8 + +BINOWN= root +BINMODE= 4555 + +MOUNT= ${.CURDIR}/../mount +CFLAGS+= -I${MOUNT} +.PATH: ${MOUNT} + +.include <bsd.prog.mk> diff --git a/sbin/mount_msdosfs/mount_msdosfs.8 b/sbin/mount_msdosfs/mount_msdosfs.8 new file mode 100644 index 0000000..f712e9d --- /dev/null +++ b/sbin/mount_msdosfs/mount_msdosfs.8 @@ -0,0 +1,111 @@ +.\" +.\" Copyright (c) 1993,1994 Christopher G. Demetriou +.\" 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 Christopher G. Demetriou. +.\" 3. The name of the author may not be used to endorse or promote products +.\" derived from this software without specific prior written permission +.\" +.\" 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 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. +.\" +.\" $Id: mount_msdos.8,v 1.5 1994/07/16 21:32:07 cgd Exp $ +.\" +.Dd April 7, 1994 +.Dt MOUNT_MSDOS 8 +.Os NetBSD 0.9a +.Sh NAME +.Nm mount_msdos +.Nd mount an MS-DOS file system +.Sh SYNOPSIS +.Nm mount_msdos +.Op Fl u Ar uid +.Op Fl g Ar gid +.Op Fl m Ar mask +.Pa special +.Pa node +.Sh DESCRIPTION +The +.Nm mount_msdos +command attaches the MS-DOS filesystem residing on +the device +.Pa special +to the global filesystem namespace at the location +indicated by +.Pa node . +This command is normally executed by +.Xr mount 8 +at boot time, but can be used by any user to mount an +MS-DOS file system on any directory that they own (provided, +of course, that they have appropriate access to the device that +contains the file system). +.Pp +The options are as follows: +.Bl -tag -width Ds +.It Fl u +Set the owner of the files in the file system to +.Ar uid . +The default owner is the owner of the directory +on which the file system is being mounted. +.It Fl g +Set the group of the files in the file system to +.Ar gid . +The default group is the group of the directory +on which the file system is being mounted. +.It Fl m +Specify the maximum file permissions for files +in the file system. +(For example, a mask of +.Li 755 +specifies that, by default, the owner should have +read, write, and execute permissions for files, but +others should only have read and execute permissions. +See +.Xr chmod 1 +for more information about octal file modes.) +Only the nine low-order bits of +.Ar mask +are used. +The default mask is taken from the +directory on which the file system is being mounted. +.El +.Sh SEE ALSO +.Xr mount 2 , +.Xr unmount 2 , +.Xr fstab 5 +.Sh CAVEATS +The +.Nm msdos +filesystem is not known to work reliably with filesystems created by versions +of MS-DOS later than version 3.3. +.Pp +The limitations on file names imposed by MS-DOS are strange, at best. +For instance, they are +limited to single-case, 8 character names with 3 character extensions. +.Sh HISTORY +The +.Nm mount_msdos +utility first appeared in NetBSD 0.9. +Its predecessor, the +.Nm mount_pcfs +utility appeared in NetBSD 0.8, and was abandoned in favor +of the more aptly-named +.Nm mount_msdos . diff --git a/sbin/mount_msdosfs/mount_msdosfs.c b/sbin/mount_msdosfs/mount_msdosfs.c new file mode 100644 index 0000000..075a512 --- /dev/null +++ b/sbin/mount_msdosfs/mount_msdosfs.c @@ -0,0 +1,199 @@ +/* + * Copyright (c) 1994 Christopher G. Demetriou + * 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 Christopher G. Demetriou. + * 4. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission + * + * 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 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 char rcsid[] = "$Id: mount_msdos.c,v 1.8 1994/07/16 21:32:08 cgd Exp $"; +#endif /* not lint */ + +#include <sys/cdefs.h> +#include <sys/param.h> +#define MSDOSFS +#include <sys/mount.h> +#include <sys/stat.h> +#include <ctype.h> +#include <err.h> +#include <grp.h> +#include <pwd.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> + +#include "mntopts.h" + +struct mntopt mopts[] = { + MOPT_STDOPTS, + { NULL } +}; + +gid_t a_gid __P((char *)); +uid_t a_uid __P((char *)); +mode_t a_mask __P((char *)); +void usage __P((void)); + +int +main(argc, argv) + int argc; + char **argv; +{ + struct msdosfs_args args; + struct stat sb; + int c, mntflags, set_gid, set_uid, set_mask; + char *dev, *dir, ndir[MAXPATHLEN+1]; + + mntflags = set_gid = set_uid = set_mask = 0; + (void)memset(&args, '\0', sizeof(args)); + + while ((c = getopt(argc, argv, "u:g:m:o:")) != EOF) { + switch (c) { + case 'u': + args.uid = a_uid(optarg); + set_uid = 1; + break; + case 'g': + args.gid = a_gid(optarg); + set_gid = 1; + break; + case 'm': + args.mask = a_mask(optarg); + set_mask = 1; + break; + case 'o': + getmntopts(optarg, mopts, &mntflags); + break; + case '?': + default: + usage(); + break; + } + } + + if (optind + 2 != argc) + usage(); + + dev = argv[optind]; + dir = argv[optind + 1]; + if (dir[0] != '/') { + warnx("\"%s\" is a relative path.", dir); + if (getcwd(ndir, sizeof(ndir)) == NULL) + err(1, "getcwd"); + strncat(ndir, "/", sizeof(ndir) - strlen(ndir) - 1); + strncat(ndir, dir, sizeof(ndir) - strlen(ndir) - 1); + dir = ndir; + warnx("using \"%s\" instead.", dir); + } + + args.fspec = dev; + args.export.ex_root = -2; /* unchecked anyway on DOS fs */ + if (mntflags & MNT_RDONLY) + args.export.ex_flags = MNT_EXRDONLY; + else + args.export.ex_flags = 0; + if (!set_gid || !set_uid || !set_mask) { + if (stat(dir, &sb) == -1) + err(1, "stat %s", dir); + + if (!set_uid) + args.uid = sb.st_uid; + if (!set_gid) + args.gid = sb.st_gid; + if (!set_mask) + args.mask = sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO); + } + + if (mount(MOUNT_MSDOS, dir, mntflags, &args) < 0) + err(1, "mount"); + + exit (0); +} + +gid_t +a_gid(s) + char *s; +{ + struct group *gr; + char *gname; + gid_t gid; + + if ((gr = getgrnam(s)) != NULL) + gid = gr->gr_gid; + else { + for (gname = s; *s && isdigit(*s); ++s); + if (!*s) + gid = atoi(gname); + else + errx(1, "unknown group id: %s", gname); + } + return (gid); +} + +uid_t +a_uid(s) + char *s; +{ + struct passwd *pw; + char *uname; + uid_t uid; + + if ((pw = getpwnam(s)) != NULL) + uid = pw->pw_uid; + else { + for (uname = s; *s && isdigit(*s); ++s); + if (!*s) + uid = atoi(uname); + else + errx(1, "unknown user id: %s", uname); + } + return (uid); +} + +mode_t +a_mask(s) + char *s; +{ + int done, rv; + char *ep; + + done = 0; + if (*s >= '0' && *s <= '7') { + done = 1; + rv = strtol(optarg, &ep, 8); + } + if (!done || rv < 0 || *ep) + errx(1, "invalid file mode: %s", s); + return (rv); +} + +void +usage() +{ + fprintf(stderr, "usage: mount_msdos [-F flags] [-u user] [-g group] [-m mask] bdev dir\n"); + exit(1); +} |
