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

diff --git a/restore/restore.c b/restore/restore.c
index c87b532..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.38 2008/04/17 15:22:56 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)
@@ -583,12 +586,19 @@ findunreflinks(void)
 			continue;
 		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;
+					}
 				}
 			}
 		}
@@ -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;
+					}
 				}
 			}
 		}