]> git.wh0rd.org - dump.git/blobdiff - restore/tape.c
Fix restoring of files splitted on several volumes and starting on 2nd or later tapes.
[dump.git] / restore / tape.c
index 55519818bc61fc636029ee1c84a97c617aef7ac4..4710f889d1cdae269f1c3c586eb594cdc401c650 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 
+ *     Stelian Pop <stelian@popies.net>, 1999-2000
+ *     Stelian Pop <stelian@popies.net> - AlcĂ´ve <www.alcove.com>, 2000-2002
  */
 
 /*
  * 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.
  *
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.6 1999/10/13 09:57:21 stelian Exp $";
+       "$Id: tape.c,v 1.100 2010/12/06 14:26:51 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
+#include <compatlfs.h>
+#include <sys/types.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>
 #include <sys/stat.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 #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__ */
+#ifdef sunos
+#define quad_t int64_t
+#include <sys/time.h>
+#include <sys/fcntl.h>
+#include <bsdcompat.h>
+#else
 #include <ufs/ufs/dinode.h>
+#endif
 #endif /* __linux__ */
+#ifdef DUMP_MACOSX
+#include "darwin.h"
+#endif
 #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 */
+
+#ifdef HAVE_LZO
+#include <minilzo.h>
+#endif /* HAVE_LZO */
 
 #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 char    *magtape;
+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) || defined(HAVE_LZO)
+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 */
 static long    tapesread;
 static sigjmp_buf      restart;
 static int     gettingfile = 0;        /* restart has a valid frame */
-static char    *host = NULL;
+char           *host = NULL;
 
 static int     ofile;
 static char    *map;
@@ -109,10 +147,18 @@ 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));
+#ifdef DUMP_MACOSX
+static void     xtrfilefinderinfo __P((char *, size_t));
+#endif
+
 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));
@@ -123,15 +169,52 @@ 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     xtrxattr __P((char *, size_t));
+static void     setmagtapein __P((void));
+static int      extractattr __P((char *));
+static void     compareattr __P((char *));
+
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB) || defined(HAVE_LZO)
+static void    newcomprbuf __P((int));
+static void    (*readtape_func) __P((char *));
+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;
+static int readingmaps;                /* set to 1 while reading the maps */
+
+static char xattrbuf[XATTR_MAXSIZE];
+static int xattrlen;
+
+#ifdef DUMP_MACOSX
+static DumpFinderInfo  gFndrInfo;
+#endif
 
 /*
- * Set up an input source
+ * Set up an input source. This is called from main.c before setup() is.
  */
 void
 setinput(char *source)
 {
+       int i;
+       char *n;
+
        FLUSHTAPEBUF();
        if (bflag)
                newtapebuf(ntrec);
@@ -140,12 +223,18 @@ setinput(char *source)
        terminal = stdin;
 
 #ifdef RRESTORE
-       if (strchr(source, ':')) {
-               host = source;
-               source = strchr(host, ':');
-               *source++ = '\0';
-               if (rmthost(host) == 0)
-                       exit(1);
+       if ((n = strchr(source, ':'))) {
+               for (i = 0; i < (n - source); i++) {
+                       if (source[i] == '/')
+                               break;
+               }
+               if (source[i] != '/') {
+                       host = source;
+                       source = strchr(host, ':');
+                       *source++ = '\0';
+                       if (rmthost(host) == 0)
+                               exit(1);
+               }
        } else
 #endif
        if (strcmp(source, "-") == 0) {
@@ -163,9 +252,14 @@ setinput(char *source)
                pipein++;
        }
        setuid(getuid());       /* no longer need or want root privileges */
-       magtape = strdup(source);
-       if (magtape == NULL)
-               errx(1, "Cannot allocate space for magtape buffer");
+       if (Mflag) {
+               strncpy(magtapeprefix, source, MAXPATHLEN);
+               magtapeprefix[MAXPATHLEN-1] = '\0';
+               snprintf(magtape, MAXPATHLEN, "%s%03d", source, 1);
+       }
+       else
+               strncpy(magtape, source, MAXPATHLEN);
+       magtape[MAXPATHLEN - 1] = '\0';
 }
 
 void
@@ -174,16 +268,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) || defined(HAVE_LZO)
+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 || HAVE_LZO */
+
 /*
  * Verify that the tape drive can be accessed and
  * that it actually is a dump tape.
@@ -191,26 +302,53 @@ newtapebuf(long size)
 void
 setup(void)
 {
-       int i, j, *ip;
-       struct stat stbuf;
+       int i, j, *ip, bot_code;
+       struct STAT stbuf;
+       char *temptape;
 
        Vprintf(stdout, "Verify tape and initialize maps\n");
+       if (Afile == NULL && 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);
+               }
+       }
+
+       if (Afile)
+               temptape = Afile;
+       else
+               temptape = magtape;
+
 #ifdef RRESTORE
-       if (host)
-               mt = rmtopen(magtape, 0);
+       if (!Afile && host)
+               mt = rmtopen(temptape, O_RDONLY);
        else
 #endif
        if (pipein)
                mt = 0;
        else
-               mt = open(magtape, O_RDONLY, 0);
+               mt = OPEN(temptape, O_RDONLY, 0);
        if (mt < 0)
-               err(1, "%s", magtape);
-       volno = 1;
-       setdumpnum();
+               err(1, "%s", temptape);
+       if (!Afile) {
+               volno = 1;
+               setmagtapein();
+               setdumpnum();
+       }
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB) || defined(HAVE_LZO)
+       readtape_func = readtape_set;
+#if defined(HAVE_LZO)
+       if (lzo_init() != LZO_E_OK) {
+         msg("internal error - lzo_init failed \n");
+         exit(1);
+        }
+#endif
+#endif
        FLUSHTAPEBUF();
-       if (!pipein && !bflag)
-               findtapeblksize();
+       findtapeblksize();
+       cvtflag = 0;
        if (gethead(&spcl) == FAIL) {
                blkcnt--; /* push back this block */
                blksread--;
@@ -220,6 +358,13 @@ 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) && !defined(HAVE_LZO)
+               errx(1,"This restore version doesn't support decompression");
+#endif /* !HAVE_ZLIB && !HAVE_BZLIB */
+       }
        if (pipein) {
                endoftapemark.s_spcl.c_magic = cvtflag ? OFS_MAGIC : NFS_MAGIC;
                endoftapemark.s_spcl.c_type = TS_END;
@@ -233,12 +378,21 @@ setup(void)
        }
        if (vflag || command == 't' || command == 'C')
                printdumpinfo();
-       if (filesys == NULL) {
-               filesys = spcl.c_filesys;
+#ifdef USE_QFA
+       if (tapeposflag && (unsigned long)spcl.c_date != qfadumpdate)
+               errx(1, "different QFA/dumpdates detected\n");
+#endif
+       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;
@@ -252,25 +406,45 @@ 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", 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);
-       if (spcl.c_type != TS_BITS)
+       while (spcl.c_type == TS_ADDR) {
+               /* Recompute maxino and the map */
+               dump_ino_t oldmaxino = maxino;
+               maxino += (spcl.c_count * TP_BSIZE * NBBY) + 1;
+               resizemaps(oldmaxino, maxino);
+               map = usedinomap;
+
+               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) {
+               if (spcl.c_type == TS_END) {
+                       msg("Cannot find file dump list, assuming empty tape\n");
+                       exit(0);
+               }
                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);
+       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
@@ -278,6 +452,8 @@ setup(void)
         */
        if (oldinofmt == 0)
                SETINO(WINO, dumpmap);
+       readingmaps = 0;
+       findinode(&spcl);
 }
 
 /*
@@ -290,14 +466,17 @@ 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, bot_code = 1;
 
        if (nextvol == 1) {
                tapesread = 0;
                gettingfile = 0;
+               blksread = 0;
        }
        if (pipein) {
                if (nextvol != 1)
@@ -306,11 +485,16 @@ getvol(long nextvol)
                        return;
                goto gethdr;
        }
-       savecnt = blksread;
+       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 */
-       if (command == 'R' || command == 'r' || curfile.action != SKIP) {
+       if (aflag || curfile.action != SKIP) {
                newvol = nextvol;
                wantnext = 1;
        } else {
@@ -320,7 +504,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",
@@ -336,12 +520,17 @@ again:
                        fprintf(stderr, "\n");
                }
                do      {
-                       fprintf(stderr, "Specify next volume #: ");
+                       fprintf(stderr, "Specify next volume # (none if no more volumes): ");
                        (void) fflush(stderr);
-                       (void) fgets(buf, BUFSIZ, terminal);
+                       if (!fgets(buf, TP_BSIZE, terminal))
+                               break;
                } while (!feof(terminal) && buf[0] == '\n');
                if (feof(terminal))
                        exit(1);
+               if (!strcmp(buf, "none\n")) {
+                       terminateinput();
+                       return;
+               }
                newvol = atoi(buf);
                if (newvol <= 0) {
                        fprintf(stderr,
@@ -350,66 +539,132 @@ 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 /* USE_QFA */
                return;
        }
        closemt();
-       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);
-       if (feof(terminal))
-               exit(1);
-       if (!strcmp(buf, "none\n")) {
-               terminateinput();
-               return;
+
+       /* 
+        * 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';
+       }
+       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;
+               if (compare_errors)
+                       fprintf(stderr, "%d compare errors so far\n", compare_errors);
+#ifdef sunos
+               fprintf(stderr, "Mount volume %ld\n", (long)newvol);
+#else
+               fprintf(stderr, "Mount tape volume %ld\n", (long)newvol);
+#endif
+               fprintf(stderr, "Enter ``none'' if there are no more tapes\n");
+#ifdef sunos
+               fprintf(stderr, "then enter volume name (default: %s) ", magtape);
+#else
+               fprintf(stderr, "otherwise enter tape name (default: %s) ", magtape);
+#endif
+               (void) fflush(stderr);
+               if (fgets(buf, TP_BSIZE, terminal))
+                       exit(1);
+               if (feof(terminal))
+                       exit(1);
+               if (!strcmp(buf, "none\n")) {
+                       terminateinput();
+                       return;
+               }
+               if (buf[0] != '\n') {
+                       char *pos;
+                       (void) strncpy(magtape, buf, sizeof(magtape));
+                       magtape[sizeof(magtape) - 1] = '\0';
+                       if ((pos = strchr(magtape, '\n'))) 
+                               magtape[pos - magtape] = '\0';
+               }
        }
-       if (buf[0] != '\n') {
-               (void) strcpy(magtape, buf);
-               magtape[strlen(magtape) - 1] = '\0';
+#if defined(USE_QFA) && defined(sunos)
+       if (createtapeposflag || tapeposflag) {
+               if (OpenSMTCmt(magtape) < 0) {
+                       volno = -1;
+                       haderror = 1;
+                       goto again;
+               }
        }
+#endif /* USE_QFA */
 #ifdef RRESTORE
        if (host)
-               mt = rmtopen(magtape, 0);
+               mt = rmtopen(magtape, O_RDONLY);
        else
 #endif
-               mt = open(magtape, O_RDONLY, 0);
+               mt = OPEN(magtape, O_RDONLY, 0);
 
        if (mt == -1) {
                fprintf(stderr, "Cannot open %s\n", magtape);
                volno = -1;
+               haderror = 1;
                goto again;
        }
 gethdr:
+       setmagtapein();
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB) || defined(HAVE_LZO)
+       readtape_func = readtape_set;
+#endif
        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",
+#ifdef sunos
                        ctime(&tmpbuf.c_date));
-               fprintf(stderr, "\twanted: %s", ctime(&dumpdate));
+#else
+                       ctime4(&tmpbuf.c_date));
 #endif
+               fprintf(stderr, "\twanted: %s", ctime(&dumpdate));
                volno = 0;
+               haderror = 1;
+               blksread = saved_blksread;
+               tpblksread = saved_tpblksread;
                goto again;
        }
        tapesread |= 1 << volno;
-       blksread = savecnt;
        /*
         * If continuing from the previous volume, skip over any
         * blocks read already at the end of the previous volume.
@@ -417,11 +672,17 @@ gethdr:
         * If coming to this volume at random, skip to the beginning
         * of the next record.
         */
+       if (zflag) {
+               fprintf(stderr, "Dump tape is compressed.\n");
+#if !defined(HAVE_ZLIB) && !defined(HAVE_BZLIB) && !defined(HAVE_LZO)
+               errx(1,"This restore version doesn't support decompression");
+#endif /* !HAVE_ZLIB && !HAVE_BZLIB */
+       }
        Dprintf(stdout, "read %ld recs, tape starts with %ld\n",
-               tpblksread, (long)tmpbuf.c_firstrec);
+               tpblksread - 1, (long)tmpbuf.c_firstrec);
        if (tmpbuf.c_type == TS_TAPE && (tmpbuf.c_flags & DR_NEWHEADER)) {
                if (!wantnext) {
-                       tpblksread = tmpbuf.c_firstrec;
+                       tpblksread = tmpbuf.c_firstrec + 1;
                        for (i = tmpbuf.c_count; i > 0; i--)
                                readtape(buf);
                } else if (tmpbuf.c_firstrec > 0 &&
@@ -492,49 +753,85 @@ setdumpnum(void)
        tcom.mt_op = MTFSF;
        tcom.mt_count = dumpnum - 1;
 #ifdef RRESTORE
-       if (host)
-               rmtioctl(MTFSF, dumpnum - 1);
-       else
+       if (host) {
+               if (rmtioctl(MTFSF, dumpnum - 1) < 0) {
+                       fprintf(stderr, "rmtioctl MTFSF: %s\n", strerror(errno));
+            exit(1);
+               }
+       } else
 #endif
-               if (ioctl(mt, (int)MTIOCTOP, (char *)&tcom) < 0)
-                       warn("ioctl MTFSF");
+               if (ioctl(mt, (int)MTIOCTOP, (char *)&tcom) < 0) {
+                       fprintf(stderr, "rmtioctl MTFSF: %s\n", strerror(errno));
+                       exit(1);
+                       /* warn("ioctl MTFSF"); */
+               }
 }
 
 void
 printdumpinfo(void)
 {
-#ifdef __linux__
+#ifdef sunos
+       Vprintf(stdout, "Dump   date: %s", ctime(&spcl.c_date));
+       Vprintf(stdout, "Dumped from: %s",
+           (spcl.c_ddate == 0) ? "the epoch\n" : ctime(&spcl.c_ddate));
+       if (spcl.c_host[0] == '\0')
+               return;
+       Vprintf(stdout, "Level %d dump of %s on %s:%s\n",
+               spcl.c_level, spcl.c_filesys, spcl.c_host, spcl.c_dev);
+       Vprintf(stdout, "Label: %s\n", spcl.c_label);
+#else
        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);
+#endif
+}
+
+void 
+printvolinfo(void)
+{
+       int i;
+
+       if (volinfo[1] == ROOTINO) {
+               printf("Starting inode numbers by volume:\n");
+               for (i = 1; i < (int)TP_NINOS && volinfo[i] != 0; ++i)
+                       printf("\tVolume %d: %lu\n", i, (unsigned long)volinfo[i]);
+       }
 }
 
+
 int
-extractfile(char *name)
+extractfile(struct entry *ep, int doremove)
 {
        unsigned int flags;
        mode_t mode;
        struct timeval timep[2];
-       struct entry *ep;
+       char *name = myname(ep);
+
+       /* If removal is requested (-r mode) do remove it unless
+        * we are extracting a metadata only inode */
+       if (spcl.c_flags & DR_METAONLY) {
+               Vprintf(stdout, "file %s is metadata only\n", name);
+       }
+       else {
+               if (doremove) {
+                       removeleaf(ep);
+                       ep->e_flags &= ~REMOVED;
+               }
+       }
 
        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;
@@ -550,136 +847,487 @@ extractfile(char *name)
                return (FAIL);
 
        case IFSOCK:
-               Vprintf(stdout, "skipped socket %s\n", name);
+       {
+               uid_t luid = curfile.dip->di_uid;
+               gid_t lgid = curfile.dip->di_gid;
+
+               Vprintf(stdout, "extract socket %s\n", name);
                skipfile();
+               if (Nflag)
+                       return (GOOD);
+               if (! (spcl.c_flags & DR_METAONLY)) {
+                       int sk;
+                       struct sockaddr_un addr;
+
+                       if (uflag)
+                               (void)unlink(name);
+
+                       if ((sk = socket(AF_UNIX, SOCK_DGRAM, 0)) < 0) {
+                               warn("%s: cannot create socket", name);
+                               return (FAIL);
+                       }
+                       addr.sun_family = AF_UNIX;
+                       strcpy(addr.sun_path, name);
+                       if (bind(sk, (const struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) {
+                               warn("%s: cannot create socket", name);
+                               return (FAIL);
+                       }
+                       close(sk);
+               }
+               if (chown(name, luid, lgid) < 0)
+                       warn("%s: chown", name);
+               if (chmod(name, mode) < 0)
+                       warn("%s: chmod", name);
+               extractattr(name);
+               utimes(name, timep);
+               if (flags)
+#ifdef __linux__
+                       (void) lsetflags(name, flags);
+#else
+#ifdef sunos
+                       {
+                       warn("%s: cannot call chflags", name);
+                       /* (void) chflags(name, flags); */
+                       }
+#else
+                       (void) chflags(name, flags);
+#endif
+#endif
                return (GOOD);
+       }
 
        case IFDIR:
+       {
+               int ret;
                if (mflag) {
-                       ep = lookupname(name);
                        if (ep == NULL || ep->e_flags & EXTRACT)
                                panic("unextracted directory %s\n", name);
                        skipfile();
                        return (GOOD);
                }
-               Vprintf(stdout, "extract file %s\n", name);
-               return (genliteraldir(name, curfile.ino));
+               Vprintf(stdout, "extract dir %s\n", name);
+               ret = genliteraldir(name, curfile.ino);
+               extractattr(name);
+               return ret;
+       }
 
        case IFLNK:
-       {       uid_t luid = curfile.dip->di_uid;
+       {
+#ifdef HAVE_LCHOWN
+               uid_t luid = curfile.dip->di_uid;
                gid_t lgid = curfile.dip->di_gid;
-
-               lnkbuf[0] = '\0';
-               pathlen = 0;
-               getfile(xtrlnkfile, xtrlnkskip);
-               if (pathlen == 0) {
-                       Vprintf(stdout,
-                           "%s: zero length symbolic link (ignored)\n", name);
-                       return (GOOD);
+#endif
+               if (! (spcl.c_flags & DR_METAONLY)) {
+                       lnkbuf[0] = '\0';
+                       pathlen = 0;
+                       getfile(xtrlnkfile, xtrlnkskip);
+                       if (pathlen == 0) {
+                               Vprintf(stdout,
+                                   "%s: zero length symbolic link (ignored)\n", name);
+                               return (GOOD);
+                       }
+                       if (linkit(lnkbuf, name, SYMLINK) == FAIL)
+                               return (FAIL);
                }
-               if (linkit(lnkbuf, name, SYMLINK) == FAIL)
-                       return (FAIL);
-               (void) chown(name, luid, lgid);
+               else
+                       skipfile();
+
+#ifdef HAVE_LCHOWN
+               if (lchown(name, luid, lgid) < 0)
+                       warn("%s: lchown", name);
+#endif
+               extractattr(name);
                return (GOOD);
        }
 
        case IFIFO:
+       {
+               uid_t luid = curfile.dip->di_uid;
+               gid_t lgid = curfile.dip->di_gid;
+
                Vprintf(stdout, "extract fifo %s\n", name);
-               if (Nflag) {
-                       skipfile();
+               skipfile();
+               if (Nflag)
                        return (GOOD);
+               if (! (spcl.c_flags & DR_METAONLY)) {
+                       if (uflag && !Nflag)
+                               (void)unlink(name);
+                       if (mkfifo(name, mode) < 0) {
+                               warn("%s: cannot create fifo", name);
+                               return (FAIL);
+                       }
                }
-               if (uflag && !Nflag)
-                       (void)unlink(name);
-               if (mkfifo(name, mode) < 0) {
-                       warn("%s: cannot create fifo", name);
-                       skipfile();
-                       return (FAIL);
-               }
-               (void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
-               (void) chmod(name, mode);
+               if (chown(name, luid, lgid) < 0)
+                       warn("%s: chown", name);
+               if (chmod(name, mode) < 0)
+                       warn("%s: chmod", name);
+               extractattr(name);
+               utimes(name, timep);
                if (flags)
 #ifdef  __linux__
-                       (void) fsetflags(name, flags);
+                       (void) lsetflags(name, flags);
+#else
+#ifdef sunos
+                       {
+                       warn("%s: cannot call chflags", name);
+                       /* (void) chflags(name, flags); */
+                       }
 #else
                        (void) chflags(name, flags);
 #endif
-               skipfile();
-               utimes(name, timep);
+#endif
                return (GOOD);
-
+       }
        case IFCHR:
        case IFBLK:
+       {
+               uid_t luid = curfile.dip->di_uid;
+               gid_t lgid = curfile.dip->di_gid;
+               int lrdev = (int)curfile.dip->di_rdev;
+
                Vprintf(stdout, "extract special file %s\n", name);
-               if (Nflag) {
-                       skipfile();
+               skipfile();
+               if (Nflag)
                        return (GOOD);
+               if (! (spcl.c_flags & DR_METAONLY)) {
+                       if (uflag)
+                               (void)unlink(name);
+                       if (mknod(name, mode, lrdev) < 0) {
+                               warn("%s: cannot create special file", name);
+                               return (FAIL);
+                       }
                }
-               if (uflag)
-                       (void)unlink(name);
-               if (mknod(name, mode, (int)curfile.dip->di_rdev) < 0) {
-                       warn("%s: cannot create special file", name);
-                       skipfile();
-                       return (FAIL);
-               }
-               (void) chown(name, curfile.dip->di_uid, curfile.dip->di_gid);
-               (void) chmod(name, mode);
+               if (chown(name, luid, lgid) < 0)
+                       warn("%s: chown", name);
+               if (chmod(name, mode) < 0)
+                       warn("%s: chmod", name);
+               extractattr(name);
+               utimes(name, timep);
                if (flags)
 #ifdef __linux__
                        {
-                       warn("%s: fsetflags called on a special file", name);
-                       (void) fsetflags(name, flags);
+                       warn("%s: lsetflags called on a special file", name);
+                       (void) lsetflags(name, flags);
+                       }
+#else
+#ifdef sunos
+                       {
+                       warn("%s: cannot call chflags on a special file", name);
+                       /* (void) chflags(name, flags); */
                        }
 #else
+                       {
+                       warn("%s: chflags called on a special file", name);
                        (void) chflags(name, flags);
+                       }
+#endif
 #endif
-               skipfile();
-               utimes(name, timep);
                return (GOOD);
-
+       }
        case IFREG:
+       {
+               uid_t luid = curfile.dip->di_uid;
+               gid_t lgid = curfile.dip->di_gid;
+
                Vprintf(stdout, "extract file %s\n", name);
                if (Nflag) {
                        skipfile();
                        return (GOOD);
                }
-               if (uflag)
-                       (void)unlink(name);
-               if ((ofile = open(name, O_WRONLY | O_CREAT | O_TRUNC,
-                   0666)) < 0) {
-                       warn("%s: cannot create file", name);
-                       skipfile();
-                       return (FAIL);
+               if (! (spcl.c_flags & DR_METAONLY)) {
+                       if (uflag)
+                               (void)unlink(name);
+                       if ((ofile = OPEN(name, O_WRONLY | O_CREAT | O_TRUNC,
+                           0666)) < 0) {
+                               warn("%s: cannot create file", name);
+                               skipfile();
+                               return (FAIL);
+                       }
+                       getfile(xtrfile, xtrskip);
+                       (void) close(ofile);
                }
-               (void) fchown(ofile, curfile.dip->di_uid, curfile.dip->di_gid);
-               (void) fchmod(ofile, mode);
+               else
+                       skipfile();
+               if (chown(name, luid, lgid) < 0)
+                       warn("%s: chown", name);
+               if (chmod(name, mode) < 0)
+                       warn("%s: chmod", name);
+               extractattr(name);
+               utimes(name, timep);
                if (flags)
 #ifdef __linux__
-                       (void) setflags(ofile, flags);
+                       (void) lsetflags(name, flags);
+#else
+#ifdef sunos
+                       {
+                       warn("%s: cannot call chflags", name);
+                       /* (void) chflags(name, flags); */
+                       }
 #else
-                       (void) fchflags(ofile, flags);
+                       (void) chflags(name, flags);
+#endif
 #endif
-               getfile(xtrfile, xtrskip);
-               (void) close(ofile);
-               utimes(name, timep);
                return (GOOD);
        }
+       }
        /* NOTREACHED */
 }
 
-/*
- * skip over bit maps on the tape
- */
-void
-skipmaps(void)
+static int
+extractattr(char *path)
 {
-
-       while (spcl.c_type == TS_BITS || spcl.c_type == TS_CLRI)
-               skipfile();
+       while (spcl.c_flags & DR_EXTATTRIBUTES) {
+               switch (spcl.c_extattributes) {
+               case EXT_MACOSFNDRINFO:
+#ifdef DUMP_MACOSX
+                       (void)extractfinderinfoufs(path);
+#else
+                       msg("MacOSX not supported in this version, skipping\n");
+                       skipfile();
+#endif
+                       break;
+               case EXT_MACOSRESFORK:
+#ifdef DUMP_MACOSX
+                       (void)extractresourceufs(path);
+#else
+                       msg("MacOSX not supported in this version, skipping\n");
+                       skipfile();
+#endif
+                       break;
+               case EXT_XATTR: {
+                       char xattr[XATTR_MAXSIZE];
+                       
+                       if (readxattr(xattr) == GOOD) {
+                               xattr_extract(path, xattr);
+                               break;
+                       }
+               }
+               default:
+                       msg("unexpected inode extension %ld, skipping\n", spcl.c_extattributes);
+                       skipfile();
+                       break;
+               }
+       }
+       return GOOD;
 }
 
-/*
- * skip over a file on the tape
+#ifdef DUMP_MACOSX
+int
+extractfinderinfoufs(char *name)
+{
+       int err;
+       char                    oFileRsrc[MAXPATHLEN];
+       int flags;
+       mode_t mode;
+       struct timeval timep[2];
+       u_int32_t       uid;
+       u_int32_t       gid;
+       char    path[MAXPATHLEN], fname[MAXPATHLEN];
+
+       curfile.name = name;
+       curfile.action = USING;
+       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;
+       mode = curfile.dip->di_mode;
+       flags = curfile.dip->di_flags;
+        uid = curfile.dip->di_uid;
+        gid =  curfile.dip->di_gid;
+
+       switch (mode & IFMT) {
+
+       default:
+               fprintf(stderr, "%s: (extr. finfoufs) unknown file mode 0%o\n", name, mode);
+               skipfile();
+               return (FAIL);
+
+       case IFDIR:
+               fprintf(stderr, "%s: (extr. finfoufs[IFDIR]) unknown file mode 0%o\n", name, mode);
+               skipfile();
+               return (FAIL);
+
+       case IFLNK:
+               skipfile();
+               return (GOOD);
+
+       case IFREG:
+               Vprintf(stdout, "extract finderinfo file %s\n", name);
+               if (Nflag) {
+                       skipfile();
+                       return (GOOD);
+               }
+               getfile(xtrfilefinderinfo, xtrskip);
+
+               GetPathFile(name, path, fname);
+               strcpy(oFileRsrc, path);
+               strcat(oFileRsrc, "._");
+               strcat(oFileRsrc, fname);
+
+               if ((err = CreateAppleDoubleFileRes(oFileRsrc, &gFndrInfo.fndrinfo,
+                               mode, flags, timep, uid, gid)) != 0) {
+                       fprintf(stderr, "%s: cannot create finderinfo: %s\n",
+                       name, strerror(errno));
+                       skipfile();
+                       return (FAIL);
+               }
+               return (GOOD);
+       }
+       /* NOTREACHED */
+}
+
+
+int
+extractresourceufs(char *name)
+{
+       char                    oFileRsrc[MAXPATHLEN];
+       int flags;
+       mode_t mode;
+       struct timeval timep[2];
+       char    path[MAXPATHLEN], fname[MAXPATHLEN];
+       ASDHeaderPtr    hp;
+       ASDEntryPtr     ep;
+       u_long  loff;
+        u_int32_t      uid;
+       u_int32_t       gid;
+       u_int64_t       di_size;
+       char            *p;
+       char            buf[1024];
+
+       curfile.name = name;
+       curfile.action = USING;
+       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;
+       mode = curfile.dip->di_mode;
+       flags = curfile.dip->di_flags;
+       uid = curfile.dip->di_uid;
+       gid =  curfile.dip->di_gid;
+       di_size = curfile.dip->di_size;
+
+       switch (mode & IFMT) {
+
+       default:
+               fprintf(stderr, "%s: (extr. resufs) unknown file mode 0%o\n", name, mode);
+               skipfile();
+               return (FAIL);
+
+       case IFDIR:
+               fprintf(stderr, "%s: (extr. resufs [IFDIR]) unknown file mode 0%o\n", name, mode);
+               skipfile();
+               return (FAIL);
+
+       case IFLNK:
+               skipfile();
+               return (GOOD);
+
+       case IFREG:
+               Vprintf(stdout, "extract resource file %s\n", name);
+               if (Nflag) {
+                       skipfile();
+                       return (GOOD);
+               }
+
+               GetPathFile(name, path, fname);
+               strcpy(oFileRsrc, path);
+               strcat(oFileRsrc, "._");
+               strcat(oFileRsrc, fname);
+
+               if ((ofile = open(oFileRsrc, O_RDONLY, 0)) < 0) {
+                       fprintf(stderr, "%s: cannot read finderinfo: %s\n",
+                           name, strerror(errno));
+                       skipfile();
+                       return (FAIL);
+               }
+               read(ofile, buf, 70);
+               (void) close(ofile);
+               p = buf;
+               hp = (ASDHeaderPtr)p;
+               /* the header */
+               hp->entries++;
+               p += sizeof(ASDHeader) - CORRECT;
+               ep = (ASDEntryPtr)p;
+               /* the finderinfo entry */
+               ep->offset += sizeof(ASDEntry);
+               loff = ep->offset;
+
+               p += sizeof(ASDEntry);
+               /* the finderinfo data */
+               bcopy(p, p + sizeof(ASDEntry), INFOLEN);
+               ep = (ASDEntryPtr)p;
+               /* the new resourcefork entry */
+               ep->entryID = EntryRSRCFork;
+               ep->offset = loff + INFOLEN;
+               ep->len = di_size;
+               /* write the new appledouble entries to the file */
+               if ((ofile = open(oFileRsrc, O_WRONLY | O_CREAT | O_TRUNC, 0666)) < 0) {
+                       fprintf(stderr, "%s: cannot create resource file: %s\n",
+                           name, strerror(errno));
+                       skipfile();
+                       return (FAIL);
+               }
+               write(ofile, buf, 70 + sizeof(ASDEntry));
+               /* and add the resource data from tape */
+               getfile(xtrfile, xtrskip);
+
+               if (fchown(ofile, uid, gid) < 0)
+                       warn("%s: fchown", name);
+               if (fchmod(ofile, mode) < 0)
+                       warn("%s: fchmod", name);
+               (void) close(ofile);
+               utimes(oFileRsrc, timep);
+               (void) lsetflags(oFileRsrc, flags);
+               return (GOOD);
+       }
+       /* NOTREACHED */
+}
+#endif /* DUMP_MACOSX */
+
+int
+readxattr(char *buffer)
+{
+       if (dflag)
+               msg("reading EA data for inode %lu\n", curfile.ino);
+
+       curfile.name = "EA block";
+       if (curfile.dip->di_size > XATTR_MAXSIZE) {
+               fprintf(stderr, "EA size too big (%ld)", (long)curfile.dip->di_size);
+               skipfile();
+               return (FAIL);
+       }
+
+       memset(xattrbuf, 0, XATTR_MAXSIZE);
+       xattrlen = 0;
+
+       /*
+        * ugly hack: cope with invalid spcl.c_addr[] records written by
+        * old versions of dump.
+        */
+       readmapflag = 1;
+
+       getfile(xtrxattr, xtrnull);
+
+       readmapflag = 0;
+
+       memcpy(buffer, xattrbuf, XATTR_MAXSIZE);
+
+       return (GOOD);
+}
+
+/*
+ * skip over bit maps on the tape
+ */
+void
+skipmaps(void)
+{
+
+       while (spcl.c_type == TS_BITS || spcl.c_type == TS_CLRI)
+               skipfile();
+}
+
+/*
+ * skip over a file on the tape
  */
 void
 skipfile(void)
@@ -689,6 +1337,17 @@ skipfile(void)
        getfile(xtrnull, xtrnull);
 }
 
+/*
+ * skip over any extended attributes.
+ */
+void
+skipxattr(void)
+{
+
+       while (spcl.c_flags & DR_EXTATTRIBUTES)
+               skipfile();
+}
+
 /*
  * Extract a file from the tape.
  * When an allocated block is found it is passed to the fill function;
@@ -698,7 +1357,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;
@@ -742,7 +1401,11 @@ loop:
                        break;
                }
        }
-       if (gethead(&spcl) == GOOD && size > 0) {
+       while (gethead(&spcl) != GOOD) {
+               fprintf(stderr, "Incorrect block for %s at %ld blocks\n",
+                       curfile.name, (long)blksread);
+       }
+       if (size > 0) {
                if (spcl.c_type == TS_ADDR)
                        goto loop;
                Dprintf(stdout,
@@ -750,13 +1413,24 @@ 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) {
+               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);
+               if (FTRUNCATE(ofile, origsize) < 0)
+                       warn("%s: ftruncate", curfile.name);
        }
-       findinode(&spcl);
+       if (!readingmaps) 
+               findinode(&spcl);
        gettingfile = 0;
 }
 
@@ -774,15 +1448,23 @@ xtrfile(char *buf, size_t size)
                        (unsigned long)curfile.ino, curfile.name);
 }
 
+#ifdef DUMP_MACOSX
+static void
+xtrfilefinderinfo(char *buf, size_t size)
+{
+       bcopy(buf, &gFndrInfo, size);
+}
+#endif /* DUMP_MACOSX */
+
 /*
  * Skip over a hole in a file.
  */
 /* ARGSUSED */
 static void
-xtrskip(char *buf, size_t size)
+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);
 }
@@ -795,10 +1477,13 @@ xtrlnkfile(char *buf, size_t size)
 {
 
        pathlen += size;
-       if (pathlen > MAXPATHLEN)
+       if (pathlen > MAXPATHLEN) {
+               buf[size - 1] = '\0';
                errx(1, "symbolic link name: %s->%s%s; too long %d",
                    curfile.name, lnkbuf, buf, pathlen);
+       }
        (void) strcat(lnkbuf, buf);
+       lnkbuf[pathlen] = '\0';
 }
 
 /*
@@ -806,7 +1491,7 @@ xtrlnkfile(char *buf, size_t size)
  */
 /* ARGSUSED */
 static void
-xtrlnkskip(char *buf, size_t size)
+xtrlnkskip(UNUSED(char *buf), UNUSED(size_t size))
 {
 
        errx(1, "unallocated block in symbolic link %s", curfile.name);
@@ -828,7 +1513,7 @@ xtrmap(char *buf, size_t size)
  */
 /* ARGSUSED */
 static void
-xtrmapskip(char *buf, size_t size)
+xtrmapskip(UNUSED(char *buf), size_t size)
 {
 
        panic("hole in map\n");
@@ -840,14 +1525,82 @@ xtrmapskip(char *buf, size_t size)
  */
 /* ARGSUSED */
 void
-xtrnull(char *buf, size_t size)
+xtrnull(UNUSED(char *buf), UNUSED(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) != (ssize_t)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(UNUSED(char *buf), size_t size)
+{
+       static char cmpbuf[MAXBSIZE];
+       int i;
+
+       if (cmperror)
+               return;
+       
+       if (read(ifile, cmpbuf, size) != (ssize_t)size) {
+               fprintf(stderr, "%s: size has changed.\n", 
+                       curfile.name);
+               cmperror = 1;
+               return;
+       }
+
+       for (i = 0; i < (int)size; ++i)
+               if (cmpbuf[i] != '\0') {
+                       fprintf(stderr, "%s: tape and disk copies are different\n",
+                               curfile.name);
+                       cmperror = 1;
+                       return;
+               }
+}
+#endif /* COMPARE_ONTHEFLY */
+
+static void
+xtrxattr(char *buf, size_t size)
+{
+       if (xattrlen + size > XATTR_MAXSIZE) {
+               fprintf(stderr, "EA size too big (%ld)", (long)xattrlen + size);
+               return;
+       }
+       memcpy(xattrbuf + xattrlen, buf, size);
+       xattrlen += size;
+}
+
+#if !COMPARE_ONTHEFLY
 static int
-do_cmpfiles(int fd_tape, int fd_disk, long size)
+do_cmpfiles(int fd_tape, int fd_disk, OFF_T size)
 {
        static char buf_tape[BUFSIZ];
        static char buf_disk[BUFSIZ];
@@ -883,20 +1636,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) {
-               panic("Can't lstat tmp file %s: %s\n", tapefile,
+       if (STAT(tapefile, &sbuf_tape) != 0) {
+               panic("can't lstat tmp file %s: %s\n", tapefile,
                      strerror(errno));
+               do_compare_error;
        }
 
        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);
+                       "%s: size changed from %lld to %lld.\n",
+                       diskfile, (long long)sbuf_tape.st_size, (long long)sbuf_disk->st_size);
+               do_compare_error;
 #ifdef COMPARE_FAIL_KEEP_FILE
                return (0);
 #else
@@ -904,12 +1659,14 @@ cmpfiles(char *tapefile, char *diskfile, struct stat *sbuf_disk)
 #endif
        }
 
-       if ((fd_tape = open(tapefile, O_RDONLY)) < 0) {
-               panic("Can't open %s: %s\n", tapefile, strerror(errno));
+       if ((fd_tape = OPEN(tapefile, O_RDONLY)) < 0) {
+               panic("can't open %s: %s\n", tapefile, strerror(errno));
+               do_compare_error;
        }
-       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));
+               panic("can't open %s: %s\n", diskfile, strerror(errno));
+               do_compare_error;
        }
 
        if (do_cmpfiles(fd_tape, fd_disk, sbuf_tape.st_size)) {
@@ -917,6 +1674,7 @@ cmpfiles(char *tapefile, char *diskfile, struct stat *sbuf_disk)
                        diskfile);
                close(fd_tape);
                close(fd_disk);
+               do_compare_error;
 #ifdef COMPARE_FAIL_KEEP_FILE
                /* rename the file to live in /tmp */
                /* rename `tapefile' to /tmp/<basename of diskfile> */
@@ -950,33 +1708,119 @@ cmpfiles(char *tapefile, char *diskfile, struct stat *sbuf_disk)
        return (1);
 #endif
 }
+#endif /* !COMPARE_ONTHEFLY */
+
+static void
+compareattr(char *name)
+{
+       int xattr_done = 0;
+       
+       while (spcl.c_flags & DR_EXTATTRIBUTES) {
+               switch (spcl.c_extattributes) {
+               case EXT_MACOSFNDRINFO:
+                       msg("MacOSX not supported for comparision in this version, skipping\n");
+                       skipfile();
+                       break;
+               case EXT_MACOSRESFORK:
+                       msg("MacOSX not supported for comparision in this version, skipping\n");
+                       skipfile();
+                       break;
+               case EXT_XATTR: {
+                       char xattr[XATTR_MAXSIZE];
 
+                       if (readxattr(xattr) == GOOD) {
+                               if (xattr_compare(name, xattr) == FAIL)
+                                       do_compare_error;
+                               xattr_done = 1;
+                       }
+                       else
+                               do_compare_error;
+                       break;
+               }
+               default:
+                       msg("unexpected inode extension %ld, skipping\n", spcl.c_extattributes);
+                       skipfile();
+                       break;
+               }
+       }
+       if (!xattr_done && xattr_compare(name, NULL) == FAIL)
+               do_compare_error;
+}
+
+#if !COMPARE_ONTHEFLY
 static char tmpfilename[MAXPATHLEN];
+#endif
 
 void
 comparefile(char *name)
 {
-       static char *tmpfile = NULL;
-       int mode;
-       struct stat sb, stemp;
+       mode_t mode;
+       uid_t uid;
+       uid_t gid;
+       unsigned int flags;
+       unsigned long newflags;
+       struct STAT sb;
        int r;
+#if !COMPARE_ONTHEFLY
+       static char *tmpfile = NULL;
+       struct STAT stemp;
+#endif
+       curfile.name = name;
+       curfile.action = USING;
+       mode = curfile.dip->di_mode;
+       flags = curfile.dip->di_flags;
+       uid = curfile.dip->di_uid;
+       gid =  curfile.dip->di_gid;
 
-       if ((r = lstat(name, &sb)) != 0) {
-               warn("%s: does not exist (%d)", name, r);
+       if ((mode & IFMT) == IFSOCK) {
+               Vprintf(stdout, "skipped socket %s\n", name);
                skipfile();
                return;
        }
 
-       curfile.name = name;
-       curfile.action = USING;
-       mode = curfile.dip->di_mode;
+       if ((r = LSTAT(name, &sb)) != 0) {
+               warn("unable to stat %s", name);
+               do_compare_error;
+               skipfile();
+               return;
+       }
 
-       Vprintf(stdout, "comparing %s (size: %ld, mode: 0%o)\n", name,
-               (long)sb.st_size, mode);
+       Vprintf(stdout, "comparing %s (size: %lld, mode: 0%o)\n", name,
+               (long long)sb.st_size, mode);
 
        if (sb.st_mode != mode) {
                fprintf(stderr, "%s: mode changed from 0%o to 0%o.\n",
                        name, mode & 07777, sb.st_mode & 07777);
+               do_compare_error;
+       }
+       if (sb.st_uid != uid) {
+               fprintf(stderr, "%s: uid changed from %d to %d.\n",
+                       name, uid, sb.st_uid);
+               do_compare_error;
+       }
+       if (sb.st_gid != gid) {
+               fprintf(stderr, "%s: gid changed from %d to %d.\n",
+                       name, gid, sb.st_gid);
+               do_compare_error;
+       }
+#ifdef  __linux__
+       if (lgetflags(name, &newflags) < 0) {
+               if (flags != 0) {
+                       warn("%s: lgetflags failed", name);
+                       do_compare_error;
+               }
+       }
+       else {
+               if (newflags != flags) {
+                       fprintf(stderr, "%s: flags changed from 0x%08x to 0x%08lx.\n",
+                               name, flags, newflags);
+                       do_compare_error;
+               }
+       }
+#endif
+       if (spcl.c_flags & DR_METAONLY) {
+               skipfile();
+               return;
        }
        switch (mode & IFMT) {
        default:
@@ -989,6 +1833,7 @@ comparefile(char *name)
 
        case IFDIR:
                skipfile();
+               compareattr(name);
                return;
 
        case IFLNK: {
@@ -998,6 +1843,7 @@ comparefile(char *name)
                if (!(sb.st_mode & S_IFLNK)) {
                        fprintf(stderr, "%s: is no longer a symbolic link\n",
                                name);
+                       do_compare_error;
                        return;
                }
                lnkbuf[0] = '\0';
@@ -1007,19 +1853,23 @@ comparefile(char *name)
                        fprintf(stderr,
                                "%s: zero length symbolic link (ignored)\n",
                                name);
+                       do_compare_error;
                        return;
                }
                if ((lsize = readlink(name, lbuf, MAXPATHLEN)) < 0) {
-                       panic("readlink of %s failed: %s", name,
+                       panic("readlink of %s failed: %s\n", name,
                              strerror(errno));
+                       do_compare_error;
                }
                lbuf[lsize] = 0;
                if (strcmp(lbuf, lnkbuf) != 0) {
                        fprintf(stderr,
                                "%s: symbolic link changed from %s to %s.\n",
                                name, lnkbuf, lbuf);
+                       do_compare_error;
                        return;
                }
+               compareattr(name);
                return;
        }
 
@@ -1028,33 +1878,58 @@ comparefile(char *name)
                if (!(sb.st_mode & (S_IFCHR|S_IFBLK))) {
                        fprintf(stderr, "%s: no longer a special file\n",
                                name);
+                       do_compare_error;
                        skipfile();
                        return;
                }
 
-               if (sb.st_rdev != (int)curfile.dip->di_rdev) {
+               if (sb.st_rdev != (dev_t)curfile.dip->di_rdev) {
                        fprintf(stderr,
                                "%s: device changed from %d,%d to %d,%d.\n",
                                name,
-                               ((int)curfile.dip->di_rdev >> 8) & 0xff,
-                               (int)curfile.dip->di_rdev & 0xff,
-                               ((int)sb.st_rdev >> 8) & 0xff,
-                               (int)sb.st_rdev & 0xff);
+                               major(curfile.dip->di_rdev),
+                               minor(curfile.dip->di_rdev),
+                               major(sb.st_rdev),
+                               minor(sb.st_rdev));
+                       do_compare_error;
                }
                skipfile();
+               compareattr(name);
                return;
 
        case IFREG:
+#if COMPARE_ONTHEFLY
+               if ((ifile = OPEN(name, O_RDONLY)) < 0) {
+                       warn("can't open %s", name);
+                       skipfile();
+                       do_compare_error;
+               }
+               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)
+                               do_compare_error;
+                       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));
                }
@@ -1067,40 +1942,88 @@ comparefile(char *name)
                cmpfiles(tmpfile, name, &sb);
                unlink(tmpfile);
 #endif
+#endif /* COMPARE_ONTHEFLY */
+               compareattr(name);
                return;
        }
        /* NOTREACHED */
 }
 
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB) || defined(HAVE_LZO)
+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 || HAVE_LZO */
+
+/*
+ * 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) || defined(HAVE_LZO)
+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)
                numtrec = ntrec;
        cnt = ntrec * TP_BSIZE;
        rd = 0;
+#ifdef USE_QFA
+       if (createtapeposflag)
+               (void)GetTapePos(&curtapepos);
+#endif
 getmore:
 #ifdef RRESTORE
-       if (host)
+       if (!Afile && host)
                i = rmtread(&tapebuf[rd], cnt);
        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.
@@ -1157,14 +2080,18 @@ 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)
-                       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.
@@ -1186,36 +2113,494 @@ 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) || defined(HAVE_LZO)
+
+/*
+ * 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);
+       converttapebuf(tpb);
+
+       if (Vflag && (ret == 0 || rl < (int)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;
+
+       converttapebuf(tpb);
+       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;
+       char *output = NULL,*reason = NULL, *lengtherr = NULL;              
+       
+       /* build a length error message */
+       blocklen = tpbin->length;
+       if (readsize < blocklen + (int)PREFIXSIZE)
+               lengtherr = "short";
+       else
+               if (readsize > blocklen + (int)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
+                       unsigned int 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 */
+               }
+               if (tpbin->flags == COMPRESS_LZO) {
+#ifndef HAVE_LZO
+                       errx(1,"This restore version doesn't support lzo decompression");
+#else
+                       lzo_uint worklen2 = worklen;
+                       cresult = lzo1x_decompress(tpbin->buf, blocklen,
+                                                   comprbuf, &worklen2, NULL);
+                       worklen = worklen2;
+                       output = comprbuf;
+                       switch (cresult) {
+                               case LZO_E_OK:
+                                       break;
+                                case LZO_E_ERROR:
+                                case LZO_E_EOF_NOT_FOUND:
+                                       reason = "data error";
+                                       break;
+                               default:
+                                       reason = "unknown";
+                       }
+                       if (cresult == LZO_E_OK)
+                               cresult = 1;
+                       else
+                               cresult = 0;
+#endif /* HAVE_LZO */
+               }
+       }
+       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: %lu\n",
+                               lengtherr, readsize, (unsigned long)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 || HAVE_LZO */
+
+/*
+ * 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;
+
+       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");
+
+       memcpy(&spclpt, tapebuf, TP_BSIZE);
+       cvtflag = 0;
+       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
+        * 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 != (long)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 (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 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) {
+oldformat:
+               /* may be old format compressed dump tape with a prefix */
+               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) {
+                       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 (!Afile && 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)
 {
@@ -1223,13 +2608,36 @@ closemt(void)
        if (mt < 0)
                return;
 #ifdef RRESTORE
-       if (host)
+       if (!Afile && host)
                rmtclose();
        else
 #endif
                (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 = !lflag;
+               else
+#endif
+                       magtapein = ioctl(mt, MTIOCGET, (char *)&mt_stat) == 0;
+       }
+
+       Vprintf(stdout,"Input is from a %s %s\n",
+                       host ? "remote" : "local",
+                       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.
@@ -1238,6 +2646,13 @@ closemt(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 {
@@ -1268,12 +2683,11 @@ gethead(struct s_spcl *buf)
                                int32_t odi_ctime;
                        } c_dinode;
                        int32_t c_count;
-                       char    c_addr[256];
+                       char    c_fill[256];
                } s_ospcl;
        } u_ospcl;
 
        if (!cvtflag) {
-               readtape((char *)buf);
                if (buf->c_magic != NFS_MAGIC) {
                        if (swabi(buf->c_magic) != NFS_MAGIC)
                                return (FAIL);
@@ -1285,38 +2699,51 @@ gethead(struct s_spcl *buf)
                if (checksum((int *)buf) == FAIL)
                        return (FAIL);
                if (Bcvt)
-                       swabst((u_char *)"8i4s31i528bi192b2i", (u_char *)buf);
+                       swabst((u_char *)"8i4s1l29i528bi192b4i", (u_char *)buf);
                goto good;
        }
-       readtape((char *)(&u_ospcl.s_ospcl));
-       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;
-       buf->c_ddate = u_ospcl.s_ospcl.c_ddate;
-       buf->c_volume = u_ospcl.s_ospcl.c_volume;
-       buf->c_tapea = u_ospcl.s_ospcl.c_tapea;
-       buf->c_inumber = u_ospcl.s_ospcl.c_inumber;
-       buf->c_checksum = u_ospcl.s_ospcl.c_checksum;
-       buf->c_magic = u_ospcl.s_ospcl.c_magic;
-       buf->c_dinode.di_mode = u_ospcl.s_ospcl.c_dinode.odi_mode;
-       buf->c_dinode.di_nlink = u_ospcl.s_ospcl.c_dinode.odi_nlink;
-       buf->c_dinode.di_uid = u_ospcl.s_ospcl.c_dinode.odi_uid;
-       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__
-       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__ */
-       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__ */
-       buf->c_count = u_ospcl.s_ospcl.c_count;
-       memmove(buf->c_addr, u_ospcl.s_ospcl.c_addr, (long)256);
-       if (u_ospcl.s_ospcl.c_magic != OFS_MAGIC ||
-           checksum((int *)(&u_ospcl.s_ospcl)) == FAIL)
+       memcpy(&u_ospcl.s_ospcl, buf, TP_BSIZE);
+       if (checksum((int *)(&u_ospcl.s_ospcl)) == FAIL)
+               return(FAIL);
+       if (u_ospcl.s_ospcl.c_magic == OFS_MAGIC) {
+               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;
+               buf->c_ddate = u_ospcl.s_ospcl.c_ddate;
+               buf->c_volume = u_ospcl.s_ospcl.c_volume;
+               buf->c_tapea = u_ospcl.s_ospcl.c_tapea;
+               buf->c_inumber = u_ospcl.s_ospcl.c_inumber;
+               buf->c_checksum = u_ospcl.s_ospcl.c_checksum;
+               buf->c_magic = u_ospcl.s_ospcl.c_magic;
+               buf->c_dinode.di_mode = u_ospcl.s_ospcl.c_dinode.odi_mode;
+               buf->c_dinode.di_nlink = u_ospcl.s_ospcl.c_dinode.odi_nlink;
+               buf->c_dinode.di_uid = u_ospcl.s_ospcl.c_dinode.odi_uid;
+               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;
+#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__ || 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__ || sunos */
+               buf->c_count = u_ospcl.s_ospcl.c_count;
+               memmove(buf->c_addr, u_ospcl.s_ospcl.c_fill, (long)256);
+       }
+       else if (u_ospcl.s_ospcl.c_magic == FS_UFS2_MAGIC) {
+               buf->c_date = (int32_t)(*(int64_t *)&u_ospcl.dummy[896]);
+               buf->c_ddate = (int32_t)(*(int64_t *)&u_ospcl.dummy[904]);
+               buf->c_tapea = (int32_t)(*(int64_t *)&u_ospcl.dummy[912]);
+               buf->c_firstrec = (int32_t)(*(int64_t *)&u_ospcl.dummy[920]);
+               buf->c_ntrec = 0;
+               buf->c_extattributes = 0;
+               buf->c_flags |= DR_NEWINODEFMT;
+               ufs2flag = 1;
+       }
+       else
                return(FAIL);
        buf->c_magic = NFS_MAGIC;
 
@@ -1325,7 +2752,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;
                }
        }
@@ -1360,6 +2787,11 @@ good:
                /* fall through */
        case TS_END:
                buf->c_inumber = 0;
+               if (buf->c_flags & DR_INODEINFO) {
+                       memcpy(volinfo, buf->c_inos, TP_NINOS * sizeof(dump_ino_t));
+                       if (Bcvt)
+                               swabst((u_char *)"128i", (u_char *)volinfo);
+               }
                break;
 
        case TS_INODE:
@@ -1383,13 +2815,30 @@ 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
  */
 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;
@@ -1417,7 +2866,7 @@ accthdr(struct s_spcl *header)
                fprintf(stderr, "File header, ino %lu", (unsigned long)previno);
                break;
        case TS_ADDR:
-               fprintf(stderr, "File continuation header, ino %ld", previno);
+               fprintf(stderr, "File continuation header, ino %ld", (long)previno);
                break;
        case TS_END:
                fprintf(stderr, "End of tape header");
@@ -1503,15 +2952,18 @@ 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;
 }
 
 static int
 checksum(int *buf)
 {
-       register int i, j;
+       int i, j;
 
        j = sizeof(union u_spcl) / sizeof(int);
        i = 0;
@@ -1650,9 +3102,271 @@ 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
+
+void
+RequestVol(long tnum)
+{
+       FLUSHTAPEBUF();
+       getvol(tnum);
+}
+
+#ifdef USE_QFA
+#ifdef sunos
+extern int fdsmtc;
+
+struct uscsi_cmd {
+        int     uscsi_flags;            /* read, write, etc. see below */
+        short   uscsi_status;           /* resulting status  */
+        short   uscsi_timeout;          /* Command Timeout */
+        caddr_t uscsi_cdb;              /* cdb to send to target */
+        caddr_t uscsi_bufaddr;          /* i/o source/destination */
+        u_int   uscsi_buflen;           /* size of i/o to take place */
+        u_int   uscsi_resid;            /* resid from i/o operation */
+        u_char  uscsi_cdblen;           /* # of valid cdb bytes */
+        u_char  uscsi_rqlen;            /* size of uscsi_rqbuf */
+        u_char  uscsi_rqstatus;         /* status of request sense cmd */
+        u_char  uscsi_rqresid;          /* resid of request sense cmd */
+        caddr_t uscsi_rqbuf;            /* request sense buffer */
+        void   *uscsi_reserved_5;       /* Reserved for Future Use */
+};
+
+#define CDB_GROUP0      6       /*  6-byte cdb's */
+#define CDB_GROUP1      10      /* 10-byte cdb's */
+#define CDB_GROUP2      10      /* 10-byte cdb's */
+#define CDB_GROUP3      0       /* reserved */
+#define CDB_GROUP4      16      /* 16-byte cdb's */
+#define CDB_GROUP5      12      /* 12-byte cdb's */
+#define CDB_GROUP6      0       /* reserved */
+#define CDB_GROUP7      0       /* reserved */
+
+#define USCSI_WRITE     0x00000 /* send data to device */
+#define USCSI_SILENT    0x00001 /* no error messages */
+#define USCSI_DIAGNOSE  0x00002 /* fail if any error occurs */
+#define USCSI_ISOLATE   0x00004 /* isolate from normal commands */
+#define USCSI_READ      0x00008 /* get data from device */
+#define USCSI_RESET     0x04000 /* Reset target */
+#define USCSI_RESET_ALL 0x08000 /* Reset all targets */
+#define USCSI_RQENABLE  0x10000 /* Enable Request Sense extensions */
+
+#define USCSIIOC        (0x04 << 8)
+#define USCSICMD        (USCSIIOC|201)  /* user scsi command */
+
+#define USCSI_TIMEOUT  30
+#define USCSI_SHORT_TIMEOUT    900
+#define USCSI_LONG_TIMEOUT     14000
+
+#define B(s,i) ((unsigned char)((s) >> i))
+#define B1(s)                           ((unsigned char)(s))
+
+#define MSB4(s,v) *(s)=B(v,24),(s)[1]=B(v,16), (s)[2]=B(v,8), (s)[3]=B1(v)
+
+
+int
+GetTapePos(long long *pos)
+{
+       int                                     err = 0;
+       struct uscsi_cmd        scmd;
+       char                            buf[512];
+       char                            parm[512 * 8];
+       long                            lpos;
+
+       (void)memset((void *)buf, 0, sizeof(buf));
+       (void)memset((void *)&scmd, 0, sizeof(scmd));
+       scmd.uscsi_flags = USCSI_READ|USCSI_SILENT;
+       scmd.uscsi_timeout = USCSI_TIMEOUT;
+       scmd.uscsi_cdb = buf;
+       scmd.uscsi_cdblen = CDB_GROUP1;
+       buf[0] = 0x34;  /* read position */
+       buf[1] = 0;
+       (void)memset((void *)parm, 0, 512);
+       scmd.uscsi_bufaddr = parm;
+       scmd.uscsi_buflen = 56;
+       if (ioctl(fdsmtc, USCSICMD, &scmd) == -1) {
+               err = errno;
+               return err;
+       }
+       (void)memcpy(&lpos, &parm[4], sizeof(long));
+       *pos = lpos;
+       return err;
+}
+
+int
+GotoTapePos(long long pos)
+{
+       int                                     err = 0;
+       struct uscsi_cmd        scmd;
+       char                            buf[512];
+       char                            parm[512 * 8];
+       long                            lpos = (long)pos;
+
+       (void)memset((void *)buf, 0, sizeof(buf));
+       (void)memset((void *)&scmd, 0, sizeof(scmd));
+       scmd.uscsi_flags = USCSI_WRITE|USCSI_SILENT;
+       scmd.uscsi_timeout = 360;       /* 5 Minutes */
+       scmd.uscsi_cdb = buf;
+       scmd.uscsi_cdblen = CDB_GROUP1;
+       buf[0] = 0x2b;  /* locate */
+       buf[1] = 0;
+       MSB4(&buf[3], lpos);
+       (void)memset((void *)parm, 0, 512);
+       scmd.uscsi_bufaddr = NULL;
+       scmd.uscsi_buflen = 0;
+       if (ioctl(fdsmtc, USCSICMD, &scmd) == -1) {
+               err = errno;
+               return err;
+       }
+       return err;
+}
+#endif
+
+#define LSEEK_GET_TAPEPOS      10
+#define LSEEK_GO2_TAPEPOS      11
+
+#ifdef __linux__
+typedef struct mt_pos {
+       short    mt_op;
+       int      mt_count;
+} MTPosRec, *MTPosPtr;
+
+
+/*
+ * get the current position of the tape
+ */
+int
+GetTapePos(long long *pos)
+{
+       int err = 0;
+
+#ifdef RDUMP
+       if (host) {
+               *pos = (long long) rmtseek((OFF_T)0, (int)LSEEK_GET_TAPEPOS);
+               err = *pos < 0;
+       }
+       else
+#endif
+       {
+       if (magtapein) {
+               long mtpos;
+               *pos = 0;
+               err = (ioctl(mt, MTIOCPOS, &mtpos) < 0);
+               *pos = (long long)mtpos;
+       }
+       else {
+               *pos = LSEEK(mt, 0, SEEK_CUR);
+               err = (*pos < 0);
+       }
+       }
+       if (err) {
+               err = errno;
+               fprintf(stdout, "[%ld] error: %d (getting tapepos: %lld)\n", 
+                       (unsigned long)getpid(), err, *pos);
+               return err;
+       }
+       return err;
+}
+
+/*
+ * go to specified position on tape
+ */
+int
+GotoTapePos(long long pos)
+{
+       int err = 0;
+
+#ifdef RDUMP
+       if (host)
+               err = (rmtseek((OFF_T)pos, (int)LSEEK_GO2_TAPEPOS) < 0);
+       else
+#endif
+       {
+       if (magtapein) {
+               struct mt_pos buf;
+               buf.mt_op = MTSEEK;
+               buf.mt_count = (int) pos;
+               err = (ioctl(mt, MTIOCTOP, &buf) < 0);
+       }
+       else {
+               pos = LSEEK(mt, pos, SEEK_SET);
+               err = (pos < 0);
+       }
+       }
+       if (err) {
+               err = errno;
+               fprintf(stdout, "[%ld] error: %d (setting tapepos: %lld)\n", 
+                       (unsigned long)getpid(), err, pos);
+               return err;
+       }
+       return err;
+}
+#endif /* __linux__ */
+
+/*
+ * 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
+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));
+
+       tpblksread = spcl.c_tapea + spcl.c_volume;
+#ifdef DEBUG_QFA
+       fprintf(stderr, "DEBUG: %ld reads\n", cntloop);
+       fprintf(stderr, "DEBUG: bufsize %ld\n", bufsize);
+       fprintf(stderr, "DEBUG: ntrec %ld\n", ntrec);
+       fprintf(stderr, "DEBUG: tapea %d\n", spcl.c_tapea);
+       fprintf(stderr, "DEBUG: tpblksread %ld\n", tpblksread);
+#endif
+       findinode(&spcl);
+       noresyncmesg = 0;
+}
+
+#ifdef sunos
+int
+OpenSMTCmt(char *themagtape)
+{
+       if (GetSCSIIDFromPath(themagtape, &scsiid)) {
+               fprintf(stderr, "can't get SCSI-ID for %s\n", themagtape);
+               return -1;
+       }
+       if (scsiid < 0) {
+               fprintf(stderr, "can't get SCSI-ID for %s\n", themagtape);
+               return -1;
+       }
+       sprintf(smtcpath, "/dev/rsmtc%ld,0", scsiid);
+       if ((fdsmtc = open(smtcpath, O_RDWR)) == -1) {
+               fprintf(stderr, "can't open smtc device: %s, %d\n", smtcpath, errno);
+               return -1;
+       }
+       return 0;
+}
+#endif /* sunos */
+#endif /* USE_QFA */