Deleted Added
full compact
mount_udf.c (227081) mount_udf.c (230226)
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 * Copyright (c) 2002 Scott Long
5 *
6 * This code is derived from software contributed to Berkeley
7 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
8 * Support code is derived from software contributed to Berkeley

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

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
1/*
2 * Copyright (c) 1992, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 * Copyright (c) 2002 Scott Long
5 *
6 * This code is derived from software contributed to Berkeley
7 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension
8 * Support code is derived from software contributed to Berkeley

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

27 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * $FreeBSD: head/sbin/mount_udf/mount_udf.c 227081 2011-11-04 13:36:02Z ed $
35 * $FreeBSD: head/sbin/mount_udf/mount_udf.c 230226 2012-01-16 19:34:21Z jh $
36 */
37
38/*
39 * This is just a rip-off of mount_iso9660.c. It's been vastly simplified
40 * because UDF doesn't take any options at this time.
41 */
42
43#include <sys/cdio.h>

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

106
107 dev = argv[0];
108 dir = argv[1];
109
110 /*
111 * Resolve the mountpoint with realpath(3) and remove unnecessary
112 * slashes from the devicename if there are any.
113 */
36 */
37
38/*
39 * This is just a rip-off of mount_iso9660.c. It's been vastly simplified
40 * because UDF doesn't take any options at this time.
41 */
42
43#include <sys/cdio.h>

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

106
107 dev = argv[0];
108 dir = argv[1];
109
110 /*
111 * Resolve the mountpoint with realpath(3) and remove unnecessary
112 * slashes from the devicename if there are any.
113 */
114 (void)checkpath(dir, mntpath);
114 if (checkpath(dir, mntpath) != 0)
115 err(EX_USAGE, "%s", mntpath);
115 (void)rmslashes(dev, dev);
116
117 /*
118 * UDF file systems are not writeable.
119 */
120 mntflags |= MNT_RDONLY;
121
122 iov[i].iov_base = "fstype";

--- 62 unchanged lines hidden ---
116 (void)rmslashes(dev, dev);
117
118 /*
119 * UDF file systems are not writeable.
120 */
121 mntflags |= MNT_RDONLY;
122
123 iov[i].iov_base = "fstype";

--- 62 unchanged lines hidden ---