diff options
| -rw-r--r-- | sbin/mount_msdos/mount_msdos.8 | 64 | ||||
| -rw-r--r-- | sbin/mount_msdos/mount_msdos.c | 6 |
2 files changed, 41 insertions, 29 deletions
diff --git a/sbin/mount_msdos/mount_msdos.8 b/sbin/mount_msdos/mount_msdos.8 index c0778f0de3f..4ce11542ffd 100644 --- a/sbin/mount_msdos/mount_msdos.8 +++ b/sbin/mount_msdos/mount_msdos.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mount_msdos.8,v 1.21 2006/12/15 03:04:24 krw Exp $ +.\" $OpenBSD: mount_msdos.8,v 1.22 2006/12/15 12:48:29 jmc Exp $ .\" $NetBSD: mount_msdos.8,v 1.10 1996/01/19 21:14:43 leo Exp $ .\" .\" Copyright (c) 1993,1994 Christopher G. Demetriou @@ -37,14 +37,11 @@ .Nd mount an MS-DOS file system .Sh SYNOPSIS .Nm mount_msdos -.Op Fl o Ar options -.Op Fl u Ar uid +.Op Fl 9lsx .Op Fl g Ar gid .Op Fl m Ar mask -.Op Fl s -.Op Fl l -.Op Fl 9 -.Op Fl x +.Op Fl o Ar options +.Op Fl u Ar uid .Ar special .Ar node .Sh DESCRIPTION @@ -79,21 +76,35 @@ contains the file system). .Pp The options are as follows: .Bl -tag -width Ds -.It Fl o Ar options -Use the specified mount -.Ar options , -as described in -.Xr mount 8 . -.It Fl u Ar uid -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 9 +Ignore the special Windows 95/98 directory entries even +if deleting or renaming a file. +This forces +.Fl s . .It Fl g Ar gid 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 l +Force listing and generation of +Windows 95/98 long filenames +and separate creation/modification/access dates. +.Pp +If neither +.Fl s +nor +.Fl l +are given, +.Nm +searches the root directory of the filesystem to +be mounted for any existing Windows 95/98 long filenames. +If no such entries are found, +.Fl s +is the default. +Otherwise +.Fl l +is assumed. .It Fl m Ar mask Specify the maximum file permissions for files in the file system. @@ -110,13 +121,14 @@ Only the nine low-order bits of are used. The default mask is taken from the directory on which the file system is being mounted. +.It Fl o Ar options +Use the specified mount +.Ar options , +as described in +.Xr mount 8 . .It Fl s Force behaviour to ignore and not generate Windows 95/98 long filenames. -.It Fl l -Force listing and generation of -Windows 95/98 long filenames -and separate creation/modification/access dates. .Pp If neither .Fl s @@ -132,11 +144,11 @@ is the default. Otherwise .Fl l is assumed. -.It Fl 9 -Ignore the special Windows 95/98 directory entries even -if deleting or renaming a file. -This forces -.Fl s . +.It Fl u Ar uid +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 x If a directory is readable, it inherits the x attribute as well. .El diff --git a/sbin/mount_msdos/mount_msdos.c b/sbin/mount_msdos/mount_msdos.c index 257cdc26cdf..ffa992b058d 100644 --- a/sbin/mount_msdos/mount_msdos.c +++ b/sbin/mount_msdos/mount_msdos.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_msdos.c,v 1.20 2006/12/15 03:04:24 krw Exp $ */ +/* $OpenBSD: mount_msdos.c,v 1.21 2006/12/15 12:48:29 jmc Exp $ */ /* $NetBSD: mount_msdos.c,v 1.16 1996/10/24 00:12:50 cgd Exp $ */ /* @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.20 2006/12/15 03:04:24 krw Exp $"; +static char rcsid[] = "$OpenBSD: mount_msdos.c,v 1.21 2006/12/15 12:48:29 jmc Exp $"; #endif /* not lint */ #include <sys/cdefs.h> @@ -216,6 +216,6 @@ usage(void) { fprintf(stderr, - "usage: mount_msdos [-o options] [-u user] [-g group] [-m mask] bdev dir\n"); + "usage: mount_msdos [-9lsx] [-g gid] [-m mask] [-o options] [-u uid] special node\n"); exit(1); } |