summaryrefslogtreecommitdiff
path: root/usr.sbin/pkg_install/admin
diff options
context:
space:
mode:
authoragc <agc@NetBSD.org>2003-03-15 20:49:25 +0000
committeragc <agc@NetBSD.org>2003-03-15 20:49:25 +0000
commit2c442ad8d2e4fa59ca1898be4158fa46ac43bda5 (patch)
tree886f75a0d26eb4f6b790acea6ea2ddeeb746f07a /usr.sbin/pkg_install/admin
parent640bee30109d49aecf2e7ee4ba3070aea8b250d7 (diff)
Introduce a pkgdb_dump() function, which dumps the cache file of
(filename, package) pairs. Modify calling functions to use pkgdb_dump() directly, rather than sequences of pkgdb_open { pkgdb_iter, pkgdb_retrieve } pkgdb_close calls. Remove the now unnecessary pkgdb_iter function.
Diffstat (limited to 'usr.sbin/pkg_install/admin')
-rw-r--r--usr.sbin/pkg_install/admin/main.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/usr.sbin/pkg_install/admin/main.c b/usr.sbin/pkg_install/admin/main.c
index df199b6c352..00a3808eadc 100644
--- a/usr.sbin/pkg_install/admin/main.c
+++ b/usr.sbin/pkg_install/admin/main.c
@@ -1,8 +1,8 @@
-/* $NetBSD: main.c,v 1.32 2003/01/10 10:17:21 agc Exp $ */
+/* $NetBSD: main.c,v 1.33 2003/03/15 20:49:25 agc Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.32 2003/01/10 10:17:21 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.33 2003/03/15 20:49:25 agc Exp $");
#endif
/*
@@ -509,21 +509,7 @@ main(int argc, char *argv[])
} else if (strcasecmp(argv[1], "list") == 0 ||
strcasecmp(argv[1], "dump") == 0) {
- char *key, *val;
- char cachename[FILENAME_MAX];
-
-
- printf("Dumping pkgdb %s:\n", _pkgdb_getPKGDB_FILE(cachename, sizeof(cachename)));
-
- if (!pkgdb_open(ReadOnly)) {
- err(EXIT_FAILURE, "cannot open %s", cachename);
- }
- while ((key = pkgdb_iter())) {
- val = pkgdb_retrieve(key);
-
- printf("file: %-50s pkg: %s\n", key, val);
- }
- pkgdb_close();
+ pkgdb_dump();
}
#ifdef PKGDB_DEBUG