X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Ftape.c;h=43ce99eaddf42ec9bc0b50fb9102a588f4134df6;hp=ff524ce0c1c3efbe202e978eb83bcd5326828a8d;hb=3a07bc169e53e03d353dc367809c529ff34c9826;hpb=e51470bfc05d83f82c37d24504220c7163bbd4c1

diff --git a/restore/tape.c b/restore/tape.c
index ff524ce..43ce99e 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.55 2002/01/25 14:59:53 stelian Exp $";
+	"$Id: tape.c,v 1.59 2002/03/28 14:53:01 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -175,6 +175,7 @@ static void	xtrcmpskip __P((char *, size_t));
 #endif
 
 static int readmapflag;
+static int readingmaps;		/* set to 1 while reading the maps */
 
 /*
  * Set up an input source. This is called from main.c before setup() is.
@@ -332,6 +333,10 @@ setup(void)
 	}
 	if (vflag || command == 't' || command == 'C')
 		printdumpinfo();
+#ifdef USE_QFA
+	if (tapeposflag && spcl.c_date != qfadumpdate)
+		errx(1, "different QFA/dumpdates detected\n");
+#endif
 	if (filesys[0] == '\0') {
 		char *dirptr;
 		strncpy(filesys, spcl.c_filesys, NAMELEN);
@@ -356,17 +361,33 @@ setup(void)
 		Dprintf(stdout, "header read failed at %ld blocks\n", (long)blksread);
 		panic("no header after volume mark!\n");
 	}
+	readingmaps = 1;
 	findinode(&spcl);
 	if (spcl.c_type != TS_CLRI)
 		errx(1, "Cannot find file removal list");
 	maxino = (spcl.c_count * TP_BSIZE * NBBY) + 1;
-	Dprintf(stdout, "maxino = %ld\n", (long)maxino);
 	map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
 	if (map == NULL)
 		errx(1, "no memory for active inode map");
 	usedinomap = map;
 	curfile.action = USING;
 	getfile(xtrmap, xtrmapskip);
+	while (spcl.c_type == TS_ADDR) {
+		/* Recompute maxino and the map */
+		char *oldmap = usedinomap;
+		dump_ino_t oldmaxino = maxino;
+		maxino += (spcl.c_count * TP_BSIZE * NBBY) + 1;
+		map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
+		if (map == NULL)
+			errx(1, "no memory for active inode map");
+		usedinomap = map;
+		memcpy(usedinomap, oldmap, howmany(oldmaxino, NBBY));
+		free(oldmap);
+
+		spcl.c_dinode.di_size = spcl.c_count * TP_BSIZE;
+		getfile(xtrmap, xtrmapskip);
+	}
+	Dprintf(stdout, "maxino = %lu\n", (unsigned long)maxino);
 	if (spcl.c_type != TS_BITS)
 		errx(1, "Cannot find file dump list");
 	map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
@@ -375,6 +396,10 @@ setup(void)
 	dumpmap = map;
 	curfile.action = USING;
 	getfile(xtrmap, xtrmapskip);
+	while (spcl.c_type == TS_ADDR) {
+		spcl.c_dinode.di_size = spcl.c_count * TP_BSIZE;
+		getfile(xtrmap, xtrmapskip);
+	}
 	/*
 	 * If there may be whiteout entries on the tape, pretend that the
 	 * whiteout inode exists, so that the whiteout entries can be
@@ -382,6 +407,8 @@ setup(void)
 	 */
 	if (oldinofmt == 0)
 		SETINO(WINO, dumpmap);
+	readingmaps = 0;
+	findinode(&spcl);
 }
 
 /*
@@ -414,6 +441,10 @@ getvol(long nextvol)
 	}
 	saved_blksread = blksread;
 	saved_tpblksread = tpblksread;
+#if defined(USE_QFA) && defined(sunos)
+	if (createtapeposflag || tapeposflag) 
+		close(fdsmtc);
+#endif
 again:
 	if (pipein)
 		exit(1); /* pipes do not get a second chance */
@@ -427,7 +458,7 @@ again:
 	while (newvol <= 0) {
 		if (tapesread == 0) {
 			fprintf(stderr, "%s%s%s%s%s",
-			    "You have not read any tapes yet.\n",
+			    "You have not read any volumes yet.\n",
 			    "Unless you know which volume your",
 			    " file(s) are on you should start\n",
 			    "with the last volume and work",
@@ -461,6 +492,15 @@ again:
 	}
 	if (newvol == volno) {
 		tapesread |= 1 << volno;
+#if defined(USE_QFA) && defined(sunos)
+		if (createtapeposflag || tapeposflag) {
+			if (OpenSMTCmt(magtape) < 0) {
+				volno = -1;
+				haderror = 1;
+				goto again;
+			}
+		}
+#endif
 		return;
 	}
 	closemt();
@@ -478,9 +518,9 @@ again:
 	}
 	if (haderror || (bot_code && !Mflag)) {
 		haderror = 0;
-		fprintf(stderr, "Mount tape volume %ld\n", (long)newvol);
-		fprintf(stderr, "Enter ``none'' if there are no more tapes\n");
-		fprintf(stderr, "otherwise enter tape name (default: %s) ", magtape);
+		fprintf(stderr, "Mount volume %ld\n", (long)newvol);
+		fprintf(stderr, "Enter ``none'' if there are no more volumes\n");
+		fprintf(stderr, "otherwise enter volume name (default: %s) ", magtape);
 		(void) fflush(stderr);
 		(void) fgets(buf, TP_BSIZE, terminal);
 		if (feof(terminal))
@@ -670,6 +710,13 @@ printvolinfo(void)
 	}
 }
 
+#ifdef sunos
+struct timeval
+	time_t		tv_sec;		/* seconds */
+	suseconds_t	tv_usec;	/* and microseconds */
+};
+#endif
+
 int
 extractfile(char *name)
 {
@@ -680,12 +727,12 @@ extractfile(char *name)
 
 	curfile.name = name;
 	curfile.action = USING;
-#ifdef	__linux__
+#if defined(__linux__) || defined(sunos)
 	timep[0].tv_sec = curfile.dip->di_atime.tv_sec;
 	timep[0].tv_usec = curfile.dip->di_atime.tv_usec;
 	timep[1].tv_sec = curfile.dip->di_mtime.tv_sec;
 	timep[1].tv_usec = curfile.dip->di_mtime.tv_usec;
-#else	/* __linux__ */
+#else	/* __linux__ || sunos */
 	timep[0].tv_sec = curfile.dip->di_atime;
 	timep[0].tv_usec = curfile.dip->di_atimensec / 1000;
 	timep[1].tv_sec = curfile.dip->di_mtime;
@@ -853,7 +900,7 @@ skipfile(void)
 void
 getfile(void (*fill) __P((char *, size_t)), void (*skip) __P((char *, size_t)))
 {
-	register int i;
+	int i;
 	volatile int curblk = 0;
 	volatile quad_t size = spcl.c_dinode.di_size;
 	volatile int last_write_was_hole = 0;
@@ -905,7 +952,7 @@ loop:
 			curfile.name, (long)blksread);
 	}
 	if (curblk > 0) {
-		(*fill)((char *)buf, (size_t)(curblk * TP_BSIZE) + size);
+		(*fill)((char *)buf, (size_t)((curblk * TP_BSIZE) + size));
 		last_write_was_hole = 0;
 	}
 	if (size > 0) {
@@ -920,7 +967,8 @@ loop:
 	if (last_write_was_hole) {
 		FTRUNCATE(ofile, origsize);
 	}
-	findinode(&spcl);
+	if (!readingmaps) 
+		findinode(&spcl);
 	gettingfile = 0;
 }
 
@@ -1398,6 +1446,10 @@ readtape(char *buf)
 		numtrec = ntrec;
 	cnt = ntrec * TP_BSIZE;
 	rd = 0;
+#ifdef USE_QFA
+	if (createtapeposflag)
+		(void)GetTapePos(&curtapepos);
+#endif
 getmore:
 #ifdef RRESTORE
 	if (host)
@@ -2050,15 +2102,15 @@ gethead(struct s_spcl *buf)
 	buf->c_dinode.di_gid = u_ospcl.s_ospcl.c_dinode.odi_gid;
 	buf->c_dinode.di_size = u_ospcl.s_ospcl.c_dinode.odi_size;
 	buf->c_dinode.di_rdev = u_ospcl.s_ospcl.c_dinode.odi_rdev;
-#ifdef	__linux__
+#if defined(__linux__) || defined(sunos)
 	buf->c_dinode.di_atime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_atime;
 	buf->c_dinode.di_mtime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_mtime;
 	buf->c_dinode.di_ctime.tv_sec = u_ospcl.s_ospcl.c_dinode.odi_ctime;
-#else	/* __linux__ */
+#else	/* __linux__ || sunos */
 	buf->c_dinode.di_atime = u_ospcl.s_ospcl.c_dinode.odi_atime;
 	buf->c_dinode.di_mtime = u_ospcl.s_ospcl.c_dinode.odi_mtime;
 	buf->c_dinode.di_ctime = u_ospcl.s_ospcl.c_dinode.odi_ctime;
-#endif	/* __linux__ */
+#endif	/* __linux__ || sunos */
 	buf->c_count = u_ospcl.s_ospcl.c_count;
 	memmove(buf->c_addr, u_ospcl.s_ospcl.c_fill, (long)256);
 	if (u_ospcl.s_ospcl.c_magic != OFS_MAGIC ||
@@ -2071,7 +2123,7 @@ good:
 	    (buf->c_dinode.di_mode & IFMT) == IFDIR && Qcvt == 0) {
 		qcvt.qval = buf->c_dinode.di_size;
 		if (qcvt.val[0] || qcvt.val[1]) {
-			printf("Note: Doing Quad swapping\n");
+			Vprintf(stdout, "Note: Doing Quad swapping\n");
 			Qcvt = 1;
 		}
 	}
@@ -2265,7 +2317,7 @@ findinode(struct s_spcl *header)
 static int
 checksum(int *buf)
 {
-	register int i, j;
+	int i, j;
 
 	j = sizeof(union u_spcl) / sizeof(int);
 	i = 0;
@@ -2505,6 +2557,29 @@ ReReadFromTape(void)
 	findinode(&spcl);
 	noresyncmesg = 0;
 }
+
+void
+ReReadInodeFromTape(dump_ino_t theino)
+{
+	long cntloop = 0;
+
+	FLUSHTAPEBUF();
+	noresyncmesg = 1;
+	do {
+		cntloop++;
+		gethead(&spcl);
+	} while (!(spcl.c_inumber == theino && spcl.c_type == TS_INODE && spcl.c_date == dumpdate) && (cntloop < 32));
+#ifdef DEBUG_QFA
+	fprintf(stderr, "%ld reads\n", cntloop);
+	if (cntloop == 32) {
+		fprintf(stderr, "DEBUG: bufsize %d\n", bufsize);
+		fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
+		fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
+	}
+#endif
+	findinode(&spcl);
+	noresyncmesg = 0;
+}
 #endif /* USE_QFA */
 
 void