 @@ -1,22 +1,22 @@
-/*	$NetBSD: perform.c,v 1.81 2009/02/28 16:03:56 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.82 2009/03/02 14:59:14 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: perform.c,v 1.81 2009/02/28 16:03:56 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.82 2009/03/02 14:59:14 joerg Exp $");
 /*-
  * Copyright (c) 2003 Grant Beattie <grant@NetBSD.org>
  * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
  * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * 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
 @@ -347,26 +347,27 @@ check_already_installed(struct pkg_task
 		return -1;
 	/* We can only arrive here for explicitly requested packages. */
 	if (!Automatic && is_automatic_installed(pkg->pkgname)) {
 		if (Fake ||
 		    mark_as_automatic_installed(pkg->pkgname, 0) == 0)
 			warnx("package `%s' was already installed as "
 			      "dependency, now marked as installed "
 			      "manually", pkg->pkgname);
 	} else {
 		warnx("package `%s' already recorded as installed",
 		      pkg->pkgname);
+	}
 	close(fd);
 	return 0;
+}
 static int
 check_other_installed(struct pkg_task *pkg)
+{
 	FILE *f, *f_pkg;
 	size_t len;
 	char *pkgbase, *iter, *filename;
 	package_t plist;
 	plist_t *p;
 	int status;
 @@ -539,26 +540,27 @@ write_meta_data(struct pkg_task *pkg)
 		(void)unlink(filename);
 		fd = open(filename, O_WRONLY | O_TRUNC | O_CREAT, descr->perm);
 		if (fd == -1) {
 			warn("Can't open meta data file: %s", filename);
 			return -1;
+		}
 		len = strlen(*target);
 		do {
 			ret = write(fd, *target, len);
 			if (ret == -1) {
 				warn("Can't write meta data file: %s",
 				    filename);
 				free(filename);
 				close(fd);
 				return -1;
+			}
 			len -= ret;
 		} while (ret > 0);
 		if (close(fd) == -1) {
 			warn("Can't close meta data file: %s", filename);
 			free(filename);
 			return -1;
+		}
 		free(filename);
+	}
 	return 0;
 @@ -761,32 +763,34 @@ pkg_register_depends(struct pkg_task *pk
 	if (Fake)
 		return;
 	if (pkg->other_version != NULL)
 		return; /* XXX It's using the old dependencies. */
 	text = xasprintf("%s\n", pkg->pkgname);
 	text_len = strlen(text);
 	for (i = 0; i < pkg->dep_length; ++i) {
 		required_by = pkgdb_pkg_file(pkg->dependencies[i], REQUIRED_BY_FNAME);
 		fd = open(required_by, O_WRONLY | O_APPEND | O_CREAT, 0644);
-		if (fd == -1)
+		if (fd == -1) {
 			warn("can't open dependency file '%s',"
 			    "registration is incomplete!", required_by);
-		else if (write(fd, text, text_len) != text_len)
+			close(fd);
 		} else if (write(fd, text, text_len) != text_len) {
 			warn("can't write to dependency file `%s'", required_by);
-		else if (close(fd) == -1)
+			close(fd);
 		} else if (close(fd) == -1)
 			warn("cannot close file %s", required_by);
 		free(required_by);
+	}
 	free(text);
+}
 /*
  * Reduce the result from uname(3) to a canonical form.
  */
 static void
 normalise_platform(struct utsname *host_name)

 @@ -1,23 +1,23 @@
-/*	$NetBSD: pkcs7.c,v 1.3 2009/02/16 20:59:11 joerg Exp $	*/
+/*	$NetBSD: pkcs7.c,v 1.4 2009/03/02 14:59:14 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: pkcs7.c,v 1.3 2009/02/16 20:59:11 joerg Exp $");
+__RCSID("$NetBSD: pkcs7.c,v 1.4 2009/03/02 14:59:14 joerg Exp $");
 /*-
  * Copyright (c) 2004, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Love H�rnquist �strand <lha@it.su.se>
+ *
  * 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.
 @@ -95,26 +95,27 @@ file_to_certs(const char *file)
 	for (;;) {
 		X509 *cert;
 		cert = PEM_read_X509(f, NULL, NULL, NULL);
 		if (cert == NULL) {
 			ret = ERR_GET_REASON(ERR_peek_error());
 			if (ret == PEM_R_NO_START_LINE) {
 				/* End of file reached. no error */
 				ERR_clear_error();
 				break;
+			}
 			sk_X509_free(certs);
 			warnx("Can't read certificate in file: %s", file);
 			fclose(f);
 			return NULL;
+		}
 		sk_X509_insert(certs, cert, sk_X509_num(certs));
+	}
 	fclose(f);
 	if (sk_X509_num(certs) == 0) {
 		sk_X509_free(certs);
 		certs = NULL;
 		warnx("No certificate found in file %s", file);
+	}

 @@ -1,23 +1,23 @@
-/*	$NetBSD: pkg_signature.c,v 1.5 2009/02/13 13:17:41 joerg Exp $	*/
+/*	$NetBSD: pkg_signature.c,v 1.6 2009/03/02 14:59:14 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: pkg_signature.c,v 1.5 2009/02/13 13:17:41 joerg Exp $");
+__RCSID("$NetBSD: pkg_signature.c,v 1.6 2009/03/02 14:59:14 joerg Exp $");
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * 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
 @@ -604,26 +604,28 @@ pkg_sign_x509(const char *name, const ch
 		if (i + sizeof(block) < size)
 			block_len = sizeof(block);
 		else
 			block_len = size % sizeof(block);
 		if (read(fd, block, block_len) != block_len)
 			err(2, "short read");
 		archive_write_data(pkg, block, block_len);
+	}
 	archive_write_finish_entry(pkg);
 	archive_entry_free(entry);
 	archive_write_finish(pkg);
 	close(fd);
 	exit(0);
+}
 #endif
 void
 pkg_sign_gpg(const char *name, const char *output)
+{
 	struct archive *pkg;
 	struct archive_entry *entry, *hash_entry, *sign_entry;
 	int fd;
 	struct stat sb;
 	char *hash_file, *signature_file, *tmp, *pkgname, hash[SHA512_DIGEST_STRING_LENGTH];
 	unsigned char block[65536];
 @@ -696,15 +698,17 @@ pkg_sign_gpg(const char *name, const cha
 		if (i + sizeof(block) < size)
 			block_len = sizeof(block);
 		else
 			block_len = size % sizeof(block);
 		if (read(fd, block, block_len) != block_len)
 			err(2, "short read");
 		archive_write_data(pkg, block, block_len);
+	}
 	archive_write_finish_entry(pkg);
 	archive_entry_free(entry);
 	archive_write_finish(pkg);
 	close(fd);
 	exit(0);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.115 2009/02/28 16:03:56 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.116 2009/03/02 14:59:14 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 "20090228"
+#define PKGTOOLS_VERSION "20090301"
 #endif /* _INST_LIB_VERSION_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vulnerabilities-file.c,v 1.4 2009/02/02 12:35:01 joerg Exp $	*/
+/*	$NetBSD: vulnerabilities-file.c,v 1.5 2009/03/02 14:59:14 joerg Exp $	*/
 /*-
  * Copyright (c) 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
  * 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
 @@ -28,27 +28,27 @@
  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: vulnerabilities-file.c,v 1.4 2009/02/02 12:35:01 joerg Exp $");
+__RCSID("$NetBSD: vulnerabilities-file.c,v 1.5 2009/03/02 14:59:14 joerg Exp $");
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
 #include <ctype.h>
 #if HAVE_ERR_H
 #include <err.h>
 #endif
 #include <errno.h>
 #include <fcntl.h>
 @@ -358,26 +358,28 @@ read_pkg_vulnerabilities(const char *pat
 		errx(EXIT_FAILURE, "Input is not regular file");
 	if (st.st_size > SSIZE_MAX - 1)
 		errx(EXIT_FAILURE, "Input too large");
 	input_len = (size_t)st.st_size;
 	if (input_len < 4)
 		err(EXIT_FAILURE, "Input too short for a pkg_vulnerability file");
 	input = xmalloc(input_len + 1);
 	if ((bytes_read = read(fd, input, input_len)) == -1)
 		err(1, "Failed to read input");
 	if (bytes_read != st.st_size)
 		errx(1, "Unexpected short read");
 	close(fd);
 	if (decompress_buffer(input, input_len, &decompressed_input,
 	    &decompressed_len)) {
 		free(input);
 		input = decompressed_input;
 		input_len = decompressed_len;
+	}
 	pv = parse_pkg_vulnerabilities(input, input_len, check_sum);
 	free(input);
 	return pv;
+}
 struct pkg_vulnerabilities *