Deleted Added
full compact
mntopts.h (92882) mntopts.h (101205)
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)mntopts.h 8.7 (Berkeley) 3/29/95
1/*-
2 * Copyright (c) 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)mntopts.h 8.7 (Berkeley) 3/29/95
34 * $FreeBSD: head/sbin/mount/mntopts.h 92882 2002-03-21 13:14:21Z imp $
34 * $FreeBSD: head/sbin/mount/mntopts.h 101205 2002-08-02 07:02:51Z rwatson $
35 */
36
37struct mntopt {
38 const char *m_option; /* option name */
39 int m_inverse; /* if a negative option, e.g. "dev" */
40 int m_flag; /* bit to set, e.g. MNT_RDONLY */
41 int m_altloc; /* 1 => set bit in altflags */
42};

--- 9 unchanged lines hidden (view full) ---

52#define MOPT_SYNC { "sync", 0, MNT_SYNCHRONOUS, 0 }
53#define MOPT_UNION { "union", 0, MNT_UNION, 0 }
54#define MOPT_USERQUOTA { "userquota", 0, 0, 0 }
55#define MOPT_GROUPQUOTA { "groupquota", 0, 0, 0 }
56#define MOPT_NOCLUSTERR { "clusterr", 1, MNT_NOCLUSTERR, 0 }
57#define MOPT_NOCLUSTERW { "clusterw", 1, MNT_NOCLUSTERW, 0 }
58#define MOPT_SUIDDIR { "suiddir", 0, MNT_SUIDDIR, 0 }
59#define MOPT_SNAPSHOT { "snapshot", 0, MNT_SNAPSHOT, 0 }
35 */
36
37struct mntopt {
38 const char *m_option; /* option name */
39 int m_inverse; /* if a negative option, e.g. "dev" */
40 int m_flag; /* bit to set, e.g. MNT_RDONLY */
41 int m_altloc; /* 1 => set bit in altflags */
42};

--- 9 unchanged lines hidden (view full) ---

52#define MOPT_SYNC { "sync", 0, MNT_SYNCHRONOUS, 0 }
53#define MOPT_UNION { "union", 0, MNT_UNION, 0 }
54#define MOPT_USERQUOTA { "userquota", 0, 0, 0 }
55#define MOPT_GROUPQUOTA { "groupquota", 0, 0, 0 }
56#define MOPT_NOCLUSTERR { "clusterr", 1, MNT_NOCLUSTERR, 0 }
57#define MOPT_NOCLUSTERW { "clusterw", 1, MNT_NOCLUSTERW, 0 }
58#define MOPT_SUIDDIR { "suiddir", 0, MNT_SUIDDIR, 0 }
59#define MOPT_SNAPSHOT { "snapshot", 0, MNT_SNAPSHOT, 0 }
60#define MOPT_MULTILABEL { "multilabel", 0, MNT_MULTILABEL, 0 }
60
61/* Control flags. */
62#define MOPT_FORCE { "force", 0, MNT_FORCE, 0 }
63#define MOPT_UPDATE { "update", 0, MNT_UPDATE, 0 }
64#define MOPT_RO { "ro", 0, MNT_RDONLY, 0 }
65#define MOPT_RW { "rw", 1, MNT_RDONLY, 0 }
66
67/* This is parsed by mount(8), but is ignored by specific mount_*(8)s. */

--- 13 unchanged lines hidden (view full) ---

81 MOPT_NODEV, \
82 MOPT_NOEXEC, \
83 MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \
84 MOPT_NOSUID, \
85 MOPT_NOSYMFOLLOW, \
86 MOPT_RDONLY, \
87 MOPT_UNION, \
88 MOPT_NOCLUSTERR, \
61
62/* Control flags. */
63#define MOPT_FORCE { "force", 0, MNT_FORCE, 0 }
64#define MOPT_UPDATE { "update", 0, MNT_UPDATE, 0 }
65#define MOPT_RO { "ro", 0, MNT_RDONLY, 0 }
66#define MOPT_RW { "rw", 1, MNT_RDONLY, 0 }
67
68/* This is parsed by mount(8), but is ignored by specific mount_*(8)s. */

--- 13 unchanged lines hidden (view full) ---

82 MOPT_NODEV, \
83 MOPT_NOEXEC, \
84 MOPT_SUIDDIR, /* must be before MOPT_NOSUID */ \
85 MOPT_NOSUID, \
86 MOPT_NOSYMFOLLOW, \
87 MOPT_RDONLY, \
88 MOPT_UNION, \
89 MOPT_NOCLUSTERR, \
89 MOPT_NOCLUSTERW
90 MOPT_NOCLUSTERW, \
91 MOPT_MULTILABEL
90
91void getmntopts(const char *, const struct mntopt *, int *, int *);
92void rmslashes(char *, char *);
93void checkpath(const char *, char resolved_path[]);
94extern int getmnt_silent;
92
93void getmntopts(const char *, const struct mntopt *, int *, int *);
94void rmslashes(char *, char *);
95void checkpath(const char *, char resolved_path[]);
96extern int getmnt_silent;