X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Frestore.c;h=854c3fcd392a9880807c8173bb8e12e4c954c13f;hp=eba23e13e939584427390ba50949fa4a9249a5c4;hb=97d9098250fd2a49d9ef70d6bf93f49badff0f6c;hpb=792ff63acf448f21a3ef2869e4bbcdbf4f7f87f2

diff --git a/restore/restore.c b/restore/restore.c
index eba23e1..854c3fc 100644
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: restore.c,v 1.28 2002/02/04 11:21:20 stelian Exp $";
+	"$Id: restore.c,v 1.29 2002/04/04 08:20:23 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -746,6 +746,7 @@ createleaves(char *symtabfile)
 	struct entry *ep;
 	dump_ino_t first;
 	long curvol;
+	int doremove;
 
 	if (command == 'R') {
 		Vprintf(stdout, "Continue extraction of new leaves\n");
@@ -796,11 +797,11 @@ createleaves(char *symtabfile)
 		 * be removed since its type may change from one leaf type
 		 * to another (e.g. "file" to "character special").
 		 */
-		if ((ep->e_flags & EXTRACT) != 0) {
-			removeleaf(ep);
-			ep->e_flags &= ~REMOVED;
-		}
-		(void) extractfile(myname(ep));
+		if ((ep->e_flags & EXTRACT) != 0)
+			doremove = 1;
+		else
+			doremove = 0;
+		(void) extractfile(ep, doremove);
 		ep->e_flags &= ~(NEW|EXTRACT);
 		/*
 		 * We checkpoint the restore after every tape reel, so
@@ -1029,7 +1030,7 @@ createfiles(void)
 			else {
 				msg("restoring %s\n", myname(ep));
 #endif /* USE_QFA */
-				(void) extractfile(myname(ep));
+				(void) extractfile(ep, 0);
 #ifdef USE_QFA
 			}
 #endif /* USE_QFA */