[src/netbsd-1-5]: src/usr.sbin/pkg_install/lib Pull up revisions 1.32-1.33 (r...

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

details:   https://anonhg.NetBSD.org/src/rev/39977be0c43d
branches:  netbsd-1-5
changeset: 493137:39977be0c43d
user:      he <he%NetBSD.org@localhost>
date:      Wed Jun 26 16:50:29 2002 +0000

description:
Pull up revisions 1.32-1.33 (requested by taca):
  Synchronize with recent developments:
   o close a memory leak
   o clarify error message if running out of file descriptors
   o implement new packing list directive, @blddep
   o improve buffer size checks
   o improve error handling on installation of prerequisite packages
   o add optional file verification (none, gpg, pgp5)

diffstat:

 usr.sbin/pkg_install/lib/plist.c |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r 20e1538ff9f6 -r 39977be0c43d usr.sbin/pkg_install/lib/plist.c
--- a/usr.sbin/pkg_install/lib/plist.c  Wed Jun 26 16:50:14 2002 +0000
+++ b/usr.sbin/pkg_install/lib/plist.c  Wed Jun 26 16:50:29 2002 +0000
@@ -1,11 +1,11 @@
-/*     $NetBSD: plist.c,v 1.26.4.3 2002/02/23 18:15:10 he Exp $        */
+/*     $NetBSD: plist.c,v 1.26.4.4 2002/06/26 16:50:29 he Exp $        */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp";
 #else
-__RCSID("$NetBSD: plist.c,v 1.26.4.3 2002/02/23 18:15:10 he Exp $");
+__RCSID("$NetBSD: plist.c,v 1.26.4.4 2002/06/26 16:50:29 he Exp $");
 #endif
 #endif
 
@@ -43,7 +43,7 @@
 }       cmd_t;
 
 /* Commands to recognise */
-static cmd_t cmdv[] = {
+static const cmd_t cmdv[] = {
        {"cwd", PLIST_CWD, 1, 1},
        {"src", PLIST_SRC, 1, 1},
        {"cd", PLIST_CWD, 1, 1},
@@ -62,6 +62,7 @@
        {"mtree", PLIST_MTREE, 1, 0},
        {"dirrm", PLIST_DIR_RM, 1, 0},
        {"option", PLIST_OPTION, 1, 0},
+       {"blddep", PLIST_BLDDEP, 1, 0},
        {NULL, FAIL, 0, 0}
 };
 
@@ -229,7 +230,7 @@
 int
 plist_cmd(char *s, char **arg)
 {
-       cmd_t  *cmdp;
+       const cmd_t *cmdp;
        char    cmd[FILENAME_MAX + 20]; /* 20 == fudge for max cmd len */
        char   *cp;
        char   *sp;
@@ -292,7 +293,7 @@
 write_plist(package_t *pkg, FILE * fp, char *realprefix)
 {
        plist_t *p;
-       cmd_t  *cmdp;
+       const cmd_t *cmdp;
 
        for (p = pkg->head; p; p = p->next) {
                if (p->type == PLIST_FILE) {