QFA fixes.

[dump.git] / dump / tape.c

diff --git a/dump/tape.c b/dump/tape.c
index 25d7c502c4cba16626a3759d05ccea1a87283166..a0910f4f5d5943993d3b7d30f5f1b829e773c169 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.48 2001/07/18 09:12:05 stelian Exp $";
+       "$Id: tape.c,v 1.51 2001/07/18 13:12:33 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -52,6 +52,7 @@ static const char rcsid[] =
 #include <signal.h>
 #include <stdio.h>
 #include <compaterr.h>
+#include <system.h>
 #ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
@@ -116,7 +117,6 @@ 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));
 
 /*
  * Concurrent dump mods (Caltech) - disk block reading and tape writing
@@ -443,56 +443,23 @@ flushtape(void)
        nextblock = slp->tblock;
        trecno = 0;
        asize += tenths + returned.clen / density;
+       csize += returned.clen;
        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());
-#if OLD_STYLE_FSCRIPT
-               snprintf(commandstr, sizeof(commandstr), "%s", command);
-#else
-               snprintf(commandstr, sizeof(commandstr), "%s %s %d", command, device, volnum);
-#endif
-               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 ? csize >= 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
@@ -552,9 +519,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) {
@@ -724,6 +693,7 @@ rollforward(void)
        slp->count = lastspclrec + blks + 1 - spcl.c_tapea;
        slp->inode = curino;
        asize += tenths + returned.clen / density;
+       csize += returned.clen;
        blockswritten += ntrec;
        blocksthisvol += ntrec;
 #endif
@@ -880,6 +850,7 @@ restore_check_point:
                enslave();  /* Share open tape file descriptor with slaves */
 
                asize = 0;
+               csize = 0;
                blocksthisvol = 0;
                if (top)
                        newtape++;              /* new tape signal */
@@ -1175,7 +1146,8 @@ doslave(int cmd, int slave_number)
                        uspclptr = (union u_spcl *)&slp->tblock[0];
                        spclptr = &uspclptr->s_spcl;
                        if ((spclptr->c_magic == NFS_MAGIC) && 
-                           (spclptr->c_type == TS_INODE)) {
+                           (spclptr->c_type == TS_INODE) &&
+                           (spclptr->c_date == gThisDumpDate)) {
                                /* if an error occured previously don't
                                 * try again */
                                if (gtperr == 0) {