 @@ -1,27 +1,27 @@
-/*	$NetBSD: perform.c,v 1.19.2.3 2008/08/10 22:08:16 joerg Exp $	*/
+/*	$NetBSD: perform.c,v 1.19.2.4 2008/08/11 15:58:15 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.38 1997/10/13 15:03:51 jkh Exp";
 #else
-__RCSID("$NetBSD: perform.c,v 1.19.2.3 2008/08/10 22:08:16 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.19.2.4 2008/08/11 15:58:15 joerg Exp $");
 #endif
 #endif
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -162,26 +162,28 @@ pkg_perform(const char *pkg)
 	sanity_check();
 	if (Verbose && !PlistOnly)
 		printf("Creating package %s\n", pkg);
 	get_dash_string(&Comment);
 	get_dash_string(&Desc);
 	if (IS_STDIN(Contents))
 		pkg_in = stdin;
 	else {
 		pkg_in = fopen(Contents, "r");
 		if (!pkg_in)
 			errx(2, "unable to open contents file '%s' for input", Contents);
+	}
 	plist.head = plist.tail = NULL;
 	/* If a SrcDir override is set, add it now */
 	if (SrcDir) {
 		if (Verbose && !PlistOnly)
 			printf("Using SrcDir value of %s\n", (realprefix) ? realprefix : SrcDir);
 		add_plist(&plist, PLIST_SRC, SrcDir);
+	}
 	/* Stick the dependencies, if any, at the top */
 	if (Pkgdeps)
 		register_depends(&plist, Pkgdeps, 0);
 	/*
 	 * Put the build dependencies after the dependencies.
 @@ -197,27 +199,27 @@ pkg_perform(const char *pkg)
 		while (Pkgcfl) {
 			cp = strsep(&Pkgcfl, " \t\n");
 			if (*cp) {
 				add_plist(&plist, PLIST_PKGCFL, cp);
 				if (Verbose && !PlistOnly)
 					printf(" %s", cp);
+			}
+		}
 		if (Verbose && !PlistOnly)
 			printf(".\n");
+	}
 	/* Slurp in the packing list */
-	read_plist(&plist, pkg_in);
+	append_plist(&plist, pkg_in);
 	if (pkg_in != stdin)
 		fclose(pkg_in);
 	/* Prefix should override the packing list */
 	if (Prefix) {
 		delete_plist(&plist, FALSE, PLIST_CWD, NULL);
 		add_plist_top(&plist, PLIST_CWD, Prefix);
+	}
 	/*
          * Run down the list and see if we've named it, if not stick in a name
          * at the top.
          */

 @@ -1,14 +1,14 @@
-/* $NetBSD: lib.h,v 1.42.2.13 2008/08/05 22:56:24 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.42.2.14 2008/08/11 15:58:15 joerg Exp $ */
 /* from FreeBSD Id: lib.h,v 1.25 1997/10/08 07:48:03 charnier Exp */
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -327,26 +327,27 @@ plist_t *last_plist(package_t *);
 plist_t *find_plist(package_t *, pl_ent_t);
 char   *find_plist_option(package_t *, char *);
 void    plist_delete(package_t *, Boolean, pl_ent_t, char *);
 void    free_plist(package_t *);
 void    mark_plist(package_t *);
 void    csum_plist_entry(char *, plist_t *);
 void    add_plist(package_t *, pl_ent_t, const char *);
 void    add_plist_top(package_t *, pl_ent_t, const char *);
 void    delete_plist(package_t *, Boolean, pl_ent_t, char *);
 void    write_plist(package_t *, FILE *, char *);
 void	stringify_plist(package_t *, char **, size_t *, const char *);
 void	parse_plist(package_t *, const char *);
 void    read_plist(package_t *, FILE *);
 void    append_plist(package_t *, FILE *);
 int     delete_package(Boolean, Boolean, package_t *, Boolean, const char *);
 /* Package Database */
 int     pkgdb_open(int);
 void    pkgdb_close(void);
 int     pkgdb_store(const char *, const char *);
 char   *pkgdb_retrieve(const char *);
 int	pkgdb_dump(void);
 int     pkgdb_remove(const char *);
 int	pkgdb_remove_pkg(const char *);
 char   *pkgdb_refcount_dir(void);
 char   *_pkgdb_getPKGDB_FILE(char *, unsigned);
 const char *_pkgdb_getPKGDB_DIR(void);

 @@ -1,27 +1,27 @@
-/*	$NetBSD: plist.c,v 1.17.4.9 2008/08/10 22:09:38 joerg Exp $	*/
+/*	$NetBSD: plist.c,v 1.17.4.10 2008/08/11 15:58:15 joerg Exp $	*/
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
 #include <nbcompat.h>
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
 #ifndef lint
 #if 0
 static const char *rcsid = "from FreeBSD Id: plist.c,v 1.24 1997/10/08 07:48:15 charnier Exp";
 #else
-__RCSID("$NetBSD: plist.c,v 1.17.4.9 2008/08/10 22:09:38 joerg Exp $");
+__RCSID("$NetBSD: plist.c,v 1.17.4.10 2008/08/11 15:58:15 joerg Exp $");
 #endif
 #endif
 /*
  * FreeBSD install - a package for the installation and maintainance
  * of non-core utilities.
+ *
  * 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
 @@ -343,37 +343,34 @@ parse_plist(package_t *pkg, const char *
+			}
 		} else {
 			cmd = PLIST_FILE;
+		}
 		add_plist(pkg, cmd, cp);
 		free(cp);
+	}
+}
 /*
  * Read a packing list from a file
  */
 void
-read_plist(package_t *pkg, FILE * fp)
+append_plist(package_t *pkg, FILE * fp)
+{
 	char    pline[MaxPathSize];
 	char   *cp;
 	int     cmd;
 	int     len;
 	int	free_cp;
 	pkg->head = NULL;
 	pkg->tail = NULL;
 	while (fgets(pline, MaxPathSize, fp) != (char *) NULL) {
 		for (len = strlen(pline); len &&
 		    isspace((unsigned char) pline[len - 1]);) {
 			pline[--len] = '\0';
+		}
 		if (len == 0) {
 			continue;
+		}
 		free_cp = 0;
 		if (*(cp = pline) == CMD_CHAR) {
 			if ((cmd = plist_cmd(pline + 1, &cp)) == FAIL) {
 				warnx("Unrecognised PLIST command `%s'", pline);
 				continue;
 @@ -382,26 +379,35 @@ read_plist(package_t *pkg, FILE * fp)
 				free(cp);
 				cp = NULL;
+			}
 			free_cp = 1;
 		} else {
 			cmd = PLIST_FILE;
+		}
 		add_plist(pkg, cmd, cp);
 		if (free_cp)
 			free(cp);
+	}
+}
 void
 read_plist(package_t *pkg, FILE * fp)
+{
 	pkg->head = NULL;
 	pkg->tail = NULL;
 	append_plist(pkg, fp);
+}
 /*
  * Write a packing list to a file, converting commands to ASCII equivs
  */
 void
 write_plist(package_t *pkg, FILE * fp, char *realprefix)
+{
 	plist_t *p;
 	const cmd_t *cmdp;
 	for (p = pkg->head; p; p = p->next) {
 		if (p->type == PLIST_FILE) {
 			/* Fast-track files - these are the most common */
 			(void) fprintf(fp, "%s\n", p->name);