From owner-svn-src-stable@FreeBSD.ORG  Mon Nov  1 06:17:03 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5DBBA106566C;
	Mon,  1 Nov 2010 06:17:03 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B9D78FC16;
	Mon,  1 Nov 2010 06:17:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oA16H3em035200;
	Mon, 1 Nov 2010 06:17:03 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA16H3ko035198;
	Mon, 1 Nov 2010 06:17:03 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201011010617.oA16H3ko035198@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Mon, 1 Nov 2010 06:17:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214618 - stable/8/sbin/mksnap_ffs
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Nov 2010 06:17:03 -0000

Author: jh
Date: Mon Nov  1 06:17:02 2010
New Revision: 214618
URL: http://svn.freebsd.org/changeset/base/214618

Log:
  MFC r213668:
  
  - Print the nmount(2) provided error message only when it is set.
  - Ensure that the error message is NUL-terminated before printing it.
  
  PR:		bin/147482

Modified:
  stable/8/sbin/mksnap_ffs/mksnap_ffs.c
Directory Properties:
  stable/8/sbin/mksnap_ffs/   (props changed)

Modified: stable/8/sbin/mksnap_ffs/mksnap_ffs.c
==============================================================================
--- stable/8/sbin/mksnap_ffs/mksnap_ffs.c	Mon Nov  1 02:22:48 2010	(r214617)
+++ stable/8/sbin/mksnap_ffs/mksnap_ffs.c	Mon Nov  1 06:17:02 2010	(r214618)
@@ -121,8 +121,12 @@ main(int argc, char **argv)
 	build_iovec(&iov, &iovlen, "update", NULL, 0);
 	build_iovec(&iov, &iovlen, "snapshot", NULL, 0);
 
-	if (nmount(iov, iovlen, stfsbuf.f_flags) < 0)
-		err(1, "Cannot create snapshot %s: %s", snapname, errmsg);
+	*errmsg = '\0';
+	if (nmount(iov, iovlen, stfsbuf.f_flags) < 0) {
+		errmsg[sizeof(errmsg) - 1] = '\0';
+		err(1, "Cannot create snapshot %s%s%s", snapname,
+		    *errmsg != '\0' ? ": " : "", errmsg);
+	}
 	if ((fd = open(snapname, O_RDONLY)) < 0)
 		err(1, "Cannot open %s", snapname);
 	if (fstat(fd, &stbuf) != 0)