X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftape.c;h=5e79fd2f66a7abac0c70d893a186d21928c1b71c;hb=8cef350eb9ffa2e543a95756a8f605175380f7b0;hp=3f2ae89a651bedf6f37189240cc2b5ff8352b09f;hpb=86fab47e75fc141db053271654a2570fddcd0f46;p=dump.git

diff --git a/dump/tape.c b/dump/tape.c
index 3f2ae89..5e79fd2 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.46 2001/05/12 11:36:12 stelian Exp $";
+	"$Id: tape.c,v 1.53 2001/07/20 11:02:45 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>
@@ -62,8 +63,8 @@ int    write(), read();
 
 #ifdef __linux__
 #include <sys/types.h>
+#include <sys/time.h>
 #include <time.h>
-#include <linux/types.h>
 #endif
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -71,7 +72,11 @@ int    write(), read();
 #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 <bsdcompat.h>
 #elif defined sunos
@@ -107,12 +112,11 @@ long long tapea_bytes = 0;	/* bytes_written at start of current volume */
 
 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	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));
 
 /*
  * Concurrent dump mods (Caltech) - disk block reading and tape writing
@@ -441,54 +445,20 @@ flushtape(void)
 	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());
-#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 ? (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
@@ -548,9 +518,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) {
@@ -993,7 +965,7 @@ enslave(void)
 			    != 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
@@ -1039,7 +1011,7 @@ killall(void)
  * 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, bufsize;
@@ -1047,7 +1019,7 @@ doslave(int cmd, int slave_number)
 	char *buffer;
 #ifdef HAVE_ZLIB
 	struct tapebuf *comp_buf = NULL;
-	int compresult, do_compress = slave_number > 0;
+	int compresult, do_compress = !first;
 	unsigned long worklen;
 #endif /* HAVE_ZLIB */
 	struct slave_results returns;
@@ -1171,7 +1143,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) {