X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Ftape.c;h=bb85960a9ad91383945c7788aaefef6653a639a2;hb=cdef84caee08a2436de99fc3e6f5d8eeb3635072;hp=145f769b949308e38e343a60bd7bbaf4f2e7c098;hpb=1176b3c1cb187c6c9f223c154fb4d58910717d18;p=dump.git

diff --git a/restore/tape.c b/restore/tape.c
index 145f769..bb85960 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.68 2003/02/11 09:56:48 stelian Exp $";
+	"$Id: tape.c,v 1.72 2003/02/17 11:21:29 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -286,7 +286,7 @@ setup(void)
 		temptape = magtape;
 
 #ifdef RRESTORE
-	if (host)
+	if (!Afile && host)
 		mt = rmtopen(temptape, O_RDONLY);
 	else
 #endif
@@ -295,7 +295,7 @@ setup(void)
 	else
 		mt = OPEN(temptape, O_RDONLY, 0);
 	if (mt < 0)
-		err(1, "%s", magtape);
+		err(1, "%s", temptape);
 	if (!Afile) {
 		volno = 1;
 		setmagtapein();
@@ -502,6 +502,13 @@ again:
 		return;
 	}
 	closemt();
+
+	/* 
+	 * if using an archive file, reset its name so readtape()
+	 * could properly use remote access.
+	 */
+	Afile = NULL;
+
 	if (Mflag) {
 		snprintf(magtape, MAXPATHLEN, "%s%03ld", magtapeprefix, newvol);
 		magtape[MAXPATHLEN - 1] = '\0';
@@ -1487,7 +1494,7 @@ readtape(char *buf)
 #endif
 getmore:
 #ifdef RRESTORE
-	if (host)
+	if (!Afile && host)
 		i = rmtread(&tapebuf[rd], cnt);
 	else
 #endif
@@ -1549,7 +1556,7 @@ getmore:
 		i = ntrec * TP_BSIZE;
 		memset(tapebuf, 0, (size_t)i);
 #ifdef RRESTORE
-		if (host)
+		if (!Afile && host)
 			seek_failed = (rmtseek(i, 1) < 0);
 		else
 #endif
@@ -2030,7 +2037,7 @@ static int read_a_block(int fd, char *buf, size_t len, long *lengthread)
 	size = len;
 	while (size > 0) {
 #ifdef RRESTORE
-		if (host)
+		if (!Afile && host)
 			i = rmtread(buf, size);
 		else
 #endif
@@ -2054,7 +2061,7 @@ closemt(void)
 	if (mt < 0)
 		return;
 #ifdef RRESTORE
-	if (host)
+	if (!Afile && host)
 		rmtclose();
 	else
 #endif
@@ -2078,7 +2085,8 @@ setmagtapein(void) {
 			magtapein = ioctl(mt, MTIOCGET, (char *)&mt_stat) == 0;
 	}
 
-	Vprintf(stdout,"Input is from %s\n", 
+	Vprintf(stdout,"Input is from a %s %s\n",
+			host ? "remote" : "local",
 			magtapein ? "tape" :
 			Vflag ? "multi-volume (no tape)" : "file/pipe");
 }
@@ -2646,13 +2654,12 @@ ReReadInodeFromTape(dump_ino_t theino)
 	do {
 		cntloop++;
 		gethead(&spcl);
-	} while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate) && (cntloop < 32));
+	} while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate) && (cntloop < ntrec));
 #ifdef DEBUG_QFA
 	fprintf(stderr, "%ld reads\n", cntloop);
-	if (cntloop == 32) {
+	if (cntloop == ntrec) {
 		fprintf(stderr, "DEBUG: bufsize %d\n", bufsize);
 		fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
-		fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
 	}
 #endif
 	findinode(&spcl);