Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 4 Feb 2014 21:15:15 +0000 (UTC)
From:      Christian Brueffer <brueffer@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r261496 - head/sbin/mount_udf
Message-ID:  <201402042115.s14LFFrJ062028@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: brueffer
Date: Tue Feb  4 21:15:15 2014
New Revision: 261496
URL: http://svnweb.freebsd.org/changeset/base/261496

Log:
  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

Modified:
  head/sbin/mount_udf/mount_udf.c

Modified: head/sbin/mount_udf/mount_udf.c
==============================================================================
--- head/sbin/mount_udf/mount_udf.c	Tue Feb  4 20:52:33 2014	(r261495)
+++ head/sbin/mount_udf/mount_udf.c	Tue Feb  4 21:15:15 2014	(r261496)
@@ -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);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402042115.s14LFFrJ062028>