Deleted Added
full compact
mount_fs.c (227081) mount_fs.c (230226)
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software donated to Berkeley by
6 * Jan-Simon Pendry.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:
11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 * 4. Neither the name of the University nor the names of its contributors
17 * may be used to endorse or promote products derived from this software
18 * without specific prior written permission.
19 *
20 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#ifndef lint
34static const char copyright[] =
35"@(#) Copyright (c) 1992, 1993, 1994\n\
36 The Regents of the University of California. All rights reserved.\n";
37#endif /* not lint */
38
39#ifndef lint
40#if 0
41static char sccsid[] = "@(#)mount_fs.c 8.6 (Berkeley) 4/26/95";
42#endif
43static const char rcsid[] =
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * This code is derived from software donated to Berkeley by
6 * Jan-Simon Pendry.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:
11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 * 4. Neither the name of the University nor the names of its contributors
17 * may be used to endorse or promote products derived from this software
18 * without specific prior written permission.
19 *
20 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
21 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 */
32
33#ifndef lint
34static const char copyright[] =
35"@(#) Copyright (c) 1992, 1993, 1994\n\
36 The Regents of the University of California. All rights reserved.\n";
37#endif /* not lint */
38
39#ifndef lint
40#if 0
41static char sccsid[] = "@(#)mount_fs.c 8.6 (Berkeley) 4/26/95";
42#endif
43static const char rcsid[] =
44 "$FreeBSD: head/sbin/mount/mount_fs.c 227081 2011-11-04 13:36:02Z ed $";
44 "$FreeBSD: head/sbin/mount/mount_fs.c 230226 2012-01-16 19:34:21Z jh $";
45#endif /* not lint */
46
47#include <sys/param.h>
48#include <sys/mount.h>
49
50#include <err.h>
51#include <getopt.h>
52#include <libgen.h>
53#include <stdio.h>
54#include <stdlib.h>
55#include <string.h>
56#include <unistd.h>
57
58#include "extern.h"
59#include "mntopts.h"
60
61static struct mntopt mopts[] = {
62 MOPT_STDOPTS,
63 MOPT_END
64};
65
66static void
67usage(void)
68{
69 (void)fprintf(stderr,
70 "usage: mount [-t fstype] [-o options] target_fs mount_point\n");
71 exit(1);
72}
73
74int
75mount_fs(const char *vfstype, int argc, char *argv[])
76{
77 struct iovec *iov;
78 int iovlen;
79 int mntflags = 0;
80 int ch;
81 char *dev, *dir, mntpath[MAXPATHLEN];
82 char fstype[32];
83 char errmsg[255];
84 char *p, *val;
85 int ret;
86
87 strlcpy(fstype, vfstype, sizeof(fstype));
88 memset(errmsg, 0, sizeof(errmsg));
89
90 getmnt_silent = 1;
91 iov = NULL;
92 iovlen = 0;
93
94 optind = optreset = 1; /* Reset for parse of new argv. */
95 while ((ch = getopt(argc, argv, "o:")) != -1) {
96 switch(ch) {
97 case 'o':
98 getmntopts(optarg, mopts, &mntflags, 0);
99 p = strchr(optarg, '=');
100 val = NULL;
101 if (p != NULL) {
102 *p = '\0';
103 val = p + 1;
104 }
105 build_iovec(&iov, &iovlen, optarg, val, (size_t)-1);
106 break;
107 case '?':
108 default:
109 usage();
110 }
111 }
112
113 argc -= optind;
114 argv += optind;
115 if (argc != 2)
116 usage();
117
118 dev = argv[0];
119 dir = argv[1];
120
45#endif /* not lint */
46
47#include <sys/param.h>
48#include <sys/mount.h>
49
50#include <err.h>
51#include <getopt.h>
52#include <libgen.h>
53#include <stdio.h>
54#include <stdlib.h>
55#include <string.h>
56#include <unistd.h>
57
58#include "extern.h"
59#include "mntopts.h"
60
61static struct mntopt mopts[] = {
62 MOPT_STDOPTS,
63 MOPT_END
64};
65
66static void
67usage(void)
68{
69 (void)fprintf(stderr,
70 "usage: mount [-t fstype] [-o options] target_fs mount_point\n");
71 exit(1);
72}
73
74int
75mount_fs(const char *vfstype, int argc, char *argv[])
76{
77 struct iovec *iov;
78 int iovlen;
79 int mntflags = 0;
80 int ch;
81 char *dev, *dir, mntpath[MAXPATHLEN];
82 char fstype[32];
83 char errmsg[255];
84 char *p, *val;
85 int ret;
86
87 strlcpy(fstype, vfstype, sizeof(fstype));
88 memset(errmsg, 0, sizeof(errmsg));
89
90 getmnt_silent = 1;
91 iov = NULL;
92 iovlen = 0;
93
94 optind = optreset = 1; /* Reset for parse of new argv. */
95 while ((ch = getopt(argc, argv, "o:")) != -1) {
96 switch(ch) {
97 case 'o':
98 getmntopts(optarg, mopts, &mntflags, 0);
99 p = strchr(optarg, '=');
100 val = NULL;
101 if (p != NULL) {
102 *p = '\0';
103 val = p + 1;
104 }
105 build_iovec(&iov, &iovlen, optarg, val, (size_t)-1);
106 break;
107 case '?':
108 default:
109 usage();
110 }
111 }
112
113 argc -= optind;
114 argv += optind;
115 if (argc != 2)
116 usage();
117
118 dev = argv[0];
119 dir = argv[1];
120
121 (void)checkpath(dir, mntpath);
121 if (checkpath(dir, mntpath) != 0) {
122 warn("%s", mntpath);
123 return (1);
124 }
122 (void)rmslashes(dev, dev);
123
124 build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
125 build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
126 build_iovec(&iov, &iovlen, "from", dev, (size_t)-1);
127 build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
128
129 ret = nmount(iov, iovlen, mntflags);
130 if (ret < 0)
131 err(1, "%s %s", dev, errmsg);
132
133 return (ret);
134}
125 (void)rmslashes(dev, dev);
126
127 build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
128 build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
129 build_iovec(&iov, &iovlen, "from", dev, (size_t)-1);
130 build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
131
132 ret = nmount(iov, iovlen, mntflags);
133 if (ret < 0)
134 err(1, "%s %s", dev, errmsg);
135
136 return (ret);
137}