 @@ -1,27 +1,27 @@
-/*	$NetBSD: plist.c,v 1.17.4.11 2008/08/25 18:31:14 joerg Exp $	*/
+/*	$NetBSD: plist.c,v 1.17.4.12 2008/08/25 18:43:04 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.11 2008/08/25 18:31:14 joerg Exp $");
+__RCSID("$NetBSD: plist.c,v 1.17.4.12 2008/08/25 18:43:04 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
 @@ -564,84 +564,85 @@ delete_package(Boolean ign_err, Boolean
 				int     restored = 0;	/* restored from preserve? */
 				if (p->next && p->next->type == PLIST_COMMENT) {
 					if (strncmp(p->next->name, CHECKSUM_HEADER, ChecksumHeaderLen) == 0) {
 						char   *cp, buf[LegibleChecksumLen];
 						if ((cp = MD5File(tmp, buf)) != NULL) {
 							/* Mismatch? */
 							if (strcmp(cp, p->next->name + ChecksumHeaderLen) != 0) {
 								printf("original MD5 checksum failed, %s: %s\n",
 								    Force ? "deleting anyway" : "not deleting", tmp);
 								if (!Force) {
 									fail = FAIL;
-									continue;
+									goto pkgdb_cleanup;
+								}
+							}
+						}
 					} else if (strncmp(p->next->name, SYMLINK_HEADER, SymlinkHeaderLen) == 0) {
 						char	buf[MaxPathSize + SymlinkHeaderLen];
 						int	cc;
 						(void) strlcpy(buf, SYMLINK_HEADER,
 						    sizeof(buf));
 						if ((cc = readlink(tmp, &buf[SymlinkHeaderLen],
 							  sizeof(buf) - SymlinkHeaderLen - 1)) < 0) {
 							warn("can't readlink `%s'", tmp);
-							continue;
+							goto pkgdb_cleanup;
+						}
 						buf[SymlinkHeaderLen + cc] = 0x0;
 						if (strcmp(buf, p->next->name) != 0) {
 							if ((cc = readlink(&buf[SymlinkHeaderLen], &buf[SymlinkHeaderLen],
 								  sizeof(buf) - SymlinkHeaderLen)) < 0) {
 								printf("symlink %s is not same as recorded value, %s: %s\n",
 								    buf, Force ? "deleting anyway" : "not deleting", tmp);
 								if (!Force) {
 									fail = FAIL;
-									continue;
+									goto pkgdb_cleanup;
+								}
+							}
 							buf[SymlinkHeaderLen + cc] = 0x0;
 							if (strcmp(buf, p->next->name) != 0) {
 								printf("symlink %s is not same as recorded value, %s: %s\n",
 								    buf, Force ? "deleting anyway" : "not deleting", tmp);
 								if (!Force) {
 									fail = FAIL;
-									continue;
+									goto pkgdb_cleanup;
+								}
+							}
+						}
+					}
+				}
 				if (Verbose && !NoDeleteFiles)
 					printf("Delete file %s\n", tmp);
 				if (!Fake && !NoDeleteFiles) {
 					if (delete_hierarchy(tmp, ign_err, nukedirs))
 						fail = FAIL;
 					if (preserve && name) {
 						char    tmp2[MaxPathSize];
 						if (make_preserve_name(tmp2, MaxPathSize, name, tmp)) {
 							if (fexists(tmp2)) {
 								if (rename(tmp2, tmp))
 									warn("preserve: unable to restore %s as %s",
 									    tmp2, tmp);
 								else
 									restored = 1;
+							}
+						}
+					}
+				}
 pkgdb_cleanup:
 				if (!Fake) {
 					if (!restored) {
 						errno = 0;
 						if (pkgdb_remove(tmp) && errno)
 							perror("pkgdb_remove");
+					}
+				}
+			}
 			break;
 		case PLIST_DIR_RM:
 			if (NoDeleteFiles)
 				break;