]> git.wh0rd.org - dump.git/blobdiff - dump/tape.c
atomic_read -> dump_atomic_read
[dump.git] / dump / tape.c
index 69715003e67bf772103bfad8d0b5d996a64c03ec..0dffa3a7cba384772f087967cf0356e4236412a8 100644 (file)
@@ -2,7 +2,8 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *     Stelian Pop <pop@cybercable.fr>, 1999-2000
+ *     Stelian Pop <stelian@popies.net>, 1999-2000
+ *     Stelian Pop <stelian@popies.net> - AlcĂ´ve <www.alcove.com>, 2000-2002
  */
 
 /*-
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.19 2000/05/28 16:24:14 stelian Exp $";
+       "$Id: tape.c,v 1.67 2002/04/11 14:51:09 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
+#include <compatlfs.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <setjmp.h>
+#include <signal.h>
+#include <stdio.h>
+#include <compaterr.h>
+#include <system.h>
+#ifdef __STDC__
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#else
+int    write(), read();
+#endif
+
 #ifdef __linux__
 #include <sys/types.h>
-#include <linux/types.h>
+#include <sys/time.h>
+#include <time.h>
 #endif
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/wait.h>
+#include <sys/mtio.h>
 #ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
+#include <ext2fs/ext2fs.h>
+#include <sys/stat.h>
 #include <bsdcompat.h>
-#else  /* __linux__ */
-#ifdef sunos
+#elif defined sunos
 #include <sys/vnode.h>
 
 #include <ufs/fs.h>
@@ -63,28 +87,17 @@ static const char rcsid[] =
 #else
 #include <ufs/ufs/dinode.h>
 #include <ufs/ffs/fs.h>
-#endif
 #endif /* __linux__ */
 
 #include <protocols/dumprestore.h>
 
-#include <errno.h>
-#include <fcntl.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <stdio.h>
-#include <compaterr.h>
-#ifdef __STDC__
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#else
-int    write(), read();
-#endif
+#ifdef HAVE_ZLIB
+#include <zlib.h>
+#endif /* HAVE_ZLIB */
 
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
+#ifdef HAVE_BZLIB
+#include <bzlib.h>
+#endif /* HAVE_BZLIB */
 
 #include "dump.h"
 
@@ -95,19 +108,23 @@ extern     long blocksperfile;     /* number of blocks per output file */
 long   blocksthisvol;          /* number of blocks on current output file */
 extern int ntrec;              /* blocking factor on tape */
 extern int cartridge;
-extern char *host;
 char   *nexttape;
 extern  pid_t rshpid;
 int    eot_code = 1;
+long long tapea_bytes = 0;     /* bytes_written at start of current volume */
+static int magtapeout;         /* output is really a tape */
 
-static ssize_t atomic_read __P((int, void *, size_t));
-static ssize_t atomic_write __P((int, const void *, size_t));
-static void doslave __P((int, int));
+static ssize_t dump_atomic_read __P((int, void *, size_t));
+static ssize_t dump_atomic_write __P((int, const void *, size_t));
+static void doslave __P((int, int, int));
 static void enslave __P((void));
 static void flushtape __P((void));
 static void killall __P((void));
 static void rollforward __P((void));
-static int system_command __P((const char *, const char *, int));
+#ifdef USE_QFA
+static int GetTapePos __P((long long *));
+static void MkTapeString __P((struct s_spcl *, long long));
+#endif
 
 /*
  * Concurrent dump mods (Caltech) - disk block reading and tape writing
@@ -123,6 +140,11 @@ struct req {
 };
 int reqsiz;
 
+struct slave_results {
+       ssize_t unclen;         /* uncompressed length */
+       ssize_t clen;           /* compressed length */
+};
+
 #define SLAVES 3               /* 1 slave writing, 1 reading, 1 for slack */
 struct slave {
        int tapea;              /* header number at start of this chunk */
@@ -144,12 +166,15 @@ static time_t tstart_volume;      /* time of volume start */
 static int tapea_volume;       /* value of spcl.c_tapea at volume start */
 
 int master;            /* pid of master, for sending error signals */
-int tenths;            /* length of tape used per block written */
+int tenths;            /* length of tape overhead per block written */
 static int caught;     /* have we caught the signal to proceed? */
 static int ready;      /* have we reached the lock point without having */
                        /* received the SIGUSR2 signal from the prev slave? */
 static sigjmp_buf jmpbuf;      /* where to jump to if we are ready when the */
                        /* SIGUSR2 arrives from the previous slave */
+#ifdef USE_QFA
+static int gtperr = 0;
+#endif
 
 int
 alloctape(void)
@@ -167,8 +192,11 @@ alloctape(void)
         * variable, 0.30" to 0.45".  The gap is maximal when the tape stops.
         */
        if (blocksperfile == 0 && !unlimited)
-               tenths = writesize / density +
-                   (cartridge ? 16 : density == 625 ? 5 : 8);
+               tenths = (cartridge ? 16 : density == 625 ? 5 : 8);
+       else {
+               tenths = 0;
+               density = 1;
+       }
        /*
         * Allocate tape buffer contiguous with the array of instruction
         * packets, so flushtape() can write them together with one write().
@@ -203,6 +231,30 @@ writerec(const void *dp, int isspcl)
        slp->req[trecno].count = 1;
        /* XXX post increment triggers an egcs-1.1.2-12 bug on alpha/sparc */
        *(union u_spcl *)(*(nextblock)) = *(union u_spcl *)dp;
+
+       /* Need to write it to the archive file */
+       if (Afile < 0 && isspcl && (spcl.c_type == TS_END))
+               Afile = -Afile;
+       if (Afile > 0) {
+               /* When we dump an inode which is not a directory,
+                * it means we ended the archive contents */
+               if (isspcl && (spcl.c_type == TS_INODE) &&
+                   ((spcl.c_dinode.di_mode & S_IFMT) != IFDIR))
+                       Afile = -Afile;
+               else {
+                       union u_spcl tmp;
+                       tmp = *(union u_spcl *)dp;
+                       /* Write the record, _uncompressed_ */
+                       if (isspcl) {
+                               tmp.s_spcl.c_flags &= ~DR_COMPRESSED;
+                               mkchecksum(&tmp);
+                       }
+                       if (write(Afile, &tmp, TP_BSIZE) != TP_BSIZE)
+                               msg("error writing archive file: %s\n", 
+                               strerror(errno));
+               }
+       }
+
        nextblock++;
        if (isspcl)
                lastspclrec = spcl.c_tapea;
@@ -234,24 +286,28 @@ dumpblock(daddr_t blkno, int size)
 int    nogripe = 0;
 
 static void
-tperror(int signo)
+tperror(int errnum)
 {
 
        if (pipeout) {
-               msg("write error on %s\n", tape);
+               msg("write error on %s: %s\n", tape, strerror(errnum));
                quit("Cannot recover\n");
                /* NOTREACHED */
        }
-       msg("write error %d blocks into volume %d\n", blocksthisvol, tapeno);
+       msg("write error %d blocks into volume %d: %s\n", 
+           blocksthisvol, tapeno, strerror(errnum));
        broadcast("DUMP WRITE ERROR!\n");
-       if (!query("Do you want to restart?"))
-               dumpabort(0);
-       msg("Closing this volume.  Prepare to restart with new media;\n");
-       msg("this dump volume will be rewritten.\n");
-       killall();
-       nogripe = 1;
-       close_rewind();
-       Exit(X_REWRITE);
+       if (query("Do you want to rewrite this volume?")) {
+               msg("Closing this volume.  Prepare to restart with new media;\n");
+               msg("this dump volume will be rewritten.\n");
+               killall();
+               nogripe = 1;
+               close_rewind();
+               Exit(X_REWRITE);
+       }
+       if (query("Do you want to start the next tape?"))
+               return;
+       dumpabort(0);
 }
 
 static void
@@ -271,59 +327,74 @@ do_stats(void)
        time_t tnow, ttaken;
        int blocks;
 
-#ifdef __linux__
-       (void)time4(&tnow);
-#else
-       (void)time(&tnow);
-#endif
+       tnow = time(NULL);
        ttaken = tnow - tstart_volume;
        blocks = spcl.c_tapea - tapea_volume;
-       msg("Volume %d completed at: %s", tapeno, 
-#ifdef __linux__
-                                         ctime4(&tnow));
-#else
-                                         ctime(&tnow));
-#endif
+       msg("Volume %d completed at: %s", tapeno, ctime(&tnow));
+       if (! compressed)
+               msg("Volume %d %ld tape blocks (%.2fMB)\n", tapeno, 
+                       blocks, ((double)blocks * TP_BSIZE / 1048576));
        if (ttaken > 0) {
+               long volkb = (bytes_written - tapea_bytes) / 1024;
+               long txfrate = volkb / ttaken;
                msg("Volume %d took %d:%02d:%02d\n", tapeno,
                        ttaken / 3600, (ttaken % 3600) / 60, ttaken % 60);
-               msg("Volume %d transfer rate: %ld KB/s\n", tapeno,
-                       blocks / ttaken);
-               xferrate += blocks / ttaken;
+               msg("Volume %d transfer rate: %ld kB/s\n", tapeno,
+                       txfrate);
+               xferrate += txfrate;
+               if (compressed) {
+                       double rate = .0005 + (double) blocks / (double) volkb;
+                       msg("Volume %d %ldkB uncompressed, %ldkB compressed,"
+                               " %1.3f:1\n",
+                               tapeno, blocks, volkb, rate);
+               }
        }
        return(tnow);
 }
 
+char *
+mktimeest(time_t tnow)
+{
+       static char msgbuf[128];
+       time_t deltat;
+
+       msgbuf[0] = '\0';
+
+       if (blockswritten < 500)
+               return NULL;
+       if (blockswritten > tapesize)
+               tapesize = blockswritten;
+       deltat = tstart_writing - tnow + (1.0 * (tnow - tstart_writing))
+               / blockswritten * tapesize;
+       if (tnow > tstart_volume)
+               (void)snprintf(msgbuf, sizeof(msgbuf),
+                       "%3.2f%% done at %ld kB/s, finished in %d:%02d\n",
+                       (blockswritten * 100.0) / tapesize,
+                       (spcl.c_tapea - tapea_volume) / (tnow - tstart_volume),
+                       (int)(deltat / 3600), (int)((deltat % 3600) / 60));
+       else
+               (void)snprintf(msgbuf, sizeof(msgbuf),
+                       "%3.2f%% done, finished in %d:%02d\n",
+                       (blockswritten * 100.0) / tapesize,
+                       (int)(deltat / 3600), (int)((deltat % 3600) / 60));
+
+       return msgbuf;
+}
+
 #if defined(SIGINFO)
 /*
  * statussig --
  *     information message upon receipt of SIGINFO
- *     (derived from optr.c::timeest())
  */
 void
 statussig(int notused)
 {
-       time_t  tnow, deltat;
-       char    msgbuf[128];
        int save_errno = errno;
+       char *buf;
 
-       if (blockswritten < 500)
-               return;
-#ifdef __linux__
-       (void) time4(&tnow);
-#else
-       (void) time((time_t *) &tnow);
-#endif
-       if (blockswritten > tapesize)
-               tapesize = blockswritten;
-       deltat = tstart_writing - tnow + (1.0 * (tnow - tstart_writing))
-               / blockswritten * tapesize;
-       (void)snprintf(msgbuf, sizeof(msgbuf),
-               "%3.2f%% done at %ld KB/s, finished in %d:%02d\n",
-               (blockswritten * 100.0) / tapesize,
-               (spcl.c_tapea - tapea_volume) / (tnow - tstart_volume),
-               (int)(deltat / 3600), (int)((deltat % 3600) / 60));
-       write(STDERR_FILENO, msgbuf, strlen(msgbuf));
+       buf = mktimeest(time(NULL));
+       if (buf)
+               write(STDERR_FILENO, buf, strlen(buf));
        errno = save_errno;
 }
 #endif
@@ -333,12 +404,13 @@ flushtape(void)
 {
        int i, blks, got;
        long lastfirstrec;
+       struct slave_results returned;
 
        int siz = (char *)nextblock - (char *)slp->req;
 
        slp->req[trecno].count = 0;                     /* Sentinel */
 
-       if (atomic_write( slp->fd, (char *)slp->req, siz) != siz)
+       if (dump_atomic_write( slp->fd, (char *)slp->req, siz) != siz)
                quit("error writing command pipe: %s\n", strerror(errno));
        slp->sent = 1; /* we sent a request, read the response later */
 
@@ -349,16 +421,24 @@ flushtape(void)
 
        /* Read results back from next slave */
        if (slp->sent) {
-               if (atomic_read( slp->fd, (char *)&got, sizeof got)
-                   != sizeof got) {
+               if (dump_atomic_read( slp->fd, (char *)&returned, sizeof returned)
+                   != sizeof returned) {
                        perror("  DUMP: error reading command pipe in master");
                        dumpabort(0);
                }
+               got = returned.unclen;
+               bytes_written += returned.clen;
+               if (returned.unclen == returned.clen)
+                       uncomprblks++;
                slp->sent = 0;
 
-               /* Check for end of tape */
-               if (got < writesize) {
-                       msg("End of tape detected\n");
+               /* Check for errors or end of tape */
+               if (got <= 0) {
+                       /* Check for errors */
+                       if (got < 0)
+                               tperror(-got);
+                       else
+                               msg("End of tape detected\n");
 
                        /*
                         * Drain the results, don't care what the values were.
@@ -366,9 +446,9 @@ flushtape(void)
                         */
                        for (i = 0; i < SLAVES; i++) {
                                if (slaves[i].sent) {
-                                       if (atomic_read( slaves[i].fd,
-                                           (char *)&got, sizeof got)
-                                           != sizeof got) {
+                                       if (dump_atomic_read( slaves[i].fd,
+                                           (char *)&returned, sizeof returned)
+                                           != sizeof returned) {
                                                perror("  DUMP: error reading command pipe in master");
                                                dumpabort(0);
                                        }
@@ -394,53 +474,23 @@ flushtape(void)
        slp->inode = curino;
        nextblock = slp->tblock;
        trecno = 0;
-       asize += tenths;
+       asize += tenths + returned.clen / density;
        blockswritten += ntrec;
        blocksthisvol += ntrec;
-       if (!pipeout && !unlimited && (blocksperfile ?
-           (blocksthisvol >= blocksperfile) : (asize > tsize))) {
-               close_rewind();
-               startnewtape(0);
-       }
-       timeest();
-}
-
-/*
- * Executes the command in a shell.
- * Returns -1 if an error occured, the exit status of
- * the command on success.
- */
-int system_command(const char *command, const char *device, int volnum) {
-       int pid, status;
-       char commandstr[4096];
-
-       pid = fork();
-       if (pid == -1) {
-               perror("  DUMP: unable to fork");
-               return -1;
-       }
-       if (pid == 0) {
-               setuid(getuid());
-               setgid(getgid());
-               snprintf(commandstr, sizeof(commandstr), "%s %s %d", command, device, volnum);
-               commandstr[sizeof(commandstr) - 1] = '\0';
-               execl("/bin/sh", "sh", "-c", commandstr, NULL);
-               perror("  DUMP: unable to execute shell");
-               exit(-1);
-       }
-       do {
-               if (waitpid(pid, &status, 0) == -1) {
-                       if (errno != EINTR) {
-                               perror("  DUMP: waitpid error");
-                               return -1;
+       if (!pipeout && !unlimited) {
+               if (blocksperfile) {
+                       if ( compressed ? (bytes_written - tapea_bytes + SLAVES * (writesize + sizeof(struct tapebuf))) >= blocksperfile * 1024
+                                       : blocksthisvol >= blocksperfile ) {
+                               close_rewind();
+                               startnewtape(0);
                        }
-               } else {
-                       if (WIFEXITED(status))
-                               return WEXITSTATUS(status);
-                       else
-                               return -1;
                }
-       } while(1);
+               else if (asize > tsize) {
+                       close_rewind();
+                       startnewtape(0);
+               }
+       }
+       timeest();
 }
 
 time_t
@@ -448,6 +498,7 @@ trewind(void)
 {
        int f;
        int got;
+       struct slave_results returned;
 
        for (f = 0; f < SLAVES; f++) {
                /*
@@ -459,13 +510,21 @@ trewind(void)
                 * fixme: punt for now.
                 */
                if (slaves[f].sent) {
-                       if (atomic_read( slaves[f].fd, (char *)&got, sizeof got)
-                           != sizeof got) {
+                       if (dump_atomic_read( slaves[f].fd, (char *)&returned, sizeof returned)
+                           != sizeof returned) {
                                perror("  DUMP: error reading command pipe in master");
                                dumpabort(0);
                        }
+                       got = returned.unclen;
+                       bytes_written += returned.clen;
+                       if (returned.unclen == returned.clen)
+                               uncomprblks++;
                        slaves[f].sent = 0;
-                       if (got != writesize) {
+
+                       if (got < 0)
+                               tperror(-got);
+
+                       if (got == 0) {
                                msg("EOT detected in last 2 tape records!\n");
                                msg("Use a longer tape, decrease the size estimate\n");
                                quit("or use no size estimate at all.\n");
@@ -491,9 +550,11 @@ trewind(void)
 #endif
                {
                        (void) close(tapefd);
-                       while ((f = open(tape, 0)) < 0)
-                               sleep (10);
-                       (void) close(f);
+                       if (!fifoout) {
+                               while ((f = OPEN(tape, 0)) < 0)
+                                       sleep (10);
+                               (void) close(f);
+                       }
                }
                eot_code = 1;
                if (eot_script && spcl.c_type != TS_END) {
@@ -529,10 +590,11 @@ close_rewind(void)
 void
 rollforward(void)
 {
-       register struct req *p, *q, *prev;
-       register struct slave *tslp;
+       struct req *p, *q = NULL, *prev;
+       struct slave *tslp;
        int i, size, savedtapea, got;
        union u_spcl *ntb, *otb;
+       struct slave_results returned;
 #ifdef __linux__
        int blks;
        long lastfirstrec;
@@ -583,7 +645,7 @@ rollforward(void)
                        lastspclrec = savedtapea - 1;
                }
                size = (char *)ntb - (char *)q;
-               if (atomic_write( slp->fd, (char *)q, size) != size) {
+               if (dump_atomic_write( slp->fd, (char *)q, size) != size) {
                        perror("  DUMP: error writing command pipe");
                        dumpabort(0);
                }
@@ -631,14 +693,21 @@ rollforward(void)
         * worked ok, otherwise the tape is much too short!
         */
        if (slp->sent) {
-               if (atomic_read( slp->fd, (char *)&got, sizeof got)
-                   != sizeof got) {
+               if (dump_atomic_read( slp->fd, (char *)&returned, sizeof returned)
+                   != sizeof returned) {
                        perror("  DUMP: error reading command pipe in master");
                        dumpabort(0);
                }
+               got = returned.unclen;
+               bytes_written += returned.clen;
+               if (returned.clen == returned.unclen)
+                       uncomprblks++;
                slp->sent = 0;
 
-               if (got != writesize) {
+               if (got < 0)
+                       tperror(-got);
+
+               if (got == 0) {
                        quit("EOT detected at start of the tape!\n");
                }
        }
@@ -654,7 +723,7 @@ rollforward(void)
        slp->firstrec = lastfirstrec + ntrec;
        slp->count = lastspclrec + blks + 1 - spcl.c_tapea;
        slp->inode = curino;
-       asize += tenths;
+       asize += tenths + returned.clen / density;
        blockswritten += ntrec;
        blocksthisvol += ntrec;
 #endif
@@ -694,11 +763,8 @@ startnewtape(int top)
 
        parentpid = getpid();
        tapea_volume = spcl.c_tapea;
-#ifdef __linux__
-       (void)time4(&tstart_volume);
-#else
-       (void)time((&tstart_volume);
-#endif
+       tapea_bytes = bytes_written;
+       tstart_volume = time(NULL);
 
 restore_check_point:
 #ifdef __linux__
@@ -800,16 +866,28 @@ restore_check_point:
 #ifdef RDUMP
                while ((tapefd = (host ? rmtopen(tape, 2) : pipeout ? 
                        fileno(stdout) : 
-                       open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
+                       OPEN(tape, O_WRONLY|O_CREAT, 0666))) < 0)
 #else
                while ((tapefd = (pipeout ? fileno(stdout) :
-                                 open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
+                                 OPEN(tape, O_RDWR|O_CREAT, 0666))) < 0)
 #endif
                    {
-                       msg("Cannot open output \"%s\".\n", tape);
+                       msg("Cannot open output \"%s\": %s\n", tape, 
+                           strerror(errno));
                        if (!query("Do you want to retry the open?"))
                                dumpabort(0);
                }
+#ifdef RDUMP
+               if (!host)
+#endif
+                       {
+                               struct mtget mt_stat;
+                               magtapeout = ioctl(tapefd, MTIOCGET, (char *)&mt_stat) == 0;
+                               /*
+                               msg("Output is to %s\n", 
+                                       magtapeout ? "tape" : "file/pipe");
+                               */
+                       }
 
                enslave();  /* Share open tape file descriptor with slaves */
 
@@ -826,17 +904,18 @@ restore_check_point:
                spcl.c_volume++;
                spcl.c_type = TS_TAPE;
                spcl.c_flags |= DR_NEWHEADER;
-               writeheader((ino_t)slp->inode);
+               spcl.c_ntrec = ntrec;
+               if (compressed)
+                       spcl.c_flags |= DR_COMPRESSED;
+               writeheader((dump_ino_t)slp->inode);
                spcl.c_flags &=~ DR_NEWHEADER;
-               msg("Volume %d started at: %s", tapeno, 
-#ifdef __linux__
-                                               ctime4(&tstart_volume));
-#else
-                                               ctime(&tstart_volume));
-#endif
+               msg("Volume %d started with block %ld at: %s", tapeno, 
+                   spcl.c_tapea, ctime(&tstart_volume));
                if (tapeno > 1)
                        msg("Volume %d begins with blocks from inode %d\n",
                                tapeno, slp->inode);
+               if (tapeno < TP_NINOS)
+                       volinfo[tapeno] = slp->inode;
        }
 }
 
@@ -873,9 +952,9 @@ Exit(int status)
 static void
 proceed(int signo)
 {
-       caught++;
        if (ready)
                siglongjmp(jmpbuf, 1);
+       caught++;
 }
 
 void
@@ -885,18 +964,18 @@ enslave(void)
 #ifdef LINUX_FORK_BUG
        int i, j;
 #else
-       register int i, j;
+       int i, j;
 #endif
 
        master = getpid();
 
     {  struct sigaction sa;
+       memset(&sa, 0, sizeof sa);
+       sigemptyset(&sa.sa_mask);
        sa.sa_handler = dumpabort;
        sigaction(SIGTERM, &sa, NULL); /* Slave sends SIGTERM on dumpabort() */
        sa.sa_handler = sigpipe;
        sigaction(SIGPIPE, &sa, NULL);
-       sa.sa_handler = tperror;
-       sigaction(SIGUSR1, &sa, NULL); /* Slave sends SIGUSR1 on tape errors */
        sa.sa_handler = proceed;
        sa.sa_flags = SA_RESTART;
        sigaction(SIGUSR2, &sa, NULL); /* Slave sends SIGUSR2 to next slave */
@@ -928,13 +1007,15 @@ enslave(void)
                        sigprocmask(SIG_BLOCK, &sigs, NULL);
 
 #ifdef LINUX_FORK_BUG
-                       if (atomic_write( cmd[0], (char *) &i, sizeof i)
+                       if (dump_atomic_write( cmd[0], (char *) &i, sizeof i)
                            != sizeof i)
                                quit("master/slave protocol botched 3\n");
 #endif
-                       doslave(cmd[0], i);
+                       doslave(cmd[0], i, (slaves[i].pid == slp->pid));
                        Exit(X_FINOK);
                }
+               else
+                       close(cmd[0]);
        }
 
 #ifdef LINUX_FORK_BUG
@@ -944,12 +1025,12 @@ enslave(void)
         * returned from fork() causes a SEGV in the child process
         */
        for (i = 0; i < SLAVES; i++)
-               if (atomic_read( slaves[i].fd, (char *) &j, sizeof j) != sizeof j)
+               if (dump_atomic_read( slaves[i].fd, (char *) &j, sizeof j) != sizeof j)
                        quit("master/slave protocol botched 4\n");
 #endif
 
        for (i = 0; i < SLAVES; i++)
-               (void) atomic_write( slaves[i].fd, 
+               (void) dump_atomic_write( slaves[i].fd, 
                              (char *) &slaves[(i + 1) % SLAVES].pid, 
                              sizeof slaves[0].pid);
                
@@ -959,7 +1040,7 @@ enslave(void)
 void
 killall(void)
 {
-       register int i;
+       int i;
 
        for (i = 0; i < SLAVES; i++)
                if (slaves[i].pid > 0) {
@@ -969,30 +1050,53 @@ killall(void)
 }
 
 /*
- * Synchronization - each process has a lockfile, and shares file
- * descriptors to the following process's lockfile.  When our write
- * completes, we release our lock on the following process's lock-
- * file, allowing the following process to lock it and proceed. We
- * get the lock back for the next cycle by swapping descriptors.
+ * Synchronization - each process waits for a SIGUSR2 from the
+ * previous process before writing to the tape, and sends SIGUSR2
+ * to the next process when the tape write completes. On tape errors
+ * a SIGUSR1 is sent to the master which then terminates all of the
+ * slaves.
  */
 static void
-doslave(int cmd, int slave_number)
+doslave(int cmd, int slave_number, int first)
 {
-       register int nread;
-       int nextslave, size, eot_count;
+       int nread;
+       int nextslave, size, eot_count, bufsize;
        volatile int wrote = 0;
-       sigset_t sigset;
+       char *buffer;
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+       struct tapebuf *comp_buf = NULL;
+       int compresult, do_compress = !first;
+       unsigned long worklen;
+#ifdef HAVE_BZLIB
+       unsigned int worklen2;
+#endif
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
+       struct slave_results returns;
 #ifdef __linux__
        errcode_t retval;
 #endif
+#ifdef USE_QFA
+       long long curtapepos;
+       union u_spcl *uspclptr;
+       struct s_spcl *spclptr;
+#endif /* USE_QFA */
+       sigset_t set;
+
+       sigemptyset(&set);
+       sigaddset(&set, SIGUSR2);
+       sigprocmask(SIG_BLOCK, &set, NULL);
+       sigemptyset(&set);
 
        /*
         * Need our own seek pointer.
         */
        (void) close(diskfd);
-       if ((diskfd = open(disk, O_RDONLY)) < 0)
+       if ((diskfd = OPEN(disk, O_RDONLY)) < 0)
                quit("slave couldn't reopen disk: %s\n", strerror(errno));
 #ifdef __linux__
+#ifdef BLKFLSBUF
+       (void)ioctl(diskfd, BLKFLSBUF);
+#endif
        ext2fs_close(fs);
        retval = dump_fs_open(disk, &fs);
        if (retval)
@@ -1002,51 +1106,161 @@ doslave(int cmd, int slave_number)
        /*
         * Need the pid of the next slave in the loop...
         */
-       if ((nread = atomic_read( cmd, (char *)&nextslave, sizeof nextslave))
+       if ((nread = dump_atomic_read( cmd, (char *)&nextslave, sizeof nextslave))
            != sizeof nextslave) {
                quit("master/slave protocol botched - didn't get pid of next slave.\n");
        }
 
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+       /* if we're doing a compressed dump, allocate the compress buffer */
+       if (compressed) {
+               comp_buf = malloc(sizeof(struct tapebuf) + TP_BSIZE + writesize);
+               if (comp_buf == NULL)
+                       quit("couldn't allocate a compress buffer.\n");
+               if (bzipflag)
+                       comp_buf->flags = COMPRESS_BZLIB;
+               else
+                       comp_buf->flags = COMPRESS_ZLIB;
+       }
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
+
        /*
         * Get list of blocks to dump, read the blocks into tape buffer
         */
-       while ((nread = atomic_read( cmd, (char *)slp->req, reqsiz)) == reqsiz) {
-               register struct req *p = slp->req;
+       while ((nread = dump_atomic_read( cmd, (char *)slp->req, reqsiz)) == reqsiz) {
+               struct req *p = slp->req;
 
                for (trecno = 0; trecno < ntrec;
                     trecno += p->count, p += p->count) {
-                       if (p->dblk) {
+                       if (p->dblk) {  /* read a disk block */
                                bread(p->dblk, slp->tblock[trecno],
                                        p->count * TP_BSIZE);
-                       } else {
-                               if (p->count != 1 || atomic_read( cmd,
+                       } else {        /* read record from pipe */
+                               if (p->count != 1 || dump_atomic_read( cmd,
                                    (char *)slp->tblock[trecno],
                                    TP_BSIZE) != TP_BSIZE)
                                       quit("master/slave protocol botched.\n");
                        }
                }
+
+               /* Try to write the data... */
+               wrote = 0;
+               eot_count = 0;
+               size = 0;
+               buffer = (char *) slp->tblock[0];       /* set write pointer */
+               bufsize = writesize;                    /* length to write */
+               returns.clen = returns.unclen = bufsize;
+
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
+               /* 
+                * When writing a compressed dump, each block except
+                * the first one on each tape is written
+                * from struct tapebuf with an 4 byte prefix
+                * followed by the data. This can be less than
+                * writesize. Restore, on a short read, can compare the
+                * length read to the compressed length in the header
+                * to verify that the read was good. Blocks which don't
+                * compress well are written uncompressed.
+                * The first block written by each slave is not compressed
+                * and does not have a prefix.
+                */
+
+               if (compressed && do_compress) {
+                       comp_buf->length = bufsize;
+                       worklen = TP_BSIZE + writesize;
+                       compresult = 1;
+#ifdef HAVE_ZLIB
+                       if (!bzipflag) {
+                               compresult = compress2(comp_buf->buf, 
+                                                      &worklen,
+                                                      (char *)slp->tblock[0],
+                                                      writesize, 
+                                                      compressed);
+                               if (compresult == Z_OK)
+                                       compresult = 1;
+                               else
+                                       compresult = 0;
+                       }
+#endif /* HAVE_ZLIB */
+#ifdef HAVE_BZLIB
+                       if (bzipflag) {
+                               worklen2 = worklen;
+                               compresult = BZ2_bzBuffToBuffCompress(
+                                                      comp_buf->buf,
+                                                      &worklen2,
+                                                      (char *)slp->tblock[0],
+                                                      writesize,
+                                                      compressed,
+                                                      0, 30);
+                               worklen = worklen2;
+                               if (compresult == BZ_OK)
+                                       compresult = 1;
+                               else
+                                       compresult = 0;
+                       }
+
+#endif /* HAVE_BZLIB */
+                       if (compresult && worklen <= (writesize - 16)) {
+                               /* write the compressed buffer */
+                               comp_buf->length = worklen;
+                               comp_buf->compressed = 1;
+                               buffer = (char *) comp_buf;
+                               returns.clen = bufsize = worklen + sizeof(struct tapebuf);
+                       }
+                       else {
+                               /* write the data uncompressed */
+                               comp_buf->length = writesize;
+                               comp_buf->compressed = 0;
+                               buffer = (char *) comp_buf;
+                               returns.clen = bufsize = writesize + sizeof(struct tapebuf);
+                               returns.unclen = returns.clen;
+                               memcpy(comp_buf->buf, (char *)slp->tblock[0], writesize);
+                       }
+               }
+               /* compress the remaining blocks if we're compressing */
+               do_compress = compressed;
+#endif /* HAVE_ZLIB  || HAVE_BZLIB */
+
                if (sigsetjmp(jmpbuf, 1) == 0) {
                        ready = 1;
                        if (!caught)
-                               (void) pause();
+                               sigsuspend(&set);
                }
                ready = 0;
                caught = 0;
 
-               /* Try to write the data... */
-               wrote = 0;
-               eot_count = 0;
-               size = 0;
-
-               while (eot_count < 10 && size < writesize) {
+#ifdef USE_QFA
+               if (gTapeposfd >= 0) {
+                       int i;
+                       int firstpass = 1;
+                       for (i = 0; i < ntrec; ++i) {
+                               uspclptr = (union u_spcl *)&slp->tblock[i];
+                               spclptr = &uspclptr->s_spcl;
+                               if ((spclptr->c_magic == NFS_MAGIC) && 
+                                   (spclptr->c_type == TS_INODE) &&
+                                   ((spclptr->c_dinode.di_mode & S_IFMT) != IFDIR) &&
+                                   (spclptr->c_date == gThisDumpDate)) {
+                                       /* if an error occured previously don't
+                                        * try again */
+                                       if (firstpass) {
+                                               firstpass = 0;
+                                               if (gtperr == 0) 
+                                                       gtperr = GetTapePos(&curtapepos);
+                                       }
+                                       if (gtperr == 0)
+                                                       MkTapeString(spclptr, curtapepos);
+                               }
+                       }
+               }
+#endif /* USE_QFA */
+                                               
+               while (eot_count < 10 && size < bufsize) {
 #ifdef RDUMP
                        if (host)
-                               wrote = rmtwrite(slp->tblock[0]+size,
-                                   writesize-size);
+                               wrote = rmtwrite(buffer + size, bufsize - size);
                        else
 #endif
-                               wrote = write(tapefd, slp->tblock[0]+size,
-                                   writesize-size);
+                               wrote = write(tapefd, buffer + size, bufsize - size);
 #ifdef WRITEDEBUG
                        printf("slave %d wrote %d\n", slave_number, wrote);
 #endif
@@ -1058,9 +1272,9 @@ doslave(int cmd, int slave_number)
                }
 
 #ifdef WRITEDEBUG
-               if (size != writesize)
+               if (size != bufsize)
                 printf("slave %d only wrote %d out of %d bytes and gave up.\n",
-                    slave_number, size, writesize);
+                    slave_number, size, bufsize);
 #endif
 
                /*
@@ -1072,24 +1286,22 @@ doslave(int cmd, int slave_number)
                }
 
                if (eot_count > 0)
-                       size = 0;
+                       returns.clen = returns.unclen = 0;
 
-               if (wrote < 0) {
-                       (void) kill(master, SIGUSR1);
-                       sigemptyset(&sigset);
-                       for (;;)
-                               sigsuspend(&sigset);
-               } else {
-                       /*
-                        * pass size of write back to master
-                        * (for EOT handling)
-                        */
-                       (void) atomic_write( cmd, (char *)&size, sizeof size);
-               }
+               /*
+                * pass errno back to master for special handling
+                */
+               if (wrote < 0)
+                       returns.unclen = -errno;
+
+               /*
+                * pass size of data and size of write back to master
+                * (for EOT handling)
+                */
+               (void) dump_atomic_write( cmd, (char *)&returns, sizeof returns);
 
                /*
-                * If partial write, don't want next slave to go.
-                * Also jolts him awake.
+                * Signal the next slave to go.
                 */
                (void) kill(nextslave, SIGUSR2);
        }
@@ -1103,7 +1315,7 @@ doslave(int cmd, int slave_number)
  * loop until the count is satisfied (or error).
  */
 static ssize_t
-atomic_read(int fd, void *buf, size_t count)
+dump_atomic_read(int fd, void *buf, size_t count)
 {
        int got, need = count;
 
@@ -1120,7 +1332,7 @@ atomic_read(int fd, void *buf, size_t count)
  * loop until the count is satisfied (or error).
  */
 static ssize_t
-atomic_write(int fd, const void *buf, size_t count)
+dump_atomic_write(int fd, const void *buf, size_t count)
 {
        int got, need = count;
 
@@ -1130,3 +1342,59 @@ atomic_write(int fd, const void *buf, size_t count)
        } while (got == -1 && errno == EINTR);
        return (got < 0 ? got : count - need);
 }
+
+
+#ifdef USE_QFA
+/*
+ * read the current tape position
+ */
+static int
+GetTapePos(long long *pos)
+{
+       int err = 0;
+
+#ifdef RDUMP
+       if (host) {
+               *pos = (long long) rmtseek(0, SEEK_CUR);
+               err = *pos < 0;
+       }
+       else 
+#endif
+       {
+       if (magtapeout) {
+               long mtpos;
+               *pos = 0;
+               err = (ioctl(tapefd, MTIOCPOS, &mtpos) < 0);
+               *pos = (long long)mtpos;
+       }
+       else {
+               *pos = LSEEK(tapefd, 0, SEEK_CUR);
+               err = (*pos < 0);
+       }
+       }
+       if (err) {
+               err = errno;
+               msg("[%ld] error: %d (getting tapepos: %lld)\n", getpid(), 
+                       err, *pos);
+               return err;
+       }
+       return err;
+}
+
+static void 
+MkTapeString(struct s_spcl *spclptr, long long curtapepos) {
+
+#ifdef DEBUG_QFA
+       msg("inode %ld at tapepos %lld\n", spclptr->c_inumber, curtapepos);
+#endif
+
+       snprintf(gTps, sizeof(gTps), "%ld\t%d\t%lld\n", 
+                (unsigned long)spclptr->c_inumber, 
+                tapeno, 
+                curtapepos);
+       gTps[sizeof(gTps) - 1] = '\0';
+       if (write(gTapeposfd, gTps, strlen(gTps)) != strlen(gTps)) {
+               warn("error writing tapepos file.\n");
+       }
+}
+#endif /* USE_QFA */