[src/netbsd-1-4]: src/usr.sbin/pkg_install/delete Pull up revisions 1.14-1.16...

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

details:   https://anonhg.NetBSD.org/src/rev/fab7c5b1f956
branches:  netbsd-1-4
changeset: 470825:fab7c5b1f956
user:      he <he%NetBSD.org@localhost>
date:      Mon Jul 31 18:18:44 2000 +0000

description:
Pull up revisions 1.14-1.16 (requested by hubertf):
  Update pkg_install tools by bringing in bug fixes and feature
  additions since the last release.  Fixes PR#10083 and PR#10687
  and a number of problems not formally reported.

diffstat:

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

diffs (33 lines):

diff -r 90cbc2f20bdd -r fab7c5b1f956 usr.sbin/pkg_install/delete/main.c
--- a/usr.sbin/pkg_install/delete/main.c        Mon Jul 31 18:18:41 2000 +0000
+++ b/usr.sbin/pkg_install/delete/main.c        Mon Jul 31 18:18:44 2000 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: main.c,v 1.11.2.3 1999/12/20 15:40:56 he Exp $ */
+/*     $NetBSD: main.c,v 1.11.2.4 2000/07/31 18:18:44 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.3 1999/12/20 15:40:56 he Exp $");
+__RCSID("$NetBSD: main.c,v 1.11.2.4 2000/07/31 18:18:44 he Exp $");
 #endif
 #endif
 
@@ -58,9 +58,13 @@
 find_fn(const char *pkg, char *data)
 {
        lpkg_t *lpp;
+       char fn[FILENAME_MAX];
 
-       lpp = alloc_lpkg(pkg);
-       TAILQ_INSERT_TAIL(&pkgs, lpp, lp_link);
+       snprintf(fn, sizeof(fn), "%s/%s", _pkgdb_getPKGDB_DIR(), pkg);
+       if (!isfile(fn)) {      /* might as well use sanity_check() */
+               lpp = alloc_lpkg(pkg);
+               TAILQ_INSERT_TAIL(&pkgs, lpp, lp_link);
+       }
 
        return 0;
 }