diff options
| author | joerg <joerg> | 2009-10-08 16:16:12 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2009-10-08 16:16:12 +0000 |
| commit | 51431a9fead76d0ad559aed282f25fd5bb69c675 (patch) | |
| tree | d025abe2951f5f7807fc8cf2c068e80c3cc3a651 /pkgtools | |
| parent | 108f651dbcc84a712879d20609e545dd04d32bd0 (diff) | |
| download | pkgsrc-51431a9fead76d0ad559aed282f25fd5bb69c675.tar.gz | |
pkg_install-20091008:
- Fix German accent
- Don't dereference a null pointer for pkg_admin add
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_install/files/admin/main.c | 14 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
2 files changed, 12 insertions, 6 deletions
diff --git a/pkgtools/pkg_install/files/admin/main.c b/pkgtools/pkg_install/files/admin/main.c index 3541f968c13..cfa475992ca 100644 --- a/pkgtools/pkg_install/files/admin/main.c +++ b/pkgtools/pkg_install/files/admin/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.56 2009/10/07 12:53:26 joerg Exp $ */ +/* $NetBSD: main.c,v 1.57 2009/10/08 16:16:12 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.56 2009/10/07 12:53:26 joerg Exp $"); +__RCSID("$NetBSD: main.c,v 1.57 2009/10/08 16:16:12 joerg Exp $"); /*- * Copyright (c) 1999-2009 The NetBSD Foundation, Inc. @@ -253,7 +253,7 @@ rebuild(void) 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 @@ main(int argc, char *argv[]) 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 --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index b428e1c4e5d..552fa892e3c 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.138 2009/10/07 12:53:27 joerg Exp $ */ +/* $NetBSD: version.h,v 1.139 2009/10/08 16:16:12 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_ */ |