diff options
| author | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-06-22 21:12:01 +0000 |
|---|---|---|
| committer | Otto Moerbeek <otto@cvs.openbsd.org> | 2004-06-22 21:12:01 +0000 |
| commit | 8f82eb3c9226e55fa05cde787c8a8124f3e44165 (patch) | |
| tree | 9f489ffba1ea0d8bbbc98dcac119049aaab2e533 /sbin/mount_procfs/mount_procfs.c | |
| parent | 582fea99f4e2f9dc8816573bd7cb2db443b9e705 (diff) | |
Rewrite of getmntopts(), making it more robust and getting rid of
the mount_nfs alternative implementation of the same function. Joint
work with millert@. Fixes PR 3642.
ok pedro@ millert@
Diffstat (limited to 'sbin/mount_procfs/mount_procfs.c')
| -rw-r--r-- | sbin/mount_procfs/mount_procfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/mount_procfs/mount_procfs.c b/sbin/mount_procfs/mount_procfs.c index 97360a76266..4f860dca0f6 100644 --- a/sbin/mount_procfs/mount_procfs.c +++ b/sbin/mount_procfs/mount_procfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mount_procfs.c,v 1.13 2004/05/18 11:07:54 otto Exp $ */ +/* $OpenBSD: mount_procfs.c,v 1.14 2004/06/22 21:12:00 otto Exp $ */ /* $NetBSD: mount_procfs.c,v 1.7 1996/04/13 01:31:59 jtc Exp $ */ /* @@ -44,7 +44,7 @@ char copyright[] = #if 0 static char sccsid[] = "@(#)mount_procfs.c 8.3 (Berkeley) 3/27/94"; #else -static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.13 2004/05/18 11:07:54 otto Exp $"; +static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.14 2004/06/22 21:12:00 otto Exp $"; #endif #endif /* not lint */ @@ -64,7 +64,7 @@ static char rcsid[] = "$OpenBSD: mount_procfs.c,v 1.13 2004/05/18 11:07:54 otto const struct mntopt mopts[] = { MOPT_STDOPTS, - { "linux", 0, PROCFSMNT_LINUXCOMPAT, 1 }, + { "linux", PROCFSMNT_LINUXCOMPAT, 0 }, { NULL } }; @@ -81,7 +81,7 @@ main(int argc, char *argv[]) while ((ch = getopt(argc, argv, "o:")) != -1) switch (ch) { case 'o': - getmntopts(optarg, mopts, &mntflags, &altflags); + altflags |= getmntopts(optarg, mopts, &mntflags); break; case '?': default: |