From ca001f0b392858dcd07847942cfbce78aebf24ab Mon Sep 17 00:00:00 2001 From: Christian Brueffer Date: Tue, 4 Feb 2014 21:15:15 +0000 Subject: [PATCH] Unbreak mount_udf by passing the correct iovec length into nmount(). This has been broken since r247856. PR: bin/186193 Submitted by: Arnot Belohlavek MFC after: 1 week --- sbin/mount_udf/mount_udf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/mount_udf/mount_udf.c b/sbin/mount_udf/mount_udf.c index 01fa44f50e4..7585c501cf9 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); }