[src/netbsd-1-6]: src/usr.sbin/pkg_install/add Pull up revision 1.67 (request...

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

details:   https://anonhg.NetBSD.org/src/rev/df3ec84f00e9
branches:  netbsd-1-6
changeset: 528500:df3ec84f00e9
user:      lukem <lukem%NetBSD.org@localhost>
date:      Sun Jul 21 04:37:11 2002 +0000

description:
Pull up revision 1.67 (requested by lukem):
don't pass null pointers to printf for "%s".

diffstat:

 usr.sbin/pkg_install/add/perform.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r 2ea2ac620396 -r df3ec84f00e9 usr.sbin/pkg_install/add/perform.c
--- a/usr.sbin/pkg_install/add/perform.c        Sun Jul 21 04:35:49 2002 +0000
+++ b/usr.sbin/pkg_install/add/perform.c        Sun Jul 21 04:37:11 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: perform.c,v 1.63.2.2 2002/07/21 04:22:11 lukem Exp $   */
+/*     $NetBSD: perform.c,v 1.63.2.3 2002/07/21 04:37:11 lukem Exp $   */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.63.2.2 2002/07/21 04:22:11 lukem Exp $");
+__RCSID("$NetBSD: perform.c,v 1.63.2.3 2002/07/21 04:37:11 lukem Exp $");
 #endif
 #endif
 
@@ -91,7 +91,7 @@
                }
                if (cp == NULL) {
                        warnx("<%s> (1) add of dependency `%s' failed%s",
-                           pkg, name, Force ? " (proceeding anyway)" : "!");
+                           pkg ? pkg : "stdin", name, Force ? " (proceeding anyway)" : "!");
                        if (!Force)
                                ++errc;
                } else {
@@ -159,7 +159,7 @@
                                                Prefix ? Prefix : "",
                                        Verbose ? "-v " : "")) {
                                        warnx("<%s> (2) add of dependency `%s' failed%s",
-                                             pkg, name, Force ? " (proceeding anyway)" : "!");
+                                             pkg ? pkg : "stdin", name, Force ? " (proceeding anyway)" : "!");
                                        if (!Force)
                                                ++errc;
                                } else {