X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Ftape.c;h=f46ac48a1f5ea0a9f60efd916fb66ae4a661f546;hb=2c99ad2dc97978b437794b14d58d9ae698ecabb9;hp=d4a46ed78512f21c349ed99cde2d9ec464635bc8;hpb=a1b67fc50f87e9febfd56bd2a7089eb569b852f6;p=dump.git

diff --git a/restore/tape.c b/restore/tape.c
index d4a46ed..f46ac48 100644
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.29 2001/03/20 10:02:48 stelian Exp $";
+	"$Id: tape.c,v 1.34 2001/04/12 16:03:30 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -82,6 +82,9 @@ static const char rcsid[] =
 #include "extern.h"
 #include "pathnames.h"
 
+#ifdef USE_QFA
+int		noresyncmesg = 0;
+#endif /* USE_QFA */
 static long	fssize = MAXBSIZE;
 static int	mt = -1;
 static int	pipein = 0;
@@ -147,7 +150,7 @@ static void	readtape_comprtape __P((char *));
 static char	*decompress_tapebuf __P((struct tapebuf *, int));
 static void	msg_read_error __P((char *));
 #endif
-static int	read_a_block __P((int, void *, size_t, long *));
+static int	read_a_block __P((int, char *, size_t, long *));
 #define PREFIXSIZE	sizeof(struct tapebuf)
 
 #define COMPARE_ONTHEFLY 1
@@ -838,6 +841,11 @@ loop:
 		(*fill)((char *)buf, (size_t)(curblk * TP_BSIZE) + size);
 		last_write_was_hole = 0;
 	}
+	if (size > 0) {
+		fprintf(stderr, "Missing blocks at the end of %s, assuming hole\n", curfile.name);
+		(*skip)(clearedbuf, size);
+		last_write_was_hole = 1;
+	}
 	if (last_write_was_hole) {
 		ftruncate(ofile, origsize);
 	}
@@ -1237,7 +1245,7 @@ comparefile(char *name)
 			panic("cannot delete tmp file %s: %s\n",
 			      tmpfile, strerror(errno));
 		}
-		if ((ofile = creat(tmpfile, 0600)) < 0) {
+		if ((ofile = open(tmpfile, O_WRONLY | O_CREAT | O_TRUNC, 0600)) < 0) {
 			panic("cannot create file temp file %s: %s\n",
 			      name, strerror(errno));
 		}
@@ -1742,8 +1750,8 @@ findtapeblksize(void)
 		else {
 			/* read in the rest of the block based on bufsize */
 			len = bufsize - TP_BSIZE;
-			if (read_a_block(mt, tapebuf+TP_BSIZE, len, &i) <= 0
-			    || i != len)
+			if (read_a_block(mt, tapebuf+TP_BSIZE, len, &i) < 0
+			    || (i != len && i % TP_BSIZE != 0))
 				errx(1,"Error reading dump file header");
 			tbufptr = tapebuf;
 			numtrec = ntrec;
@@ -1784,7 +1792,7 @@ findtapeblksize(void)
 /*
  * Read a block of data handling all of the messy details.
  */
-static int read_a_block(int fd, void *buf, size_t len, long *lengthread)
+static int read_a_block(int fd, char *buf, size_t len, long *lengthread)
 {
 	long i = 1, size;
 
@@ -2095,8 +2103,11 @@ findinode(struct s_spcl *header)
 		}
 	} while (header->c_type == TS_ADDR);
 	if (skipcnt > 0)
-		fprintf(stderr, "resync restore, skipped %ld blocks\n",
-		    skipcnt);
+#ifdef USE_QFA
+		if (!noresyncmesg)
+#endif
+			fprintf(stderr, "resync restore, skipped %ld blocks\n",
+		    		skipcnt);
 	skipcnt = 0;
 }
 
@@ -2250,3 +2261,72 @@ swabl(u_long x)
 	return (x);
 }
 #endif
+
+#ifdef USE_QFA
+/*
+ * get the current position of the tape
+ */
+int
+GetTapePos(long *pos)
+{
+	int err = 0;
+
+	*pos = 0;
+	if (ioctl(mt, MTIOCPOS, pos) == -1) {
+		err = errno;
+		fprintf(stdout, "[%ld] error: %d (getting tapepos: %ld)\n", 
+			(unsigned long)getpid(), err, *pos);
+		return err;
+	}
+	return err;
+}
+
+typedef struct mt_pos {
+	short	 mt_op;
+	int	 mt_count;
+} MTPosRec, *MTPosPtr;
+
+/*
+ * go to specified position on tape
+ */
+int
+GotoTapePos(long pos)
+{
+	int err = 0;
+	struct mt_pos buf;
+
+	buf.mt_op = MTSEEK;
+	buf.mt_count = pos;
+	if (ioctl(mt, MTIOCTOP, &buf) == -1) {
+		err = errno;
+		fprintf(stdout, "[%ld] error: %d (setting tapepos: %ld)\n", 
+			(unsigned long)getpid(), err, pos);
+		return err;
+	}
+	return err;
+}
+
+/*
+ * read next data from tape to re-sync
+ */
+void
+ReReadFromTape(void)
+{
+	FLUSHTAPEBUF();
+	noresyncmesg = 1;
+	if (gethead(&spcl) == FAIL) {
+#ifdef DEBUG_QFA
+		fprintf(stdout, "DEBUG 1 gethead failed\n");
+#endif
+	}
+	findinode(&spcl);
+	noresyncmesg = 0;
+}
+
+void
+RequestVol(long tnum)
+{
+	FLUSHTAPEBUF();
+	getvol(tnum);
+}
+#endif /* USE_QFA */