]> git.wh0rd.org - dump.git/blobdiff - restore/tape.c
Added Helmut Jarausch patch for restoring from multiple CD + examples.
[dump.git] / restore / tape.c
index 0489574a5f9730acf59697b000281a5907deca64..344ca3b46fadd47079622653e5fcc07f19ac47d4 100644 (file)
@@ -2,7 +2,8 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *     Stelian Pop <pop@cybercable.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr>, 1999-2000
+ *     Stelian Pop <pop@noos.fr> - AlcĂ´ve <www.alcove.fr>, 2000
  */
 
 /*
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.12 2000/03/01 10:16:05 stelian Exp $";
+       "$Id: tape.c,v 1.47 2001/09/12 10:21:49 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
+#include <compatlfs.h>
+#include <errno.h>
+#include <compaterr.h>
+#include <system.h>
+#include <setjmp.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
 #include <sys/param.h>
 #include <sys/file.h>
 #include <sys/mtio.h>
@@ -55,37 +67,49 @@ static const char rcsid[] =
 
 #ifdef __linux__
 #include <sys/time.h>
+#include <time.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
+#include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #else  /* __linux__ */
 #include <ufs/ufs/dinode.h>
 #endif /* __linux__ */
 #include <protocols/dumprestore.h>
 
-#include <errno.h>
-#include <compaterr.h>
-#include <setjmp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif /* HAVE_ZLIB */
 
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
+#ifdef HAVE_BZLIB
+#include <bzlib.h>
+#endif /* HAVE_BZLIB */
 
 #include "restore.h"
 #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;
+static int     magtapein = 0;          /* input is from magtape */
 static char    magtape[MAXPATHLEN];
 static char    magtapeprefix[MAXPATHLEN];
 static int     blkcnt;
 static int     numtrec;
-static char    *tapebuf;
+static char    *tapebuf;               /* input buffer for read */
+static int     bufsize;                /* buffer size without prefix */
+static char    *tbufptr = NULL;        /* active tape buffer */
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+static char    *comprbuf;              /* uncompress work buf */
+static size_t  comprlen;               /* size including prefix */
+#endif
 static union   u_spcl endoftapemark;
 static long    blksread;               /* blocks read since last header */
 static long    tpblksread = 0;         /* TP_BSIZE blocks read */
@@ -113,7 +137,9 @@ static int   gethead __P((struct s_spcl *));
 static void     readtape __P((char *));
 static void     setdumpnum __P((void));
 static u_int    swabi __P((u_int));
+#if 0
 static u_long   swabl __P((u_long));
+#endif
 static u_char  *swab64 __P((u_char *, int));
 static u_char  *swab32 __P((u_char *, int));
 static u_char  *swab16 __P((u_char *, int));
@@ -124,11 +150,33 @@ static void        xtrlnkskip __P((char *, size_t));
 static void     xtrmap __P((char *, size_t));
 static void     xtrmapskip __P((char *, size_t));
 static void     xtrskip __P((char *, size_t));
+static void     setmagtapein __P((void));
+
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+static void    newcomprbuf __P((int));
+static void    readtape_set __P((char *));
+static void    readtape_uncompr __P((char *));
+static void    readtape_comprfile __P((char *));
+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, char *, size_t, long *));
+#define PREFIXSIZE     sizeof(struct tapebuf)
+
+#define COMPARE_ONTHEFLY 1
+
+#if COMPARE_ONTHEFLY
+static int     ifile;          /* input file for compare */
+static int     cmperror;       /* compare error */
+static void    xtrcmpfile __P((char *, size_t));
+static void    xtrcmpskip __P((char *, size_t));
+#endif
 
 static int readmapflag;
 
 /*
- * Set up an input source
+ * Set up an input source. This is called from main.c before setup() is.
  */
 void
 setinput(char *source)
@@ -180,16 +228,33 @@ newtapebuf(long size)
        static int tapebufsize = -1;
 
        ntrec = size;
+       bufsize = ntrec * TP_BSIZE;
        if (size <= tapebufsize)
                return;
        if (tapebuf != NULL)
                free(tapebuf);
-       tapebuf = malloc(size * TP_BSIZE);
+       tapebuf = malloc(size * TP_BSIZE + sizeof(struct tapebuf));
        if (tapebuf == NULL)
                errx(1, "Cannot allocate space for tape buffer");
        tapebufsize = size;
 }
 
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+static void
+newcomprbuf(int size)
+{
+       size_t buf_size = (size+1) * TP_BSIZE + sizeof(struct tapebuf);
+       if (buf_size <= comprlen)
+               return;
+       comprlen = buf_size;
+       if (comprbuf != NULL)
+               free(comprbuf);
+       comprbuf = malloc(comprlen);
+       if (comprbuf == NULL)
+               errx(1, "Cannot allocate space for decompress buffer");
+}
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
+
 /*
  * Verify that the tape drive can be accessed and
  * that it actually is a dump tape.
@@ -197,10 +262,18 @@ newtapebuf(long size)
 void
 setup(void)
 {
-       int i, j, *ip;
-       struct stat stbuf;
+       int i, j, *ip, bot_code;
+       struct STAT stbuf;
 
        Vprintf(stdout, "Verify tape and initialize maps\n");
+       if (bot_script) {
+               msg("Launching %s\n", bot_script);
+               bot_code = system_command(bot_script, magtape, 1);
+               if (bot_code != 0 && bot_code != 1) {
+                       msg("Restore aborted by the beginning of tape script\n");
+                       exit(1);
+               }
+       }
 #ifdef RRESTORE
        if (host)
                mt = rmtopen(magtape, 0);
@@ -209,14 +282,14 @@ setup(void)
        if (pipein)
                mt = 0;
        else
-               mt = open(magtape, O_RDONLY, 0);
+               mt = OPEN(magtape, O_RDONLY, 0);
        if (mt < 0)
                err(1, "%s", magtape);
        volno = 1;
+       setmagtapein();
        setdumpnum();
        FLUSHTAPEBUF();
-       if (!pipein && !bflag)
-               findtapeblksize();
+       findtapeblksize();
        if (gethead(&spcl) == FAIL) {
                blkcnt--; /* push back this block */
                blksread--;
@@ -226,6 +299,15 @@ setup(void)
                        errx(1, "Tape is not a dump tape");
                fprintf(stderr, "Converting to new file system format.\n");
        }
+
+       if (zflag) {
+               fprintf(stderr, "Dump tape is compressed.\n");
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+               newcomprbuf(ntrec);
+#else
+               errx(1,"This restore version doesn't support decompression");
+#endif /* HAVE_ZLIB */
+       }
        if (pipein) {
                endoftapemark.s_spcl.c_magic = cvtflag ? OFS_MAGIC : NFS_MAGIC;
                endoftapemark.s_spcl.c_type = TS_END;
@@ -239,12 +321,17 @@ setup(void)
        }
        if (vflag || command == 't' || command == 'C')
                printdumpinfo();
-       if (filesys == NULL) {
-               filesys = spcl.c_filesys;
+       if (filesys[0] == '\0') {
+               char *dirptr;
+               strncpy(filesys, spcl.c_filesys, NAMELEN);
+               filesys[NAMELEN - 1] = '\0';
+               dirptr = strstr(filesys, " (dir");
+               if (dirptr != NULL)
+                       *dirptr = '\0';
        }
        dumptime = spcl.c_ddate;
        dumpdate = spcl.c_date;
-       if (stat(".", &stbuf) < 0)
+       if (STAT(".", &stbuf) < 0)
                err(1, "cannot stat .");
        if (stbuf.st_blksize > 0 && stbuf.st_blksize < TP_BSIZE )
                fssize = TP_BSIZE;
@@ -265,7 +352,7 @@ setup(void)
        Dprintf(stdout, "maxino = %ld\n", (long)maxino);
        map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
        if (map == NULL)
-               panic("no memory for active inode map\n");
+               errx(1, "no memory for active inode map");
        usedinomap = map;
        curfile.action = USING;
        getfile(xtrmap, xtrmapskip);
@@ -273,7 +360,7 @@ setup(void)
                errx(1, "Cannot find file dump list");
        map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
        if (map == (char *)NULL)
-               panic("no memory for file dump list\n");
+               errx(1, "no memory for file dump list");
        dumpmap = map;
        curfile.action = USING;
        getfile(xtrmap, xtrmapskip);
@@ -296,11 +383,12 @@ setup(void)
 void
 getvol(long nextvol)
 {
-       long newvol = 0, savecnt = 0, wantnext = 0, i;
+       long newvol = 0, wantnext = 0, i;
+       long saved_blksread = 0, saved_tpblksread = 0;
        union u_spcl tmpspcl;
 #      define tmpbuf tmpspcl.s_spcl
        char buf[TP_BSIZE];
-       int haderror = 0;
+       int haderror = 0, bot_code = 1;
 
        if (nextvol == 1) {
                tapesread = 0;
@@ -313,7 +401,8 @@ getvol(long nextvol)
                        return;
                goto gethdr;
        }
-       savecnt = blksread;
+       saved_blksread = blksread;
+       saved_tpblksread = tpblksread;
 again:
        if (pipein)
                exit(1); /* pipes do not get a second chance */
@@ -345,7 +434,7 @@ again:
                do      {
                        fprintf(stderr, "Specify next volume #: ");
                        (void) fflush(stderr);
-                       (void) fgets(buf, BUFSIZ, terminal);
+                       (void) fgets(buf, TP_BSIZE, terminal);
                } while (!feof(terminal) && buf[0] == '\n');
                if (feof(terminal))
                        exit(1);
@@ -364,13 +453,21 @@ again:
                snprintf(magtape, MAXPATHLEN, "%s%03ld", magtapeprefix, newvol);
                magtape[MAXPATHLEN - 1] = '\0';
        }
-       if (!Mflag || haderror) {
+       if (bot_script && !haderror) {
+               msg("Launching %s\n", bot_script);
+               bot_code = system_command(bot_script, magtape, newvol);
+               if (bot_code != 0 && bot_code != 1) {
+                       msg("Restore aborted by the beginning of tape script\n");
+                       exit(1);
+               }
+       }
+       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);
                (void) fflush(stderr);
-               (void) fgets(buf, BUFSIZ, terminal);
+               (void) fgets(buf, TP_BSIZE, terminal);
                if (feof(terminal))
                        exit(1);
                if (!strcmp(buf, "none\n")) {
@@ -378,8 +475,11 @@ again:
                        return;
                }
                if (buf[0] != '\n') {
-                       (void) strcpy(magtape, buf);
-                       magtape[strlen(magtape) - 1] = '\0';
+                       char *pos;
+                       (void) strncpy(magtape, buf, sizeof(magtape));
+                       magtape[sizeof(magtape) - 1] = '\0';
+                       if ((pos = strchr(magtape, '\n'))) 
+                               magtape[pos - magtape] = '\0';
                }
        }
 #ifdef RRESTORE
@@ -387,7 +487,7 @@ again:
                mt = rmtopen(magtape, 0);
        else
 #endif
-               mt = open(magtape, O_RDONLY, 0);
+               mt = OPEN(magtape, O_RDONLY, 0);
 
        if (mt == -1) {
                fprintf(stderr, "Cannot open %s\n", magtape);
@@ -396,38 +496,41 @@ again:
                goto again;
        }
 gethdr:
+       setmagtapein();
        volno = newvol;
        setdumpnum();
        FLUSHTAPEBUF();
+       findtapeblksize();
        if (gethead(&tmpbuf) == FAIL) {
                Dprintf(stdout, "header read failed at %ld blocks\n", (long)blksread);
                fprintf(stderr, "tape is not dump tape\n");
                volno = 0;
                haderror = 1;
+               blksread = saved_blksread;
+               tpblksread = saved_tpblksread;
                goto again;
        }
        if (tmpbuf.c_volume != volno) {
                fprintf(stderr, "Wrong volume (%d)\n", tmpbuf.c_volume);
                volno = 0;
                haderror = 1;
+               blksread = saved_blksread;
+               tpblksread = saved_tpblksread;
                goto again;
        }
        if (tmpbuf.c_date != dumpdate || tmpbuf.c_ddate != dumptime) {
-#ifdef __linux__
                fprintf(stderr, "Wrong dump date\n\tgot: %s",
                        ctime4(&tmpbuf.c_date));
-               fprintf(stderr, "\twanted: %s", ctime4(&dumpdate));
-#else
-               fprintf(stderr, "Wrong dump date\n\tgot: %s",
-                       ctime(&tmpbuf.c_date));
                fprintf(stderr, "\twanted: %s", ctime(&dumpdate));
-#endif
                volno = 0;
                haderror = 1;
+               blksread = saved_blksread;
+               tpblksread = saved_tpblksread;
                goto again;
        }
        tapesread |= 1 << volno;
-       blksread = savecnt;
+       blksread = saved_blksread;
+       tpblksread = saved_tpblksread;
        /*
         * If continuing from the previous volume, skip over any
         * blocks read already at the end of the previous volume.
@@ -521,20 +624,14 @@ setdumpnum(void)
 void
 printdumpinfo(void)
 {
-#ifdef __linux__
        fprintf(stdout, "Dump   date: %s", ctime4(&spcl.c_date));
        fprintf(stdout, "Dumped from: %s",
            (spcl.c_ddate == 0) ? "the epoch\n" : ctime4(&spcl.c_ddate));
-#else
-       fprintf(stdout, "Dump   date: %s", ctime(&spcl.c_date));
-       fprintf(stdout, "Dumped from: %s",
-           (spcl.c_ddate == 0) ? "the epoch\n" : ctime(&spcl.c_ddate));
-#endif
        if (spcl.c_host[0] == '\0')
                return;
-       fprintf(stderr, "Level %d dump of %s on %s:%s\n",
+       fprintf(stdout, "Level %d dump of %s on %s:%s\n",
                spcl.c_level, spcl.c_filesys, spcl.c_host, spcl.c_dev);
-       fprintf(stderr, "Label: %s\n", spcl.c_label);
+       fprintf(stdout, "Label: %s\n", spcl.c_label);
 }
 
 int
@@ -667,7 +764,7 @@ extractfile(char *name)
                }
                if (uflag)
                        (void)unlink(name);
-               if ((ofile = open(name, O_WRONLY | O_CREAT | O_TRUNC,
+               if ((ofile = OPEN(name, O_WRONLY | O_CREAT | O_TRUNC,
                    0666)) < 0) {
                        warn("%s: cannot create file", name);
                        skipfile();
@@ -775,8 +872,17 @@ 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);
+               while (size > 0) {
+                       size_t skp = size > TP_BSIZE ? TP_BSIZE : size;
+                       (*skip)(clearedbuf, skp);
+                       size -= skp;
+               }
+               last_write_was_hole = 1;
+       }
        if (last_write_was_hole) {
-               ftruncate(ofile, origsize);
+               FTRUNCATE(ofile, origsize);
        }
        findinode(&spcl);
        gettingfile = 0;
@@ -804,7 +910,7 @@ static void
 xtrskip(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);
 }
@@ -868,6 +974,63 @@ xtrnull(char *buf, size_t size)
        return;
 }
 
+#if COMPARE_ONTHEFLY
+/*
+ * Compare the next block of a file.
+ */
+static void
+xtrcmpfile(char *buf, size_t size)
+{
+       static char cmpbuf[MAXBSIZE];
+
+       if (cmperror)
+               return;
+       
+       if (read(ifile, cmpbuf, size) != size) {
+               fprintf(stderr, "%s: size has changed.\n", 
+                       curfile.name);
+               cmperror = 1;
+               return;
+       }
+       
+       if (memcmp(buf, cmpbuf, size) != 0) {
+               fprintf(stderr, "%s: tape and disk copies are different\n",
+                       curfile.name);
+               cmperror = 1;
+               return;
+       }
+}
+
+/*
+ * Skip over a hole in a file.
+ */
+static void
+xtrcmpskip(char *buf, size_t size)
+{
+       static char cmpbuf[MAXBSIZE];
+       int i;
+
+       if (cmperror)
+               return;
+       
+       if (read(ifile, cmpbuf, size) != size) {
+               fprintf(stderr, "%s: size has changed.\n", 
+                       curfile.name);
+               cmperror = 1;
+               return;
+       }
+
+       for (i = 0; i < size; ++i)
+               if (cmpbuf[i] != '\0') {
+                       fprintf(stderr, "%s: tape and disk copies are different\n",
+                               curfile.name);
+                       cmperror = 1;
+                       return;
+               }
+}
+#endif /* COMPARE_ONTHEFLY */
+
+#if !COMPARE_ONTHEFLY
 static int
 do_cmpfiles(int fd_tape, int fd_disk, long size)
 {
@@ -905,20 +1068,22 @@ int
 #else
 void
 #endif
-cmpfiles(char *tapefile, char *diskfile, struct stat *sbuf_disk)
+cmpfiles(char *tapefile, char *diskfile, struct STAT *sbuf_disk)
 {
-       struct stat sbuf_tape;
+       struct STAT sbuf_tape;
        int fd_tape, fd_disk;
 
-       if (stat(tapefile, &sbuf_tape) != 0) {
+       if (STAT(tapefile, &sbuf_tape) != 0) {
                panic("Can't lstat tmp file %s: %s\n", tapefile,
                      strerror(errno));
+               compare_errors = 1;
        }
 
        if (sbuf_disk->st_size != sbuf_tape.st_size) {
                fprintf(stderr,
                        "%s: size changed from %ld to %ld.\n",
                        diskfile, (long)sbuf_tape.st_size, (long)sbuf_disk->st_size);
+               compare_errors = 1;
 #ifdef COMPARE_FAIL_KEEP_FILE
                return (0);
 #else
@@ -926,12 +1091,14 @@ cmpfiles(char *tapefile, char *diskfile, struct stat *sbuf_disk)
 #endif
        }
 
-       if ((fd_tape = open(tapefile, O_RDONLY)) < 0) {
+       if ((fd_tape = OPEN(tapefile, O_RDONLY)) < 0) {
                panic("Can't open %s: %s\n", tapefile, strerror(errno));
+               compare_errors = 1;
        }
-       if ((fd_disk = open(diskfile, O_RDONLY)) < 0) {
+       if ((fd_disk = OPEN(diskfile, O_RDONLY)) < 0) {
                close(fd_tape);
                panic("Can't open %s: %s\n", diskfile, strerror(errno));
+               compare_errors = 1;
        }
 
        if (do_cmpfiles(fd_tape, fd_disk, sbuf_tape.st_size)) {
@@ -939,6 +1106,7 @@ cmpfiles(char *tapefile, char *diskfile, struct stat *sbuf_disk)
                        diskfile);
                close(fd_tape);
                close(fd_disk);
+               compare_errors = 1;
 #ifdef COMPARE_FAIL_KEEP_FILE
                /* rename the file to live in /tmp */
                /* rename `tapefile' to /tmp/<basename of diskfile> */
@@ -972,19 +1140,26 @@ cmpfiles(char *tapefile, char *diskfile, struct stat *sbuf_disk)
        return (1);
 #endif
 }
+#endif /* !COMPARE_ONTHEFLY */
 
+#if !COMPARE_ONTHEFLY
 static char tmpfilename[MAXPATHLEN];
+#endif
 
 void
 comparefile(char *name)
 {
-       static char *tmpfile = NULL;
        int mode;
-       struct stat sb, stemp;
+       struct STAT sb;
        int r;
+#if !COMPARE_ONTHEFLY
+       static char *tmpfile = NULL;
+       struct STAT stemp;
+#endif
 
-       if ((r = lstat(name, &sb)) != 0) {
+       if ((r = LSTAT(name, &sb)) != 0) {
                warn("%s: does not exist (%d)", name, r);
+               compare_errors = 1;
                skipfile();
                return;
        }
@@ -999,6 +1174,7 @@ comparefile(char *name)
        if (sb.st_mode != mode) {
                fprintf(stderr, "%s: mode changed from 0%o to 0%o.\n",
                        name, mode & 07777, sb.st_mode & 07777);
+               compare_errors = 1;
        }
        switch (mode & IFMT) {
        default:
@@ -1020,6 +1196,7 @@ comparefile(char *name)
                if (!(sb.st_mode & S_IFLNK)) {
                        fprintf(stderr, "%s: is no longer a symbolic link\n",
                                name);
+                       compare_errors = 1;
                        return;
                }
                lnkbuf[0] = '\0';
@@ -1029,17 +1206,20 @@ comparefile(char *name)
                        fprintf(stderr,
                                "%s: zero length symbolic link (ignored)\n",
                                name);
+                       compare_errors = 1;
                        return;
                }
                if ((lsize = readlink(name, lbuf, MAXPATHLEN)) < 0) {
                        panic("readlink of %s failed: %s", name,
                              strerror(errno));
+                       compare_errors = 1;
                }
                lbuf[lsize] = 0;
                if (strcmp(lbuf, lnkbuf) != 0) {
                        fprintf(stderr,
                                "%s: symbolic link changed from %s to %s.\n",
                                name, lnkbuf, lbuf);
+                       compare_errors = 1;
                        return;
                }
                return;
@@ -1050,6 +1230,7 @@ comparefile(char *name)
                if (!(sb.st_mode & (S_IFCHR|S_IFBLK))) {
                        fprintf(stderr, "%s: no longer a special file\n",
                                name);
+                       compare_errors = 1;
                        skipfile();
                        return;
                }
@@ -1062,21 +1243,44 @@ comparefile(char *name)
                                (int)curfile.dip->di_rdev & 0xff,
                                ((int)sb.st_rdev >> 8) & 0xff,
                                (int)sb.st_rdev & 0xff);
+                       compare_errors = 1;
                }
                skipfile();
                return;
 
        case IFREG:
+#if COMPARE_ONTHEFLY
+               if ((ifile = OPEN(name, O_RDONLY)) < 0) {
+                       panic("Can't open %s: %s\n", name, strerror(errno));
+                       skipfile();
+                       compare_errors = 1;
+               }
+               else {
+                       cmperror = 0;
+                       getfile(xtrcmpfile, xtrcmpskip);
+                       if (!cmperror) {
+                               char c;
+                               if (read(ifile, &c, 1) != 0) {
+                                       fprintf(stderr, "%s: size has changed.\n", 
+                                               name);
+                                       cmperror = 1;
+                               }
+                       }
+                       if (cmperror)
+                               compare_errors = 1;
+                       close(ifile);
+               }
+#else
                if (tmpfile == NULL) {
                        /* argument to mktemp() must not be in RO space: */
                        snprintf(tmpfilename, sizeof(tmpfilename), "%s/restoreCXXXXXX", tmpdir);
                        tmpfile = mktemp(&tmpfilename[0]);
                }
-               if ((stat(tmpfile, &stemp) == 0) && (unlink(tmpfile) != 0)) {
+               if ((STAT(tmpfile, &stemp) == 0) && (unlink(tmpfile) != 0)) {
                        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));
                }
@@ -1089,27 +1293,69 @@ comparefile(char *name)
                cmpfiles(tmpfile, name, &sb);
                unlink(tmpfile);
 #endif
+#endif /* COMPARE_ONTHEFLY */
                return;
        }
        /* NOTREACHED */
 }
 
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+static void (*readtape_func)(char *) = readtape_set;
+
 /*
  * Read TP_BSIZE blocks from the input.
  * Handle read errors, and end of media.
+ * Decompress compressed blocks.
  */
 static void
 readtape(char *buf)
+{
+       (*readtape_func)(buf);  /* call the actual processing routine */
+}
+
+/*
+ * Set function pointer for readtape() routine. zflag and magtapein must
+ * be correctly set before the first call to readtape().
+ */
+static void
+readtape_set(char *buf)
+{
+       if (!zflag) 
+               readtape_func = readtape_uncompr;
+       else {
+               newcomprbuf(ntrec);
+               if (magtapein)
+                       readtape_func = readtape_comprtape;
+               else
+                       readtape_func = readtape_comprfile;
+       }
+       readtape(buf);
+}
+
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
+
+/*
+ * This is the original readtape(), it's used for reading uncompressed input.
+ * Read TP_BSIZE blocks from the input.
+ * Handle read errors, and end of media.
+ */
+static void
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+readtape_uncompr(char *buf)
+#else
+readtape(char *buf)
+#endif
 {
        ssize_t rd, newvol, i;
        int cnt, seek_failed;
 
        if (blkcnt < numtrec) {
-               memmove(buf, &tapebuf[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
+               memmove(buf, &tbufptr[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
                blksread++;
                tpblksread++;
                return;
        }
+       tbufptr = tapebuf;
        for (i = 0; i < ntrec; i++)
                ((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
        if (numtrec == 0)
@@ -1123,6 +1369,7 @@ getmore:
        else
 #endif
                i = read(mt, &tapebuf[rd], cnt);
+
        /*
         * Check for mid-tape short read error.
         * If found, skip rest of buffer and start with the next.
@@ -1183,10 +1430,14 @@ getmore:
                        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)
-                       err(1, "continuation failed");
+               if (seek_failed) {
+                       warn("continuation failed");
+                       if (!yflag && !reply("assume end-of-tape and continue"))
+                               exit(1);
+                       i = 0;
+               }
        }
        /*
         * Handle end of tape.
@@ -1208,36 +1459,451 @@ getmore:
                memmove(&tapebuf[rd], &endoftapemark, TP_BSIZE);
        }
        blkcnt = 0;
-       memmove(buf, &tapebuf[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
+       memmove(buf, &tbufptr[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
        blksread++;
        tpblksread++;
 }
 
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+
+/*
+ * Read a compressed format block from a file or pipe and uncompress it.
+ * Attempt to handle read errors, and end of file. 
+ */
 static void
-findtapeblksize(void)
+readtape_comprfile(char *buf)
 {
-       register long i;
+       long rl, size, i, ret;
+       int newvol; 
+       struct tapebuf *tpb;
 
+       if (blkcnt < numtrec) {
+               memmove(buf, &tbufptr[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
+               blksread++;
+               tpblksread++;
+               return;
+       }
+       /* need to read the next block */
+       tbufptr = tapebuf;
        for (i = 0; i < ntrec; i++)
                ((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
+       numtrec = ntrec;
+       tpb = (struct tapebuf *) tapebuf;
+
+       /* read the block prefix */
+       ret = read_a_block(mt, tapebuf, PREFIXSIZE, &rl);
+
+       if (Vflag && (ret == 0 || rl < PREFIXSIZE  ||  tpb->length == 0))
+               ret = 0;
+       if (ret <= 0)
+               goto readerr;
+
+       /* read the data */
+       size = tpb->length;
+       if (size > bufsize)  {
+               /* something's wrong */
+               Vprintf(stdout, "Prefix size error, max size %d, got %ld\n",
+                       bufsize, size);
+               size = bufsize;
+               tpb->length = bufsize;
+       }
+       ret = read_a_block(mt, tpb->buf, size, &rl);
+       if (ret <= 0)
+               goto readerr;
+
+       tbufptr = decompress_tapebuf(tpb, rl + PREFIXSIZE);
+       if (tbufptr == NULL) {
+               msg_read_error("File decompression error while");
+               if (!yflag && !reply("continue"))
+                       exit(1);
+               memset(tapebuf, 0, bufsize);
+               tbufptr = tapebuf;
+       }
+
        blkcnt = 0;
+       memmove(buf, &tbufptr[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
+       blksread++;
+       tpblksread++;
+       return;
+
+readerr:
+       /* Errors while reading from a file or pipe are catastrophic. Since
+        * there are no block boundaries, it's impossible to bypass the
+        * block in error and find the start of the next block.
+        */
+       if (ret == 0) {
+               /* It's possible to have multiple input files using -M
+                * and -f file1,file2...
+                */
+               Vprintf(stdout, "End-of-File encountered\n");
+               if (!pipein) {
+                       newvol = volno + 1;
+                       volno = 0;
+                       numtrec = 0;
+                       getvol(newvol);
+                       readtape(buf);
+                       return;
+               }
+       }
+       msg_read_error("Read error while");
+       /* if (!yflag && !reply("continue")) */
+               exit(1);
+}
+
+/*
+ * Read compressed data from a tape and uncompress it.
+ * Handle read errors, and end of media.
+ * Since a tape consists of separate physical blocks, we try
+ * to recover from errors by repositioning the tape to the next
+ * block.
+ */
+static void
+readtape_comprtape(char *buf)
+{
+       long rl, size, i;
+       int ret, newvol;
+       struct tapebuf *tpb;
+       struct mtop tcom;
+
+       if (blkcnt < numtrec) {
+               memmove(buf, &tbufptr[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
+               blksread++;
+               tpblksread++;
+               return;
+       }
+       /* need to read the next block */
+       tbufptr = tapebuf;
+       for (i = 0; i < ntrec; i++)
+               ((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
+       numtrec = ntrec;
+       tpb = (struct tapebuf *) tapebuf;
+
+       /* read the block */
+       size = bufsize + PREFIXSIZE;
+       ret = read_a_block(mt, tapebuf, size, &rl);
+       if (ret <= 0)
+               goto readerr;
+
+       tbufptr = decompress_tapebuf(tpb, rl);
+       if (tbufptr == NULL) {
+               msg_read_error("Tape decompression error while");
+               if (!yflag && !reply("continue"))
+                       exit(1);
+               memset(tapebuf, 0, PREFIXSIZE + bufsize);
+               tbufptr = tapebuf;
+       }
+       goto moverecord;
+
+readerr:
+       /* Handle errors: EOT switches to the next volume, other errors
+        * attempt to position the tape to the next block.
+        */
+       if (ret == 0) {
+               Vprintf(stdout, "End-of-tape encountered\n");
+               newvol = volno + 1;
+               volno = 0;
+               numtrec = 0;
+               getvol(newvol);
+               readtape(buf);
+               return;
+       }
+
+       msg_read_error("Tape read error while");
+       if (!yflag && !reply("continue"))
+               exit(1);
+       memset(tapebuf, 0, PREFIXSIZE + bufsize);
+       tbufptr = tapebuf;
+
 #ifdef RRESTORE
        if (host)
-               i = rmtread(tapebuf, (size_t)(ntrec * TP_BSIZE));
+               rl = rmtioctl(MTFSR, 1);
        else
 #endif
-               i = read(mt, tapebuf, (size_t)(ntrec * TP_BSIZE));
+       {
+               tcom.mt_op = MTFSR;
+               tcom.mt_count = 1;
+               rl = ioctl(mt, MTIOCTOP, &tcom);
+       }
+
+       if (rl < 0) {
+               warn("continuation failed");
+               if (!yflag && !reply("assume end-of-tape and continue"))
+                       exit(1);
+               ret = 0;         /* end of tape */
+               goto readerr;
+       }
+
+moverecord:
+       blkcnt = 0;
+       memmove(buf, &tbufptr[(blkcnt++ * TP_BSIZE)], TP_BSIZE);
+       blksread++;
+       tpblksread++;
+}
+
+/*
+ *  Decompress a struct tapebuf into a buffer. readsize is the size read
+ *  from the tape/file and is used for error messages. Returns a pointer
+ *  to the location of the uncompressed buffer or NULL on errors.
+ *  Adjust numtrec and complain for a short block.
+ */
+static char *
+decompress_tapebuf(struct tapebuf *tpbin, int readsize)
+{
+       /* If zflag is on, all blocks have a struct tapebuf prefix */
+       /* zflag gets set in setup() from the dump header          */
+       int cresult, blocklen;        
+       unsigned long worklen;
+#ifdef HAVE_BZLIB
+       unsigned int worklen2;
+#endif
+       char *output = NULL,*reason = NULL, *lengtherr = NULL;              
+       
+       /* build a length error message */
+       blocklen = tpbin->length;
+       if (readsize < blocklen + PREFIXSIZE)
+               lengtherr = "short";
+       else
+               if (readsize > blocklen + PREFIXSIZE)
+                       lengtherr = "long";
+
+       worklen = comprlen;
+       cresult = 1;
+       if (tpbin->compressed) {
+               /* uncompress whatever we read, if it fails, complain later */
+               if (tpbin->flags == COMPRESS_ZLIB) {
+#ifndef HAVE_ZLIB
+                       errx(1,"This restore version doesn't support zlib decompression");
+#else
+                       cresult = uncompress(comprbuf, &worklen, 
+                                            tpbin->buf, blocklen);
+                       output = comprbuf;
+                       switch (cresult) {
+                               case Z_OK:
+                                       break;
+                               case Z_MEM_ERROR:
+                                       reason = "not enough memory";
+                                       break;
+                               case Z_BUF_ERROR:
+                                       reason = "buffer too small";
+                                       break;
+                               case Z_DATA_ERROR:
+                                       reason = "data error";
+                                       break;
+                               default:
+                                       reason = "unknown";
+                       }
+                       if (cresult == Z_OK)
+                               cresult = 1;
+                       else
+                               cresult = 0;
+#endif /* HAVE_ZLIB */
+               }
+               if (tpbin->flags == COMPRESS_BZLIB) {
+#ifndef HAVE_BZLIB
+                       errx(1,"This restore version doesn't support bzlib decompression");
+#else
+                       worklen2 = worklen;
+                       cresult = BZ2_bzBuffToBuffDecompress(
+                                       comprbuf, &worklen2, 
+                                       tpbin->buf, blocklen, 0, 0);
+                       worklen = worklen2;
+                       output = comprbuf;
+                       switch (cresult) {
+                               case BZ_OK:
+                                       break;
+                               case BZ_MEM_ERROR:
+                                       reason = "not enough memory";
+                                       break;
+                               case BZ_OUTBUFF_FULL:
+                                       reason = "buffer too small";
+                                       break;
+                               case BZ_DATA_ERROR:
+                               case BZ_DATA_ERROR_MAGIC:
+                               case BZ_UNEXPECTED_EOF:
+                                       reason = "data error";
+                                       break;
+                               default:
+                                       reason = "unknown";
+                       }
+                       if (cresult == BZ_OK)
+                               cresult = 1;
+                       else
+                               cresult = 0;
+#endif /* HAVE_BZLIB */
+               }
+       }
+       else {
+               output = tpbin->buf;
+               worklen = blocklen;
+       }
+       if (cresult) {
+               numtrec = worklen / TP_BSIZE;
+               if (worklen % TP_BSIZE != 0)
+                       reason = "length mismatch";
+       }
+       if (reason) {
+               if (lengtherr)
+                       fprintf(stderr, "%s compressed block: %d expected: %d\n",
+                               lengtherr, readsize, tpbin->length + PREFIXSIZE);
+               fprintf(stderr, "decompression error, block %ld: %s\n",
+                       tpblksread+1, reason);
+               if (!cresult)
+                       output = NULL;
+       }
+       return output;
+}
+
+/*
+ * Print an error message for a read error.
+ * This was exteracted from the original readtape().
+ */
+static void
+msg_read_error(char *m)
+{
+       switch (curfile.action) {
+               default:
+                       fprintf(stderr, "%s trying to set up tape\n", m);
+                       break;
+               case UNKNOWN:
+                       fprintf(stderr, "%s trying to resynchronize\n", m);
+                       break;
+               case USING:
+                       fprintf(stderr, "%s restoring %s\n", m, curfile.name);
+                       break;
+               case SKIP:
+                       fprintf(stderr, "%s skipping over inode %lu\n", m,
+                               (unsigned long)curfile.ino);
+                       break;
+       }
+}
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
+
+/*
+ * Read the first block and get the blocksize from it. Test
+ * for a compressed dump tape/file. setup() will make the final
+ * determination by checking the compressed flag if gethead()
+ * finds a valid header. The test here is necessary to offset the buffer
+ * by the size of the compressed prefix. zflag is set here so that
+ * readtape_set can set the correct function pointer for readtape().
+ * Note that the first block of each tape/file is not compressed
+ * and does not have a prefix.
+ */ 
+static void
+findtapeblksize(void)
+{
+       long i;
+       size_t len;
+       struct tapebuf *tpb = (struct tapebuf *) tapebuf;
+       struct s_spcl *spclpt = (struct s_spcl *) tapebuf;
+
+       for (i = 0; i < ntrec; i++)
+               ((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
+       blkcnt = 0;
+       tbufptr = tapebuf;
+       /*
+        * For a pipe or file, read in the first record. For a tape, read
+        * the first block.
+        */
+       len = magtapein ? ntrec * TP_BSIZE : TP_BSIZE;
+
+       if (read_a_block(mt, tapebuf, len, &i) <= 0)
+               errx(1, "Tape read error on first record");
 
-       if (i <= 0)
-               err(1, "tape read error");
-       if (i % TP_BSIZE != 0)
-               errx(1, "Tape block size (%ld) is not a multiple of dump block size (%d)", 
-                               (long)i, TP_BSIZE);
+       /*
+        * 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
+        * we need to read in the rest of the block, as determined
+        * by c_ntrec in the dump header. The first block of the
+        * dump is not compressed and does not have a prefix.
+        */
+       if (!magtapein) {
+               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)
+                               errx(1, "Tape blocksize is too large, use "
+                                    "\'-b %d\' ", spclpt->c_ntrec);
+                       ntrec = spclpt->c_ntrec;
+                       len = (ntrec - 1) * TP_BSIZE;
+                       zflag = 1;   
+               }
+               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 && i % TP_BSIZE != 0))
+                       errx(1,"Error reading dump file header");
+               tbufptr = tapebuf;
+               numtrec = ntrec;
+               Vprintf(stdout, "Input block size is %ld\n", ntrec);
+               return;
+       } /* if (!magtapein) */
+
+       /*
+        * If the input is a tape, we tried to read ntrec * TP_BSIZE bytes.
+        * If the value of ntrec is too large, we read less than
+        * what we asked for; adjust the value of ntrec and test for 
+        * a compressed dump tape.
+        */
+
+       if (i % TP_BSIZE != 0) {
+               /* may be old format compressed dump tape with a prefix */
+               spclpt = (struct s_spcl *) tpb->buf;
+               if (i % TP_BSIZE == PREFIXSIZE
+                   && tpb->compressed == 0
+                   && spclpt->c_type == TS_TAPE
+                   && spclpt->c_flags & DR_COMPRESSED) {
+                       zflag = 1;
+                       tbufptr = tpb->buf;
+                       if (tpb->length > bufsize)
+                               errx(1, "Tape blocksize is too large, use "
+                                       "\'-b %d\' ", tpb->length / TP_BSIZE);
+               }
+               else
+                       errx(1, "Tape block size (%ld) is not a multiple of dump block size (%d)",
+                               i, TP_BSIZE);
+       }
        ntrec = i / TP_BSIZE;
+       if (spclpt->c_type == TS_TAPE) {
+               if (spclpt->c_flags & DR_COMPRESSED)
+                       zflag = 1;
+               if (spclpt->c_ntrec > ntrec)
+                       errx(1, "Tape blocksize is too large, use "
+                               "\'-b %d\' ", spclpt->c_ntrec);
+       }
        numtrec = ntrec;
        Vprintf(stdout, "Tape block size is %ld\n", ntrec);
 }
 
+/*
+ * Read a block of data handling all of the messy details.
+ */
+static int read_a_block(int fd, char *buf, size_t len, long *lengthread)
+{
+       long i = 1, size;
+
+       size = len;
+       while (size > 0) {
+#ifdef RRESTORE
+               if (host)
+                       i = rmtread(buf, size);
+               else
+#endif
+                       i = read(fd, buf, size);                 
+
+               if (i <= 0)
+                       break; /* EOD or error */
+               size -= i;
+               if (magtapein)
+                       break; /* block at a time for mt */
+               buf += i;
+       }
+       *lengthread = len - size;
+       return i;
+}
+
 void
 closemt(void)
 {
@@ -1252,6 +1918,28 @@ closemt(void)
                (void) close(mt);
 }
 
+static void
+setmagtapein(void) {
+       struct mtget mt_stat;
+       static int done = 0;
+       if (done)
+               return;
+       done = 1;
+       if (!pipein) {
+               /* need to know if input is really from a tape */
+#ifdef RRESTORE
+               if (host)
+                       magtapein = rmtioctl(MTNOP, 1) != -1;
+               else
+#endif
+                       magtapein = ioctl(mt, MTIOCGET, (char *)&mt_stat) == 0;
+       }
+
+       Vprintf(stdout,"Input is from %s\n", 
+                       magtapein ? "tape" :
+                       Vflag ? "multi-volume (no tape)" : "file/pipe");
+}
+
 /*
  * Read the next block from the tape.
  * Check to see if it is one of several vintage headers.
@@ -1411,7 +2099,7 @@ good:
 static void
 accthdr(struct s_spcl *header)
 {
-       static ino_t previno = 0x7fffffff;
+       static dump_ino_t previno = 0x7fffffff;
        static int prevtype;
        static long predict;
        long blks, i;
@@ -1525,8 +2213,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;
 }
 
@@ -1672,9 +2363,80 @@ swabi(u_int x)
        return (x);
 }
 
+#if 0
 static u_long
 swabl(u_long x)
 {
        swabst((u_char *)"l", (u_char *)&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 */