From owner-svn-src-stable-10@FreeBSD.ORG Tue Feb 11 08:20:46 2014 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 517F8552; Tue, 11 Feb 2014 08:20:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3A55E15F3; Tue, 11 Feb 2014 08:20:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1B8Kk32082260; Tue, 11 Feb 2014 08:20:46 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1B8KkbQ082259; Tue, 11 Feb 2014 08:20:46 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201402110820.s1B8KkbQ082259@svn.freebsd.org> From: Christian Brueffer Date: Tue, 11 Feb 2014 08:20:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r261741 - stable/10/sbin/mount_udf X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 08:20:46 -0000 Author: brueffer Date: Tue Feb 11 08:20:45 2014 New Revision: 261741 URL: http://svnweb.freebsd.org/changeset/base/261741 Log: 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 Modified: stable/10/sbin/mount_udf/mount_udf.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sbin/mount_udf/mount_udf.c ============================================================================== --- stable/10/sbin/mount_udf/mount_udf.c Tue Feb 11 08:15:40 2014 (r261740) +++ stable/10/sbin/mount_udf/mount_udf.c Tue Feb 11 08:20:45 2014 (r261741) @@ -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); }