[src/netbsd-7]: src Pull up following revision(s) (requested by mlelstv in ti...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5d9776b29d2c
branches:  netbsd-7
changeset: 799510:5d9776b29d2c
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jul 30 15:36:03 2015 +0000

description:
Pull up following revision(s) (requested by mlelstv in ticket #900):
        sbin/newfs/newfs.c: revision 1.113
        usr.sbin/installboot/installboot.c: revision 1.39
Handle getfsspecname errors.

diffstat:

 sbin/newfs/newfs.c                 |  12 +++++++-----
 usr.sbin/installboot/installboot.c |   6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (60 lines):

diff -r 94a66891b40c -r 5d9776b29d2c sbin/newfs/newfs.c
--- a/sbin/newfs/newfs.c        Thu Jul 30 15:32:46 2015 +0000
+++ b/sbin/newfs/newfs.c        Thu Jul 30 15:36:03 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: newfs.c,v 1.111.10.1 2014/11/11 10:21:25 martin Exp $  */
+/*     $NetBSD: newfs.c,v 1.111.10.2 2015/07/30 15:36:03 snj Exp $     */
 
 /*
  * Copyright (c) 1983, 1989, 1993, 1994
@@ -78,7 +78,7 @@
 #if 0
 static char sccsid[] = "@(#)newfs.c    8.13 (Berkeley) 5/1/95";
 #else
-__RCSID("$NetBSD: newfs.c,v 1.111.10.1 2014/11/11 10:21:25 martin Exp $");
+__RCSID("$NetBSD: newfs.c,v 1.111.10.2 2015/07/30 15:36:03 snj Exp $");
 #endif
 #endif /* not lint */
 
@@ -493,9 +493,11 @@
                                fso = fsi;
                }
        } else {        /* !Fflag && !mfs */
-               special = getfsspecname(specname, sizeof(specname), special);
-               raw = getdiskrawname(rawname, sizeof(rawname), special);
-               if (raw != NULL)
+               raw = getfsspecname(specname, sizeof(specname), special);
+               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);
diff -r 94a66891b40c -r 5d9776b29d2c usr.sbin/installboot/installboot.c
--- a/usr.sbin/installboot/installboot.c        Thu Jul 30 15:32:46 2015 +0000
+++ b/usr.sbin/installboot/installboot.c        Thu Jul 30 15:36:03 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: installboot.c,v 1.36.18.1 2015/07/16 21:36:59 snj Exp $        */
+/*     $NetBSD: installboot.c,v 1.36.18.2 2015/07/30 15:36:03 snj Exp $        */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if !defined(__lint)
-__RCSID("$NetBSD: installboot.c,v 1.36.18.1 2015/07/16 21:36:59 snj Exp $");
+__RCSID("$NetBSD: installboot.c,v 1.36.18.2 2015/07/30 15:36:03 snj Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -240,6 +240,8 @@
 
 #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;