X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Frestore.c;h=780fd76f04bdd0a3d61297acf9719c0295a6a805;hp=5fcff708c0d9a205d3483718cd515b3e72b23aac;hb=f6e1ffa4b425c735543d6c87f93c2e4bf207f1bb;hpb=a55ce9149e3f4a5f848a20b7593dbe8cd7b0bbd1

diff --git a/restore/restore.c b/restore/restore.c
index 5fcff70..780fd76 100644
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: restore.c,v 1.35 2004/12/15 11:00:01 stelian Exp $";
+	"$Id: restore.c,v 1.39 2010/03/22 16:08:10 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -566,6 +566,9 @@ keyval(int key)
 
 /*
  * Find unreferenced link names.
+ *
+ * This also takes care of directories which were missed by removeoldleaves(),
+ * because their inode has been reused, but excluded from the dump.
  */
 void
 findunreflinks(void)
@@ -581,14 +584,21 @@ findunreflinks(void)
 			continue;
 		if (ep->e_entries == NULL)
 			continue;
-		for (j = 0; j < DIRHASH_SIZE; j++) {
+		for (j = 0; j < dirhash_size; j++) {
 			for (np = ep->e_entries[j]; np != NULL; np = np->e_sibling) {
-				if (np->e_flags == 0) {
+				if ((np->e_flags & ~TMPNAME) == 0) {
 					Dprintf(stdout,
 					    "%s: remove unreferenced name\n",
 					    myname(np));
-					removeleaf(np);
-					freeentry(np);
+					if (np->e_type == LEAF) {
+						removeleaf(np);
+						freeentry(np);
+					} else {
+						np->e_flags |= TMPNAME;
+						deleteino(np->e_ino);
+						np->e_next = removelist;
+						removelist = np;
+					}
 				}
 			}
 		}
@@ -599,7 +609,7 @@ findunreflinks(void)
 	for (ep = removelist; ep != NULL; ep = ep->e_next) {
 		if (ep->e_entries == NULL)
 			continue;
-		for (j = 0; j < DIRHASH_SIZE; j++) {
+		for (j = 0; j < dirhash_size; j++) {
 			for (np = ep->e_entries[j]; np != NULL; np = np->e_sibling) {
 				if (np->e_type == LEAF) {
 					if (np->e_flags != 0)
@@ -609,6 +619,17 @@ findunreflinks(void)
 					    myname(np));
 					removeleaf(np);
 					freeentry(np);
+				} else {
+					if ((np->e_flags & ~TMPNAME) != 0)
+						badentry(np, "unreferenced with flags");
+
+					if (np->e_flags == 0) {
+						Dprintf(stdout,
+						    "%s: remove unreferenced name\n",
+						    myname(np));
+						np->e_next = ep->e_next;
+						ep->e_next = np;
+					}
 				}
 			}
 		}
@@ -635,15 +656,19 @@ removeoldnodes(void)
 		change = 0;
 		prev = &removelist;
 		for (ep = removelist; ep != NULL; ep = *prev) {
+			int docont = 0;
 			if (ep->e_entries != NULL) {
 				int i;
-				for (i = 0; i < DIRHASH_SIZE; i++) {
+				for (i = 0; i < dirhash_size; i++) {
 					if (ep->e_entries[i] != NULL) {
 						prev = &ep->e_next;
-						continue;
+						docont = 1;
+						break;
 					}
 				}
 			}
+			if (docont)
+				continue;
 			*prev = ep->e_next;
 			removenode(ep);
 			freeentry(ep);
@@ -712,7 +737,6 @@ compareleaves(void)
 		if (first != curfile.ino) {
 			fprintf(stderr, "expected next file %ld, got %lu\n",
 				(long)first, (unsigned long)curfile.ino);
-			do_compare_error;
 			skipfile();
 			goto next;
 		}