Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-1-4]: src/usr.sbin/pkg_install/delete Pull up revision 1.14 (requ...



details:   https://anonhg.NetBSD.org/src/rev/4b1aaa15bf95
branches:  netbsd-1-4
changeset: 469925:4b1aaa15bf95
user:      he <he%NetBSD.org@localhost>
date:      Mon Dec 20 15:40:56 1999 +0000

description:
Pull up revision 1.14 (requested by hubertf):
  Add some sanity checks on what pkgdb_retrieve() returns.

diffstat:

 usr.sbin/pkg_install/delete/main.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r bcfbf968c20b -r 4b1aaa15bf95 usr.sbin/pkg_install/delete/main.c
--- a/usr.sbin/pkg_install/delete/main.c        Mon Dec 20 15:36:55 1999 +0000
+++ b/usr.sbin/pkg_install/delete/main.c        Mon Dec 20 15:40:56 1999 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: main.c,v 1.11.2.2 1999/09/13 22:06:59 he Exp $ */
+/*     $NetBSD: main.c,v 1.11.2.3 1999/12/20 15:40:56 he Exp $ */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.11 1997/10/08 07:46:48 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.11.2.2 1999/09/13 22:06:59 he Exp $");
+__RCSID("$NetBSD: main.c,v 1.11.2.3 1999/12/20 15:40:56 he Exp $");
 #endif
 #endif
 
@@ -181,6 +181,8 @@
                error = 0;
                while ((key = pkgdb_iter())) {
                        val = pkgdb_retrieve(key);
+                       if (val == NULL || *val == '\0')
+                               continue;
 
                        lpp = TAILQ_FIRST(&pkgs);
                        if (lpp != NULL) {



Home | Main Index | Thread Index | Old Index