From owner-svn-src-user@freebsd.org  Tue Nov 24 09:05:30 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 27BFEA36BB2
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 24 Nov 2015 09:05:30 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C4DC3100C;
 Tue, 24 Nov 2015 09:05:29 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAO95So5029278;
 Tue, 24 Nov 2015 09:05:28 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAO95SGt029277;
 Tue, 24 Nov 2015 09:05:28 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201511240905.tAO95SGt029277@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Tue, 24 Nov 2015 09:05:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r291240 -
 user/ngie/more-tests2/sbin/geom/core/tests/MdLoad
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Nov 2015 09:05:30 -0000

Author: ngie
Date: Tue Nov 24 09:05:28 2015
New Revision: 291240
URL: https://svnweb.freebsd.org/changeset/base/291240

Log:
  Catch relevant errors

Modified:
  user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c

Modified: user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c
==============================================================================
--- user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c	Tue Nov 24 08:41:27 2015	(r291239)
+++ user/ngie/more-tests2/sbin/geom/core/tests/MdLoad/MdLoad.c	Tue Nov 24 09:05:28 2015	(r291240)
@@ -35,22 +35,23 @@
  * $FreeBSD$
  */
 
+#include <sys/types.h>
+#include <sys/mman.h>
+#include <sys/queue.h>
+#include <sys/sbuf.h>
+#include <sys/stat.h>
+#include <ctype.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <paths.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <stdint.h>
 #include <string.h>
-#include <ctype.h>
-#include <errno.h>
-#include <paths.h>
-#include <fcntl.h>
-#include <err.h>
+
 #include <bsdxml.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/queue.h>
-#include <sys/sbuf.h>
-#include <sys/mman.h>
 
 struct sector {
 	LIST_ENTRY(sector)	sectors;
@@ -216,9 +217,12 @@ g_simdisk_xml_load(const char *file)
 
 	fd = open(file, O_RDONLY);
 	if (fd < 0)
-		err(1, "%s", file);
-	fstat(fd, &st);
+		err(1, "%s: opening %s failed", __func__, file);
+	if (fstat(fd, &st) == -1)
+		err(1, "%s: fstat'ing %s failed", __func__, file);
 	p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0);
+	if (p == MAP_FAILED)
+		err(1, "%s: mmap'ing %s failed", __func__, file);
 	i = XML_Parse(parser, p, st.st_size, 1);
 	if (i != 1)
 		errx(1, "XML_Parse complains: return %d", i);
@@ -252,7 +256,7 @@ main(int argc, char **argv)
 	sprintf(buf + strlen(buf), " -u %s", argv[1]);
 	error = system(buf);
 	if (error)
-		return (error);
+		err(1, "calling `%s` failed; status=%d", buf, error);
 	fd = open(argv[1], O_RDWR);
 	if (fd < 0 && errno == ENOENT) {
 		sprintf(buf, "%s%s", _PATH_DEV, argv[1]);