 @@ -1,14 +1,14 @@
-/*	$NetBSD: newfs.c,v 1.112 2014/10/25 16:47:23 mlelstv Exp $	*/
+/*	$NetBSD: newfs.c,v 1.113 2015/07/25 10:37:22 mlelstv Exp $	*/
 /*
  * Copyright (c) 1983, 1989, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -68,27 +68,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)newfs.c	8.13 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: newfs.c,v 1.112 2014/10/25 16:47:23 mlelstv Exp $");
+__RCSID("$NetBSD: newfs.c,v 1.113 2015/07/25 10:37:22 mlelstv Exp $");
 #endif
 #endif /* not lint */
 /*
  * newfs: friendly front end to mkfs
  */
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/file.h>
 #include <sys/mount.h>
 #include <sys/sysctl.h>
 @@ -483,29 +483,31 @@ main(int argc, char *argv[])
 					fl = O_RDWR | O_CREAT;
 				else
 					fl = O_RDWR;
+			}
 			fsi = open(special, fl, 0777);
 			if (fsi == -1)
 				err(1, "can't open file %s", special);
 			if (fstat(fsi, &sb) == -1)
 				err(1, "can't fstat opened %s", special);
 			if (!Nflag)
 				fso = fsi;
+		}
 	} else {	/* !Fflag && !mfs */
-		special = getfsspecname(specname, sizeof(specname), special);
+		raw = getfsspecname(specname, sizeof(specname), special);
-		raw = getdiskrawname(rawname, sizeof(rawname), special);
+		if (raw == NULL)
-		if (raw != NULL)
+			err(1, "%s: %s", special, specname);
 		special = getdiskrawname(rawname, sizeof(rawname), raw);
 		if (special == NULL)
 			special = raw;
 		fsi = opendisk(special, O_RDONLY, device, sizeof(device), 0);
 		special = device;
 		if (fsi < 0 || fstat(fsi, &sb) == -1)
 			err(1, "%s: open for read", special);
 		if (S_ISBLK(sb.st_mode)) {
 			errx(1, "%s is a block device. use raw device",
 			    special);
+		}
 		if (!Nflag) {
 			fso = open(special, O_WRONLY, 0);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: installboot.c,v 1.38 2015/06/05 07:44:39 mlelstv Exp $	*/
+/*	$NetBSD: installboot.c,v 1.39 2015/07/25 10:37:22 mlelstv Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Luke Mewburn of Wasabi Systems.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -25,27 +25,27 @@
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: installboot.c,v 1.38 2015/06/05 07:44:39 mlelstv Exp $");
+__RCSID("$NetBSD: installboot.c,v 1.39 2015/07/25 10:37:22 mlelstv Exp $");
 #endif	/* !__lint */
 #include <sys/param.h>
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
 #include <assert.h>
 #include <err.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 @@ -230,26 +230,28 @@ main(int argc, char *argv[])
+	}
 	if (params->flags & IB_CLEAR &&
 	    params->flags & (IB_STAGE1START | IB_STAGE2START | IB_APPEND)) {
 		warnx("Can't use `-b bno', `-B bno' or `-o append' with `-c'");
 		exit(1);
+	}
 	if (argc >= 3) {
 		params->stage2 = argv[2];
+	}
 #if !HAVE_NBTOOL_CONFIG_H
 	special = getfsspecname(specname, sizeof(specname), argv[0]);
 	if (special == NULL)
 		err(1, "%s: %s", argv[0], specname);
 	raw = getdiskrawname(rawname, sizeof(rawname), special);
 	if (raw != NULL)
 		special = raw;
 	params->filesystem = special;
 #else
 	params->filesystem = argv[0];
 #endif
 	if (params->flags & IB_NOWRITE) {
 		op = "only";
 		mode = O_RDONLY;
 	} else {
 		op = "write";