[src/netbsd-1-5]: src/usr.sbin/pkg_install/admin Pull up revisions 1.24-1.26 ...

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

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

description:
Pull up revisions 1.24-1.26 (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/admin/main.c |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (71 lines):

diff -r 93e0cc24d4cd -r 49012cd855cb usr.sbin/pkg_install/admin/main.c
--- a/usr.sbin/pkg_install/admin/main.c Wed Jun 26 16:52:09 2002 +0000
+++ b/usr.sbin/pkg_install/admin/main.c Wed Jun 26 16:52:29 2002 +0000
@@ -1,8 +1,8 @@
-/*     $NetBSD: main.c,v 1.13.4.4 2001/04/24 22:27:19 he Exp $ */
+/*     $NetBSD: main.c,v 1.13.4.5 2002/06/26 16:52:29 he Exp $ */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: main.c,v 1.13.4.4 2001/04/24 22:27:19 he Exp $");
+__RCSID("$NetBSD: main.c,v 1.13.4.5 2002/06/26 16:52:29 he Exp $");
 #endif
 
 /*
@@ -52,6 +52,8 @@
 int     filecnt;
 int     pkgcnt;
 
+static int checkpattern_fn(const char *, void *);
+
 /*
  * Assumes CWD is in /var/db/pkg/<pkg>!
  */
@@ -135,6 +137,7 @@
                case PLIST_IGNORE_INST:
                case PLIST_OPTION:
                case PLIST_PKGCFL:
+               case PLIST_BLDDEP:
                        break;
                }
        }
@@ -245,6 +248,7 @@
                        case PLIST_IGNORE_INST:
                        case PLIST_OPTION:
                        case PLIST_PKGCFL:
+                       case PLIST_BLDDEP:
                                break;
                        }
                }
@@ -305,7 +309,7 @@
 }
 
 static int
-checkpattern_fn(const char *pkg, char *data)
+checkpattern_fn(const char *pkg, void *vp)
 {
        int     rc;
 
@@ -322,8 +326,9 @@
 }
 
 static int
-lspattern_fn(const char *pkg, char *data)
+lspattern_fn(const char *pkg, void *vp)
 {
+       char *data = vp;
        printf("%s/%s\n", data, pkg);
        
        return 0;
@@ -469,8 +474,10 @@
 
                        cwd = getcwd(NULL, 0);
                        p = findbestmatchingname(cwd, base);
-                       if (p)
+                       if (p) {
                                printf("%s/%s\n", cwd, p);
+                               free(p);
+                       }
                        free(cwd);
                        
                        argv++;