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

diff --git a/restore/restore.c b/restore/restore.c
index c96fe6c..eba23e1 100644
--- a/restore/restore.c
+++ b/restore/restore.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: restore.c,v 1.23 2002/01/16 10:53:28 stelian Exp $";
+	"$Id: restore.c,v 1.28 2002/02/04 11:21:20 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -60,9 +60,12 @@ static const char rcsid[] =
 #else	/* __linux__ */
 #include <ufs/ufs/dinode.h>
 #endif	/* __linux__ */
+#include <protocols/dumprestore.h>
 
+#include <compaterr.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 #ifdef	__linux__
 #include <ext2fs/ext2fs.h>
@@ -83,7 +86,7 @@ listfile(char *name, dump_ino_t ino, int type)
 	long descend = hflag ? GOOD : FAIL;
 #ifdef USE_QFA
 	long tnum;
-	long tpos;
+	long long tpos;
 #endif
 
 	if (TSTINO(ino, dumpmap) == 0)
@@ -92,7 +95,7 @@ listfile(char *name, dump_ino_t ino, int type)
 #ifdef USE_QFA
 	if (tapeposflag) {	/* add QFA positions to output */
 		(void)Inode2Tapepos(ino, &tnum, &tpos, 1);
-		fprintf(stdout, "%10lu\t%ld\t%ld\t%s\n", (unsigned long)ino, 
+		fprintf(stdout, "%10lu\t%ld\t%lld\t%s\n", (unsigned long)ino, 
 			tnum, tpos, name);
 	}
 	else
@@ -108,7 +111,7 @@ listfile(char *name, dump_ino_t ino, int type)
 long
 addfile(char *name, dump_ino_t ino, int type)
 {
-	register struct entry *ep, *np;
+	struct entry *ep, *np;
 	long descend = hflag ? GOOD : FAIL;
 	char buf[100];
 
@@ -140,7 +143,11 @@ addfile(char *name, dump_ino_t ino, int type)
 			}
 	}
 	ep = addentry(name, ino, type);
+#ifdef USE_QFA
+	if ((type == NODE) && (!createtapeposflag))
+#else
 	if (type == NODE)
+#endif
 		newnode(ep);
 	ep->e_flags |= NEW;
 	return (descend);
@@ -192,8 +199,8 @@ static struct entry *removelist;
 void
 removeoldleaves(void)
 {
-	register struct entry *ep, *nextep;
-	register dump_ino_t i, mydirino;
+	struct entry *ep, *nextep;
+	dump_ino_t i, mydirino;
 
 	Vprintf(stdout, "Mark entries to be removed.\n");
 	if ((ep = lookupino(WINO))) {
@@ -249,7 +256,7 @@ removeoldleaves(void)
 long
 nodeupdates(char *name, dump_ino_t ino, int type)
 {
-	register struct entry *ep, *np, *ip;
+	struct entry *ep, *np, *ip;
 	long descend = GOOD;
 	int lookuptype = 0;
 	int key = 0;
@@ -558,8 +565,8 @@ keyval(int key)
 void
 findunreflinks(void)
 {
-	register struct entry *ep, *np;
-	register dump_ino_t i;
+	struct entry *ep, *np;
+	dump_ino_t i;
 
 	Vprintf(stdout, "Find unreferenced names.\n");
 	for (i = ROOTINO; i < maxino; i++) {
@@ -606,7 +613,7 @@ findunreflinks(void)
 void
 removeoldnodes(void)
 {
-	register struct entry *ep, **prev;
+	struct entry *ep, **prev;
 	long change;
 
 	Vprintf(stdout, "Remove old nodes (directories).\n");
@@ -649,7 +656,7 @@ compare_entry(struct entry *ep, int do_compare)
 void
 compareleaves(void)
 {
-	register struct entry *ep;
+	struct entry *ep;
 	dump_ino_t first;
 	long curvol;
 
@@ -736,7 +743,7 @@ compareleaves(void)
 void
 createleaves(char *symtabfile)
 {
-	register struct entry *ep;
+	struct entry *ep;
 	dump_ino_t first;
 	long curvol;
 
@@ -835,17 +842,26 @@ createleaves(char *symtabfile)
 void
 createfiles(void)
 {
-	register dump_ino_t first, next, last;
-	register struct entry *ep;
+	dump_ino_t first, next, last;
+	struct entry *ep;
 	long curvol;
 #ifdef USE_QFA
-	long tnum, tpos, curtpos, tmpcnt;
+	long tnum, tmpcnt;
+	long long tpos, curtpos;
 	time_t tistart, tiend, titaken;
 #endif
 
 	Vprintf(stdout, "Extract requested files\n");
 	curfile.action = SKIP;
-	getvol((long)1);
+#ifdef USE_QFA
+	if (tapeposflag)
+		curfile.ino = 0;
+	else
+#endif
+		if (volinfo[1] == ROOTINO)
+			curfile.ino = 0;
+		else
+			getvol((long)1);
 	skipmaps();
 	skipdirs();
 	first = lowerbnd(ROOTINO);
@@ -906,26 +922,41 @@ createfiles(void)
 				if (GetTapePos(&curtpos) == 0) {
 					/*  curtpos +1000 ???, some drives 
 					 *  might be too slow */
-					if (tpos > curtpos) {
+					if (tpos != curtpos) {
 #ifdef DEBUG_QFA
-						msg("positioning tape %ld from %ld to %ld for inode %10lu ...\n", volno, curtpos, tpos, (unsigned long)next);
+						msg("positioning tape %ld from %lld to %lld for inode %10lu ...\n", volno, curtpos, tpos, (unsigned long)next);
 #endif
 						if (GotoTapePos(tpos) == 0) {
 #ifdef DEBUG_QFA
 							if (GetTapePos(&curtpos) == 0)
-								msg("before resnyc at tape position %ld\n", curtpos);
+								msg("before resync at tape position %lld (%ld, %ld, %s)\n", curtpos, next, curfile.ino, curfile.name);
 #endif
-							(void)ReReadFromTape();
+							ReReadInodeFromTape(next);
 #ifdef DEBUG_QFA
 							if (GetTapePos(&curtpos) == 0)
-								msg("after resync at tape position %ld\n", curtpos);
+								msg("after resync at tape position %lld (%ld, %ld, %s)\n", curtpos, next, curfile.ino, curfile.name);
 #endif
 						}
 					}
+#ifdef DEBUG_QFA
+					else
+						msg("already at tape %ld position %ld for inode %10lu ...\n", volno, tpos, (unsigned long)next);
+#endif
 				}
 			}
 		}
+		else
 #endif /* USA_QFA */
+			if (volinfo[1] == ROOTINO) {
+				int i, goodvol = 1;
+
+				for (i = 1; i < TP_NINOS && volinfo[i] != 0; ++i)
+					if (volinfo[i] < next)
+						goodvol = i;
+
+				if (goodvol != volno)
+					RequestVol(goodvol);
+			}
 
 		do	{
 			curvol = volno;
@@ -969,8 +1000,11 @@ createfiles(void)
 			ep = lookupino(next);
 			if (ep == NULL)
 				panic("corrupted symbol table\n");
-			fprintf(stderr, "%s: (inode %lu) not found on tape\n", 
-				myname(ep), (unsigned long)next);
+#ifdef USE_QFA
+			if (!createtapeposflag)
+				fprintf(stderr, "%s: (inode %lu) not found on tape\n", 
+					myname(ep), (unsigned long)next);
+#endif
 			ep->e_flags &= ~NEW;
 			next = lowerbnd(next);
 		}
@@ -982,7 +1016,23 @@ createfiles(void)
 			ep = lookupino(next);
 			if (ep == NULL)
 				panic("corrupted symbol table\n");
-			(void) extractfile(myname(ep));
+#ifdef USE_QFA
+			if (createtapeposflag) {
+#ifdef DEBUG_QFA
+				msg("inode %ld at tapepos %ld\n", curfile.ino, curtapepos);
+#endif
+				sprintf(gTps, "%ld\t%ld\t%lld\n", (unsigned long)curfile.ino, volno, curtapepos);
+				if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps))
+					warn("error writing tapepos file.\n");
+				skipfile();
+			}
+			else {
+				msg("restoring %s\n", myname(ep));
+#endif /* USE_QFA */
+				(void) extractfile(myname(ep));
+#ifdef USE_QFA
+			}
+#endif /* USE_QFA */
 			ep->e_flags &= ~NEW;
 			if (volno != curvol)
 				skipmaps();
@@ -996,8 +1046,8 @@ createfiles(void)
 void
 createlinks(void)
 {
-	register struct entry *np, *ep;
-	register dump_ino_t i;
+	struct entry *np, *ep;
+	dump_ino_t i;
 	char name[BUFSIZ];
 
 	if ((ep = lookupino(WINO))) {
@@ -1040,8 +1090,8 @@ createlinks(void)
 void
 checkrestore(void)
 {
-	register struct entry *ep;
-	register dump_ino_t i;
+	struct entry *ep;
+	dump_ino_t i;
 
 	Vprintf(stdout, "Check the symbol table.\n");
 	for (i = WINO; i < maxino; i++) {