[src/trunk]: src/external/bsd/pkg_install/dist pkg_install-20091008:

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

details:   https://anonhg.NetBSD.org/src/rev/c98677297347
branches:  trunk
changeset: 747995:c98677297347
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Oct 08 16:19:59 2009 +0000

description:
pkg_install-20091008:
- Fix German accent
- Don't dereference a null pointer for pkg_admin add

diffstat:

 external/bsd/pkg_install/dist/admin/main.c  |  14 ++++++++++----
 external/bsd/pkg_install/dist/lib/version.h |   4 ++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 71d0ad7f07aa -r c98677297347 external/bsd/pkg_install/dist/admin/main.c
--- a/external/bsd/pkg_install/dist/admin/main.c        Thu Oct 08 13:16:13 2009 +0000
+++ b/external/bsd/pkg_install/dist/admin/main.c        Thu Oct 08 16:19:59 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.1.1.10 2009/10/07 13:19:40 joerg Exp $      */
+/*     $NetBSD: main.c,v 1.1.1.11 2009/10/08 16:19:59 joerg Exp $      */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: main.c,v 1.1.1.10 2009/10/07 13:19:40 joerg Exp $");
+__RCSID("$NetBSD: main.c,v 1.1.1.11 2009/10/08 16:19:59 joerg Exp $");
 
 /*-
  * Copyright (c) 1999-2009 The NetBSD Foundation, Inc.
@@ -253,7 +253,7 @@
        iterate_pkg_db(add_pkg, &count);
 
        printf("\n");
-       printf("Stored %zu file%s and %zu explizit director%s"
+       printf("Stored %zu file%s and %zu explicit director%s"
            " from %zu package%s in %s.\n",
            count.files, count.files == 1 ? "" : "s",
            count.directories, count.directories == 1 ? "y" : "ies",
@@ -517,8 +517,14 @@
                pkgdb_dump();
 
        } else if (strcasecmp(argv[0], "add") == 0) {
+               struct pkgdb_count count;
+
+               count.files = 0;
+               count.directories = 0;
+               count.packages = 0;
+
                for (++argv; *argv != NULL; ++argv)
-                       add_pkg(*argv, NULL);
+                       add_pkg(*argv, &count);
        } else if (strcasecmp(argv[0], "delete") == 0) {
                argv++;         /* "delete" */
                while (*argv != NULL) {
diff -r 71d0ad7f07aa -r c98677297347 external/bsd/pkg_install/dist/lib/version.h
--- a/external/bsd/pkg_install/dist/lib/version.h       Thu Oct 08 13:16:13 2009 +0000
+++ b/external/bsd/pkg_install/dist/lib/version.h       Thu Oct 08 16:19:59 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.1.1.20 2009/10/07 13:19:45 joerg Exp $   */
+/*     $NetBSD: version.h,v 1.1.1.21 2009/10/08 16:20:04 joerg Exp $   */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20091006"
+#define PKGTOOLS_VERSION "20091008"
 
 #endif /* _INST_LIB_VERSION_H_ */