summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorbrueffer <brueffer@FreeBSD.org>2014-02-11 08:20:45 +0000
committerbrueffer <brueffer@FreeBSD.org>2014-02-11 08:20:45 +0000
commitdfbfe377ea556815e01a1b2d92218bf714a9c4b8 (patch)
tree3450fffec2e10fe8a6b65af332218e507faf144a /sbin
parent8caff4cde9435d87370d86e99d9f10bd783e1bd9 (diff)
downloadFreeBSD-src-dfbfe377ea556815e01a1b2d92218bf714a9c4b8.zip
FreeBSD-src-dfbfe377ea556815e01a1b2d92218bf714a9c4b8.tar.gz
MFC: r261496
Unbreak mount_udf by passing the correct iovec length into nmount(). This has been broken since r247861. PR: bin/186193 Submitted by: Arnot Belohlavek
Diffstat (limited to 'sbin')
-rw-r--r--sbin/mount_udf/mount_udf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c
index 01fa44f..7585c50 100644
--- a/sbin/mount_udf/mount_udf.c
+++ b/sbin/mount_udf/mount_udf.c
@@ -77,9 +77,9 @@ main(int argc, char **argv)
char fstype[] = "udf";
struct iovec *iov;
char *cs_disk, *cs_local, *dev, *dir;
- int ch, i, iovlen, mntflags, udf_flags, verbose;
+ int ch, iovlen, mntflags, udf_flags, verbose;
- i = iovlen = mntflags = udf_flags = verbose = 0;
+ iovlen = mntflags = udf_flags = verbose = 0;
cs_disk = cs_local = NULL;
iov = NULL;
while ((ch = getopt(argc, argv, "o:vC:")) != -1)
@@ -129,7 +129,7 @@ main(int argc, char **argv)
build_iovec(&iov, &iovlen, "cs_disk", cs_disk, (size_t)-1);
build_iovec(&iov, &iovlen, "cs_local", cs_local, (size_t)-1);
}
- if (nmount(iov, i, mntflags) < 0)
+ if (nmount(iov, iovlen, mntflags) < 0)
err(1, "%s", dev);
exit(0);
}
OpenPOWER on IntegriCloud