src - OpenBSD base system

diff options


context:
space:
mode:

author	Otto Moerbeek <otto@cvs.openbsd.org>	2004-05-18 10:54:09 +0000
committer	Otto Moerbeek <otto@cvs.openbsd.org>	2004-05-18 10:54:09 +0000
commit	fb3389aa6c32e957b970a221c7bd4db26b90768a (patch)
tree	6e7a2fe863e0b248eb2ac3f699a5ad8a92709a15
parent	a174387f1484dd95a23635469066fe0a046f5d95 (diff)

Trailers are really wonders of the past. Remove them from man page and

usage. ok millert@

Diffstat

-rw-r--r--

sbin/ifconfig/ifconfig.8

-rw-r--r--

sbin/ifconfig/ifconfig.c

-rw-r--r--

sbin/mount/getmntopts.c

103

-rw-r--r--

sbin/mount/mntopts.h

-rw-r--r--

sbin/mount_nfs/Makefile

-rw-r--r--

sbin/mount_nfs/getmntopts.c

-rw-r--r--

sbin/mount_nfs/mntopts.h

-rw-r--r--

sbin/mount_nfs/mount_nfs.c

193

-rw-r--r--

sbin/mount_procfs/Makefile

-rw-r--r--

sbin/mount_procfs/mount_procfs.c

10 files changed, 220 insertions, 356 deletions

diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index 04f55cc943c..618e11de1cc 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8

@@ -1,4 +1,4 @@

-.\" $OpenBSD: ifconfig.8,v 1.80 2004/04/27 21:13:09 jmc Exp $

+.\" $OpenBSD: ifconfig.8,v 1.81 2004/05/18 10:54:07 otto Exp $

.\" $NetBSD: ifconfig.8,v 1.11 1996/01/04 21:27:29 pk Exp $

.\" $FreeBSD: ifconfig.8,v 1.16 1998/02/01 07:03:29 steve Exp $

.\"

@@ -587,27 +587,6 @@ Set the IPv6 tentative address bit.

.It Fl tentative

(inet6 only)

Clear the IPv6 tentative address bit.

-.It Cm trailers

-Request the use of a

-.Dq trailer

-link level encapsulation when

-sending (default).

-If a network interface supports

-.Cm trailers ,

-the system will, when possible, encapsulate outgoing

-messages in a manner which minimizes the number of

-memory to memory copy operations performed by the receiver.

-On networks that support ARP

-(currently, only Ethernet),

-this flag indicates that the system should request that other

-systems use trailers when sending to this host.

-Similarly, trailer encapsulations will be sent to other

-hosts that have made such requests.

-Currently used by Internet protocols only.

-.It Fl trailers

-Disable the use of a

-.Dq trailer

-link level encapsulation.

.It Cm tunnel Ar src_address dest_address

Set the source and destination tunnel addresses on a tunnel interface,

including

diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 58469421e24..088650850cb 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: ifconfig.c,v 1.98 2004/05/10 18:34:42 deraadt Exp $ */

+/* $OpenBSD: ifconfig.c,v 1.99 2004/05/18 10:54:07 otto Exp $ */

/* $NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $ */

@@ -77,7 +77,7 @@ static const char copyright[] =

#if 0

static const char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";

#else

-static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.98 2004/05/10 18:34:42 deraadt Exp $";

+static const char rcsid[] = "$OpenBSD: ifconfig.c,v 1.99 2004/05/18 10:54:07 otto Exp $";

#endif

#endif /* not lint */

@@ -2540,7 +2540,7 @@ usage(void)

"\t[[-]alias] [[-]arp] [broadcast addr]\n"

"\t[[-]debug] [delete] [up] [down] [ipdst addr]\n"

"\t[tunnel src_address dest_address] [deletetunnel]\n"

- "\t[[-]link0] [[-]link1] [[-]link2] [[-]trailers]\n"

+ "\t[[-]link0] [[-]link1] [[-]link2]\n"

"\t[media type] [[-]mediaopt opts] [instance minst]\n"

"\t[mtu value] [metric nhops] [netmask mask] [prefixlen n]\n"

"\t[nwid id] [nwkey key] [nwkey persist[:key]] [-nwkey]\n"

diff --git a/sbin/mount/getmntopts.c b/sbin/mount/getmntopts.c
index 0e92408499c..134d5e4d8f9 100644
--- a/sbin/mount/getmntopts.c
+++ b/sbin/mount/getmntopts.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: getmntopts.c,v 1.5 2003/06/11 06:22:13 deraadt Exp $ */

+/* $OpenBSD: getmntopts.c,v 1.6 2004/05/18 10:54:08 otto Exp $ */

/* $NetBSD: getmntopts.c,v 1.3 1995/03/18 14:56:58 cgd Exp $ */

/*-

@@ -34,7 +34,7 @@

#if 0

static char sccsid[] = "@(#)getmntopts.c 8.1 (Berkeley) 3/27/94";

#else

-static char rcsid[] = "$OpenBSD: getmntopts.c,v 1.5 2003/06/11 06:22:13 deraadt Exp $";

+static char rcsid[] = "$OpenBSD: getmntopts.c,v 1.6 2004/05/18 10:54:08 otto Exp $";

#endif

#endif /* not lint */

@@ -49,47 +49,82 @@ static char rcsid[] = "$OpenBSD: getmntopts.c,v 1.5 2003/06/11 06:22:13 deraadt

#include "mntopts.h"

-void

-getmntopts(const char *options, const struct mntopt *m0, int *flagp)

+int

+getmntopts(const char *optionp, const struct mntopt *m0, int *flagp)

{

- const struct mntopt *m;

- int negative;

- char *opt, *optbuf, *p;

+ char *p, *q;

+ union mntval val;

+ int ret = 0;

- /* Copy option string, since it is about to be torn asunder... */

- if ((optbuf = strdup(options)) == NULL)

+ p = q = strdup(optionp);

+ if (p == NULL)

err(1, NULL);

+ while (p != NULL) {

+ ret |= getmntopt(&p, &val, m0, flagp);

+ }

+ free(q);

+ return (ret);

- for (opt = optbuf; (opt = strtok(opt, ",")) != NULL; opt = NULL) {

- /* Check for "no" prefix. */

- if (opt[0] == 'n' && opt[1] == 'o') {

- negative = 1;

- opt += 2;

- } else

- negative = 0;

+int

+getmntopt(char **optionp, union mntval *valuep, const struct mntopt *m0,

+ int *flagp)

+ const struct mntopt *m;

+ char *opt, *value, *endp;

+ long l;

+ int negative, needval;

- /*

- * for options with assignments in them (ie. quotas)

- * ignore the assignment as it's handled elsewhere

- */

- p = strchr(opt, '=');

- if (p != NULL)

- *p = '\0';

+ /* Pull out the next option. */

+ do {

+ opt = strsep(optionp, ",");

+ } while (opt == NULL || *opt == '\0');

+ if (opt == NULL)

+ return (0);

- /* Scan option table. */

- for (m = m0; m->m_option != NULL; ++m)

- if (strcasecmp(opt, m->m_option) == 0)

- break;

+ /* Check for "no" prefix. */

+ if (opt[0] == 'n' && opt[1] == 'o') {

+ negative = 1;

+ opt += 2;

+ } else

+ negative = 0;

- /* Save flag, or fail if option is not recognised. */

- if (m->m_option) {

- if (negative == m->m_inverse)

+ /* Stash the value for options with assignments in them. */

+ if ((value = strchr(opt, '=')) != NULL)

+ *value++ = '\0';

+ /* Scan option table. */

+ for (m = m0; m->m_option != NULL; ++m)

+ if (strcasecmp(opt, m->m_option) == 0)

+ break;

+ /* Save flag, or fail if option is not recognised. */

+ if (m->m_option) {

+ needval = (m->m_oflags & (MFLAG_INTVAL|MFLAG_STRVAL)) != 0;

+ if (needval != (value != NULL))

+ errx(1, "-o %s: option %s a value", opt,

+ needval ? "needs" : "does not need");

+ if (m->m_oflags & MFLAG_SET) {

+ if (negative == (m->m_oflags & MFLAG_INVERSE) ? 1 : 0)

*flagp |= m->m_flag;

else

*flagp &= ~m->m_flag;

- } else

- errx(1, "-o %s: option not supported", opt);

- }

+ }

+ } else

+ errx(1, "-o %s: option not supported", opt);

- free(optbuf);

+ /* Store the value for options with assignments in them. */

+ if (value != NULL) {

+ if (m->m_oflags & MFLAG_INTVAL) {

+ l = strtol(value, &endp, 10);

+ if (endp == value || l < 0 || l > INT_MAX ||

+ (l == LONG_MAX && errno == ERANGE))

+ errx(1, "%s: illegal value '%s'",

+ opt, value);

+ valuep->ival = (int)l;

+ } else

+ valuep->strval = value;

+ } else

+ memset(valuep, 0, sizeof(*valuep));

+ return ((m->m_oflags & MFLAG_SET) ? 0 : (negative ? 0 : m->m_flag));

}

diff --git a/sbin/mount/mntopts.h b/sbin/mount/mntopts.h
index 2ae4eae315c..65de81b0ba9 100644
--- a/sbin/mount/mntopts.h
+++ b/sbin/mount/mntopts.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: mntopts.h,v 1.10 2003/06/02 20:06:15 millert Exp $ */

+/* $OpenBSD: mntopts.h,v 1.11 2004/05/18 10:54:08 otto Exp $ */

/* $NetBSD: mntopts.h,v 1.3 1995/03/18 14:56:59 cgd Exp $ */

/*-

@@ -32,37 +32,49 @@

* @(#)mntopts.h 8.3 (Berkeley) 3/27/94

+#define MFLAG_INVERSE 0x01 /* if a negative option, eg "dev" */

+#define MFLAG_SET 0x02 /* 1 => set bit in mntflags,

+ 0 => return flag */

+#define MFLAG_STRVAL 0x04 /* option needs a string value */

+#define MFLAG_INTVAL 0x08 /* option needs as int value */

struct mntopt {

const char *m_option; /* option name */

- int m_inverse; /* if a negative option, eg "dev" */

int m_flag; /* bit to set, eg. MNT_RDONLY */

+ int m_oflags;

+};

+union mntval {

+ char *strval;

+ int ival;

};

/* User-visible MNT_ flags. */

-#define MOPT_ASYNC { "async", 0, MNT_ASYNC }

-#define MOPT_NOACCESSTIME { "accesstime", 1, MNT_NOATIME }

-#define MOPT_NOATIME { "atime", 1, MNT_NOATIME }

-#define MOPT_NODEV { "dev", 1, MNT_NODEV }

-#define MOPT_NOEXEC { "exec", 1, MNT_NOEXEC }

-#define MOPT_NOSUID { "suid", 1, MNT_NOSUID }

-#define MOPT_RDONLY { "rdonly", 0, MNT_RDONLY }

-#define MOPT_SYNC { "sync", 0, MNT_SYNCHRONOUS }

-#define MOPT_UNION { "union", 0, MNT_UNION }

-#define MOPT_USERQUOTA { "userquota", 0, 0 }

-#define MOPT_GROUPQUOTA { "groupquota", 0, 0 }

-#define MOPT_SOFTDEP { "softdep", 0, MNT_SOFTDEP }

+#define MOPT_ASYNC { "async", MNT_ASYNC, MFLAG_SET }

+#define MOPT_NOACCESSTIME { "accesstime", MNT_NOATIME, \

+ MFLAG_INVERSE | MFLAG_SET }

+#define MOPT_NOATIME { "atime", MNT_NOATIME, MFLAG_INVERSE | MFLAG_SET }

+#define MOPT_NODEV { "dev", MNT_NODEV, MFLAG_INVERSE | MFLAG_SET }

+#define MOPT_NOEXEC { "exec", MNT_NOEXEC, MFLAG_INVERSE | MFLAG_SET }

+#define MOPT_NOSUID { "suid", MNT_NOSUID, MFLAG_INVERSE | MFLAG_SET }

+#define MOPT_RDONLY { "rdonly", MNT_RDONLY, MFLAG_SET }

+#define MOPT_SYNC { "sync", MNT_SYNCHRONOUS, MFLAG_SET }

+#define MOPT_UNION { "union", MNT_UNION, MFLAG_SET }

+#define MOPT_USERQUOTA { "userquota", 0, MFLAG_SET }

+#define MOPT_GROUPQUOTA { "groupquota", 0, MFLAG_SET }

+#define MOPT_SOFTDEP { "softdep", MNT_SOFTDEP, MFLAG_SET }

/* Control flags. */

-#define MOPT_FORCE { "force", 0, MNT_FORCE }

-#define MOPT_UPDATE { "update", 0, MNT_UPDATE }

-#define MOPT_RELOAD { "reload", 0, MNT_RELOAD }

+#define MOPT_FORCE { "force", MNT_FORCE, MFLAG_SET }

+#define MOPT_UPDATE { "update", MNT_UPDATE, MFLAG_SET }

+#define MOPT_RELOAD { "reload", MNT_RELOAD, MFLAG_SET }

/* Support for old-style "ro", "rw" flags. */

-#define MOPT_RO { "ro", 0, MNT_RDONLY }

-#define MOPT_RW { "rw", 1, MNT_RDONLY }

+#define MOPT_RO { "ro", MNT_RDONLY, MFLAG_SET }

+#define MOPT_RW { "rw", MNT_RDONLY, MFLAG_INVERSE | MFLAG_SET }

/* This is parsed by mount(8), but is ignored by specific mount_*(8)s. */

-#define MOPT_AUTO { "auto", 0, 0 }

+#define MOPT_AUTO { "auto", 0, MFLAG_SET }

#define MOPT_FSTAB_COMPAT \

MOPT_RO, \

@@ -82,4 +94,5 @@ struct mntopt {

MOPT_RDONLY, \

MOPT_UNION

-void getmntopts(const char *, const struct mntopt *, int *);

+int getmntopts(const char *, const struct mntopt *, int *);

+int getmntopt(char **, union mntval *, const struct mntopt *, int *);

diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile
index 926e004acf0..213be67c4d8 100644
--- a/sbin/mount_nfs/Makefile
+++ b/sbin/mount_nfs/Makefile

@@ -1,14 +1,12 @@

-# $OpenBSD: Makefile,v 1.8 2001/10/03 18:50:07 hin Exp $

+# $OpenBSD: Makefile,v 1.9 2004/05/18 10:54:08 otto Exp $

PROG= mount_nfs

SRCS= mount_nfs.c getmntopts.c

MAN= mount_nfs.8

-# Temporarily removed to use own getmntops.c - fvdl

-#MOUNT= ${.CURDIR}/../mount

-#CFLAGS+= -DNFS -I${MOUNT}

-#.PATH: ${MOUNT}

+MOUNT= ${.CURDIR}/../mount

+CFLAGS+= -DNFS -I${MOUNT}

+.PATH: ${MOUNT}

CFLAGS+=-DNFS

.include <bsd.prog.mk>

diff --git a/sbin/mount_nfs/getmntopts.c b/sbin/mount_nfs/getmntopts.c
deleted file mode 100644
index d75e1e52875..00000000000
--- a/sbin/mount_nfs/getmntopts.c
+++ /dev/null

@@ -1,96 +0,0 @@

-/* $OpenBSD: getmntopts.c,v 1.3 2003/06/11 06:22:14 deraadt Exp $ */

-/*-

- *

- * 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. Neither the name of the University nor the names of its contributors

- * may be used to endorse or promote products derived from this software

- * without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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 lint

-static char sccsid[] = "@(#)getmntopts.c 8.3 (Berkeley) 3/29/95";

-#endif /* not lint */

-#include <sys/param.h>

-#include <sys/mount.h>

-#include <err.h>

-#include <errno.h>

-#include <fstab.h>

-#include <stdlib.h>

-#include <string.h>

-#include "mntopts.h"

-int getmnt_silent = 0;

-void

-getmntopts(const char *options, const struct mntopt *m0, int *flagp,

- int *altflagp)

- const struct mntopt *m;

- int negative;

- char *opt, *optbuf, *p;

- int *thisflagp;

- /* Copy option string, since it is about to be torn asunder... */

- if ((optbuf = strdup(options)) == NULL)

- err(1, NULL);

- for (opt = optbuf; (opt = strtok(opt, ",")) != NULL; opt = NULL) {

- /* Check for "no" prefix. */

- if (opt[0] == 'n' && opt[1] == 'o') {

- negative = 1;

- opt += 2;

- } else

- negative = 0;

- /*

- * for options with assignments in them (ie. quotas)

- * ignore the assignment as it's handled elsewhere

- */

- p = strchr(opt, '=');

- if (p)

- *p = '\0';

- /* Scan option table. */

- for (m = m0; m->m_option != NULL; ++m)

- if (strcasecmp(opt, m->m_option) == 0)

- break;

- /* Save flag, or fail if option is not recognised. */

- if (m->m_option) {

- thisflagp = m->m_altloc ? altflagp : flagp;

- if (negative == m->m_inverse)

- *thisflagp |= m->m_flag;

- else

- *thisflagp &= ~m->m_flag;

- } else if (!getmnt_silent) {

- errx(1, "-o %s: option not supported", opt);

- }

- free(optbuf);

diff --git a/sbin/mount_nfs/mntopts.h b/sbin/mount_nfs/mntopts.h
deleted file mode 100644
index 34d7e09297e..00000000000
--- a/sbin/mount_nfs/mntopts.h
+++ /dev/null

@@ -1,78 +0,0 @@

-/* $OpenBSD: mntopts.h,v 1.3 2003/06/02 20:06:15 millert Exp $ */