X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Ftape.c;h=56830c4f8174944f9ccf9d8ae97f39d8cdf851ba;hp=b9d0b02635f2c9d3629083a38ce4d3e2bfb30c07;hb=e1abc9ce25132eef1239047a071c2c1d4822dd9f;hpb=a18d599791e977f3e3d26123031e6ed4e64d6d08

diff --git a/restore/tape.c b/restore/tape.c
index b9d0b02..56830c4 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -23,11 +23,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -46,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.63 2002/07/19 14:57:40 stelian Exp $";
+	"$Id: tape.c,v 1.73 2003/03/30 15:40:40 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -134,6 +130,8 @@ static int	 checksum __P((int *));
 static void	 findinode __P((struct s_spcl *));
 static void	 findtapeblksize __P((void));
 static int	 gethead __P((struct s_spcl *));
+static int	 converthead __P((struct s_spcl *));
+static void	 converttapebuf __P((struct tapebuf *));
 static void	 readtape __P((char *));
 static void	 setdumpnum __P((void));
 static u_int	 swabi __P((u_int));
@@ -284,8 +282,8 @@ setup(void)
 		temptape = magtape;
 
 #ifdef RRESTORE
-	if (host)
-		mt = rmtopen(temptape, "O_RDONLY");
+	if (!Afile && host)
+		mt = rmtopen(temptape, O_RDONLY);
 	else
 #endif
 	if (pipein)
@@ -293,7 +291,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();
@@ -374,15 +372,9 @@ setup(void)
 	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);
+		resizemaps(oldmaxino, maxino);
 
 		spcl.c_dinode.di_size = spcl.c_count * TP_BSIZE;
 		getfile(xtrmap, xtrmapskip);
@@ -506,6 +498,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';
@@ -541,7 +540,7 @@ again:
 	}
 #ifdef RRESTORE
 	if (host)
-		mt = rmtopen(magtape, "O_RDONLY");
+		mt = rmtopen(magtape, O_RDONLY);
 	else
 #endif
 		mt = OPEN(magtape, O_RDONLY, 0);
@@ -1023,7 +1022,7 @@ static void
 xtrskip(UNUSED(char *buf), size_t size)
 {
 
-	if (LSEEK(ofile, (off_t)size, SEEK_CUR) == -1)
+	if (LSEEK(ofile, (OFF_T)size, SEEK_CUR) == -1)
 		err(1, "seek error extracting inode %lu, name %s\nlseek",
 			(unsigned long)curfile.ino, curfile.name);
 }
@@ -1270,6 +1269,16 @@ comparefile(char *name)
 	struct STAT stemp;
 #endif
 
+	curfile.name = name;
+	curfile.action = USING;
+	mode = curfile.dip->di_mode;
+
+	if ((mode & IFMT) == IFSOCK) {
+		Vprintf(stdout, "skipped socket %s\n", name);
+		skipfile();
+		return;
+	}
+
 	if ((r = LSTAT(name, &sb)) != 0) {
 		warn("%s: does not exist (%d)", name, r);
 		do_compare_error;
@@ -1277,10 +1286,6 @@ comparefile(char *name)
 		return;
 	}
 
-	curfile.name = name;
-	curfile.action = USING;
-	mode = curfile.dip->di_mode;
-
 	Vprintf(stdout, "comparing %s (size: %ld, mode: 0%o)\n", name,
 		(long)sb.st_size, mode);
 
@@ -1485,7 +1490,7 @@ readtape(char *buf)
 #endif
 getmore:
 #ifdef RRESTORE
-	if (host)
+	if (!Afile && host)
 		i = rmtread(&tapebuf[rd], cnt);
 	else
 #endif
@@ -1547,11 +1552,11 @@ 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
-			seek_failed = (LSEEK(mt, i, SEEK_CUR) == (off_t)-1);
+			seek_failed = (LSEEK(mt, i, SEEK_CUR) == (OFF_T)-1);
 
 		if (seek_failed) {
 			warn("continuation failed");
@@ -1613,6 +1618,7 @@ readtape_comprfile(char *buf)
 
 	/* read the block prefix */
 	ret = read_a_block(mt, tapebuf, PREFIXSIZE, &rl);
+	converttapebuf(tpb);
 
 	if (Vflag && (ret == 0 || rl < (int)PREFIXSIZE  ||  tpb->length == 0))
 		ret = 0;
@@ -1705,6 +1711,7 @@ readtape_comprtape(char *buf)
 	if (ret <= 0)
 		goto readerr;
 
+	converttapebuf(tpb);
 	tbufptr = decompress_tapebuf(tpb, rl);
 	if (tbufptr == NULL) {
 		msg_read_error("Tape decompression error while");
@@ -1915,7 +1922,7 @@ findtapeblksize(void)
 	long i;
 	size_t len;
 	struct tapebuf *tpb = (struct tapebuf *) tapebuf;
-	struct s_spcl *spclpt = (struct s_spcl *) tapebuf;
+	struct s_spcl spclpt;
 
 	for (i = 0; i < ntrec; i++)
 		((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
@@ -1930,6 +1937,17 @@ findtapeblksize(void)
 	if (read_a_block(mt, tapebuf, len, &i) <= 0)
 		errx(1, "Tape read error on first record");
 
+	memcpy(&spclpt, tapebuf, TP_BSIZE);
+	if (converthead(&spclpt) == FAIL) {
+		cvtflag++;
+		if (converthead(&spclpt) == FAIL) {
+			/* Special case for old compressed tapes with prefix */
+			if (magtapein && (i % TP_BSIZE != 0)) 
+				goto oldformat;
+			errx(1, "Tape is not a dump tape");
+		}
+		fprintf(stderr, "Converting to new file system format.\n");
+	}
 	/*
 	 * If the input is from a file or a pipe, we read TP_BSIZE
 	 * bytes looking for a dump header. If the dump is compressed
@@ -1938,14 +1956,14 @@ findtapeblksize(void)
 	 * dump is not compressed and does not have a prefix.
 	 */
 	if (!magtapein) {
-		if (spclpt->c_type == TS_TAPE
-		    && spclpt->c_flags & DR_COMPRESSED) {
+		if (spclpt.c_type == TS_TAPE
+		    && spclpt.c_flags & DR_COMPRESSED) {
 			/* It's a compressed dump file, read in the */
-			/* rest of the block based on spclpt->c_ntrec. */
-			if (spclpt->c_ntrec > ntrec)
+			/* rest of the block based on spclpt.c_ntrec. */
+			if (spclpt.c_ntrec > ntrec)
 				errx(1, "Tape blocksize is too large, use "
-				     "\'-b %d\' ", spclpt->c_ntrec);
-			ntrec = spclpt->c_ntrec;
+				     "\'-b %d\' ", spclpt.c_ntrec);
+			ntrec = spclpt.c_ntrec;
 			len = (ntrec - 1) * TP_BSIZE;
 			zflag = 1;   
 		}
@@ -1968,14 +1986,21 @@ findtapeblksize(void)
 	 * what we asked for; adjust the value of ntrec and test for 
 	 * a compressed dump tape.
 	 */
-
 	if (i % TP_BSIZE != 0) {
+oldformat:
 		/* may be old format compressed dump tape with a prefix */
-		spclpt = (struct s_spcl *) tpb->buf;
+		memcpy(&spclpt, tpb->buf, TP_BSIZE);
+		cvtflag = 0;
+		if (converthead(&spclpt) == FAIL) {
+			cvtflag++;
+			if (converthead(&spclpt) == FAIL)
+				errx(1, "Tape is not a dump tape");
+			fprintf(stderr, "Converting to new file system format.\n");
+		}
 		if (i % TP_BSIZE == PREFIXSIZE
 		    && tpb->compressed == 0
-		    && spclpt->c_type == TS_TAPE
-		    && spclpt->c_flags & DR_COMPRESSED) {
+		    && spclpt.c_type == TS_TAPE
+		    && spclpt.c_flags & DR_COMPRESSED) {
 			zflag = 1;
 			tbufptr = tpb->buf;
 			if (tpb->length > bufsize)
@@ -1987,12 +2012,12 @@ findtapeblksize(void)
 				i, TP_BSIZE);
 	}
 	ntrec = i / TP_BSIZE;
-	if (spclpt->c_type == TS_TAPE) {
-		if (spclpt->c_flags & DR_COMPRESSED)
+	if (spclpt.c_type == TS_TAPE) {
+		if (spclpt.c_flags & DR_COMPRESSED)
 			zflag = 1;
-		if (spclpt->c_ntrec > ntrec)
+		if (spclpt.c_ntrec > ntrec)
 			errx(1, "Tape blocksize is too large, use "
-				"\'-b %d\' ", spclpt->c_ntrec);
+				"\'-b %d\' ", spclpt.c_ntrec);
 	}
 	numtrec = ntrec;
 	Vprintf(stdout, "Tape block size is %ld\n", ntrec);
@@ -2008,7 +2033,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
@@ -2032,7 +2057,7 @@ closemt(void)
 	if (mt < 0)
 		return;
 #ifdef RRESTORE
-	if (host)
+	if (!Afile && host)
 		rmtclose();
 	else
 #endif
@@ -2056,7 +2081,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");
 }
@@ -2069,6 +2095,13 @@ setmagtapein(void) {
  */
 static int
 gethead(struct s_spcl *buf)
+{
+	readtape((char *)buf);
+	return converthead(buf);
+}
+
+static int
+converthead(struct s_spcl *buf)
 {
 	int32_t i;
 	union {
@@ -2104,7 +2137,6 @@ gethead(struct s_spcl *buf)
 	} u_ospcl;
 
 	if (!cvtflag) {
-		readtape((char *)buf);
 		if (buf->c_magic != NFS_MAGIC) {
 			if (swabi(buf->c_magic) != NFS_MAGIC)
 				return (FAIL);
@@ -2116,10 +2148,10 @@ gethead(struct s_spcl *buf)
 		if (checksum((int *)buf) == FAIL)
 			return (FAIL);
 		if (Bcvt)
-			swabst((u_char *)"8i4s31i528bi192b2i", (u_char *)buf);
+			swabst((u_char *)"8i4s31i528bi192b3i", (u_char *)buf);
 		goto good;
 	}
-	readtape((char *)(&u_ospcl.s_ospcl));
+	memcpy(&u_ospcl.s_ospcl, buf, TP_BSIZE);
 	memset((char *)buf, 0, (long)TP_BSIZE);
 	buf->c_type = u_ospcl.s_ospcl.c_type;
 	buf->c_date = u_ospcl.s_ospcl.c_date;
@@ -2219,6 +2251,23 @@ good:
 	return(GOOD);
 }
 
+static void
+converttapebuf(struct tapebuf *tpb)
+{
+	if (Bcvt) {
+		struct tb {
+			unsigned int    length:28;
+			unsigned int    flags:3;
+			unsigned int    compressed:1;
+		} tb;
+		swabst((u_char *)"i", (u_char *)tpb);
+		memcpy(&tb, tpb, 4);	
+		tpb->length = tb.length;
+		tpb->flags = tb.flags;
+		tpb->compressed = tb.compressed;
+	}
+}
+
 /*
  * Check that a header is where it belongs and predict the next header
  */
@@ -2550,7 +2599,7 @@ GotoTapePos(long long pos)
 
 #ifdef RDUMP
 	if (host)
-		err = (rmtseek((long)pos, SEEK_SET) < 0);
+		err = (rmtseek(pos, SEEK_SET) < 0);
 	else
 #endif
 	{
@@ -2601,13 +2650,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);