 @@ -1,14 +1,14 @@
-/* $NetBSD: lib.h,v 1.46 2009/02/02 12:35:01 joerg Exp $ */
+/* $NetBSD: lib.h,v 1.47 2009/02/13 01:31:42 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
 @@ -298,27 +298,27 @@ int	match_local_files(const char *, int,
 /* File */
 Boolean fexists(const char *);
 Boolean isdir(const char *);
 Boolean islinktodir(const char *);
 Boolean isemptydir(const char *);
 Boolean isemptyfile(const char *);
 Boolean isfile(const char *);
 Boolean isbrokenlink(const char *);
 Boolean isempty(const char *);
 int     URLlength(const char *);
 Boolean make_preserve_name(char *, size_t, char *, char *);
 void    remove_files(const char *, const char *);
-int     delete_hierarchy(char *, Boolean, Boolean);
+int     delete_hierarchy(const char *, Boolean, Boolean);
 int     format_cmd(char *, size_t, const char *, const char *, const char *);
 int	recursive_remove(const char *, int);
 /* pkg_io.c: Local and remote archive handling */
 struct archive;
 struct archive_entry;
 struct archive *open_archive(const char *, void **);
 void	close_archive(void *);
 struct archive *find_archive(const char *, void **);
 /* Packing list */

 @@ -1,23 +1,23 @@
-/*	$NetBSD: plist.c,v 1.22 2009/02/02 12:35:01 joerg Exp $	*/
+/*	$NetBSD: plist.c,v 1.23 2009/02/13 01:31:42 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: plist.c,v 1.22 2009/02/02 12:35:01 joerg Exp $");
+__RCSID("$NetBSD: plist.c,v 1.23 2009/02/13 01:31:42 joerg 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -628,27 +628,27 @@ delete_package(Boolean ign_err, Boolean
 pkgdb_cleanup:
 				if (!Fake) {
 					if (!restored) {
 						errno = 0;
 						if (pkgdb_remove(tmp) && errno)
 							perror("pkgdb_remove");
+					}
+				}
+			}
 			break;
 		case PLIST_DIR_RM:
-			if (NoDeleteFiles)
+			if (NoDeleteFiles || nukedirs)
 				break;
 			(void) snprintf(tmp, sizeof(tmp), "%s%s%s/%s",
 			    destdir ? destdir : "", destdir ? "/" : "",
 			    Where, p->name);
 			if (fexists(tmp)) {
 			    if (!isdir(tmp)) {
 				warnx("cannot remove `%s' as a directory\n"
 				    "this packing list is incorrect - ignoring delete request", tmp);
 			    } else {
 				if (Verbose)
 					printf("Delete directory %s\n", tmp);
 				if (!Fake && delete_hierarchy(tmp, ign_err, FALSE)) {
 @@ -665,56 +665,60 @@ pkgdb_cleanup:
 		default:
 			break;
+		}
+	}
 	pkgdb_close();
 	return fail;
+}
 /*
  * Selectively delete a hierarchy
  * Returns 1 on error, 0 else.
  */
 int
-delete_hierarchy(char *dir, Boolean ign_err, Boolean nukedirs)
+delete_hierarchy(const char *dir, Boolean ign_err, Boolean nukedirs)
+{
-	char   *cp1, *cp2;
+	char   *cp1, *cp2, *tmp_dir;
 	cp1 = cp2 = dir;
 	if (!fexists(dir)) {
 		if (!ign_err)
 			warnx("%s `%s' doesn't really exist",
 			    isdir(dir) ? "directory" : "file", dir);
 		return !ign_err;
 	} else if (nukedirs) {
 		if (recursive_remove(dir, ign_err)) {
 			warn("Couldn't remove %s", dir);
 			return 1;
+		}
 	} else if (isdir(dir)) {
 		if (rmdir(dir) && !ign_err)
 			return 1;
 	} else {
 		if (remove(dir) && !ign_err)
 			return 1;
+	}
 	if (!nukedirs)
 		return 0;
 	cp1 = cp2 = tmp_dir = xstrdup(dir);;
 	while (cp2) {
 		if ((cp2 = strrchr(cp1, '/')) != NULL)
 			*cp2 = '\0';
-		if (!isemptydir(dir))
+		if (!isemptydir(tmp_dir))
-			return 0;
+			break;
-		if (rmdir(dir) && !ign_err) {
+		if (rmdir(tmp_dir) && !ign_err) {
-			if (!fexists(dir))
+			if (fexists(tmp_dir)) {
-				warnx("directory `%s' doesn't really exist", dir);
+				free(tmp_dir);
 			else
 				return 1;
+			}
 			warnx("directory `%s' doesn't really exist", tmp_dir);
+		}
 		/* back up the pathname one component */
 		if (cp2) {
-			cp1 = dir;
+			cp1 = tmp_dir;
+		}
+	}
 	free(tmp_dir);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: version.h,v 1.110 2009/02/11 23:42:42 joerg Exp $	*/
+/*	$NetBSD: version.h,v 1.111 2009/02/13 01:31:42 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 "20090212"
+#define PKGTOOLS_VERSION "20090213"
 #endif /* _INST_LIB_VERSION_H_ */