 @@ -1,23 +1,23 @@
-/*	$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"
 #endif
 #include <nbcompat.h>
 #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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Hubert Feyrer <hubert@feyrer.de> and
  * by Joerg Sonnenberger <joerg@NetBSD.org>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -243,27 +243,27 @@ rebuild(void)
 	count.files = 0;
 	count.directories = 0;
 	count.packages = 0;
 	(void) _pkgdb_getPKGDB_FILE(cachename, sizeof(cachename));
 	if (unlink(cachename) != 0 && errno != ENOENT)
 		err(EXIT_FAILURE, "unlink %s", cachename);
 	setbuf(stdout, NULL);
 	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",
 	    count.packages, count.packages == 1 ? "" : "s",
 	    cachename);
+}
 static int
 lspattern(const char *pkg, void *vp)
+{
 	const char *dir = vp;
 	printf("%s/%s\n", dir, pkg);
 	return 0;
 @@ -507,28 +507,34 @@ main(int argc, char *argv[])
 				else
 					printf("%s/%s\n", dir, p);
 				free(p);
+			}
 			argv++;
+		}
 	} else if (strcasecmp(argv[0], "list") == 0 ||
 	    strcasecmp(argv[0], "dump") == 0) {
 		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) {
 			delete1pkg(*argv);
 			argv++;
+		}
 	} else if (strcasecmp(argv[0], "set") == 0) {
 		argv++;		/* "set" */
 		set_unset_variable(argv, FALSE);
 	} else if (strcasecmp(argv[0], "unset") == 0) {
 		argv++;		/* "unset" */
 		set_unset_variable(argv, TRUE);
 	} else if (strcasecmp(argv[0], "config-var") == 0) {

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -17,16 +17,16 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
-#define PKGTOOLS_VERSION "20091006"
+#define PKGTOOLS_VERSION "20091008"
 #endif /* _INST_LIB_VERSION_H_ */