X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=dump%2Ftape.c;h=34779491504f6526e0eff171ebc73d0973ce28b1;hb=0d7af9c5f2cc7d4a97e934692ea8665e09fd5500;hp=c08019865bc2a96f5e4443115e5da081c0d1215a;hpb=2e6828953e9c505e76a17eec441fc714c6579922;p=dump.git

diff --git a/dump/tape.c b/dump/tape.c
index c080198..3477949 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -2,7 +2,7 @@
  *	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 <pop@cybercable.fr>, 1999-2000
  */
 
 /*-
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.10 2000/01/07 19:24:04 tiniou Exp $";
+	"$Id: tape.c,v 1.15 2000/03/02 11:34:51 stelian Exp $";
 #endif /* not lint */
 
 #ifdef __linux__
@@ -73,6 +73,7 @@ static const char rcsid[] =
 #include <setjmp.h>
 #include <signal.h>
 #include <stdio.h>
+#include <compaterr.h>
 #ifdef __STDC__
 #include <stdlib.h>
 #include <string.h>
@@ -97,6 +98,7 @@ extern	int cartridge;
 extern	char *host;
 char	*nexttape;
 extern  pid_t rshpid;
+int 	eot_code = 1;
 
 static	ssize_t atomic_read __P((int, void *, size_t));
 static	ssize_t atomic_write __P((int, const void *, size_t));
@@ -311,6 +313,8 @@ statussig(int notused)
 #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),
@@ -400,7 +404,42 @@ flushtape(void)
 	timeest();
 }
 
-void
+/*
+ * 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) {
+	int pid, status;
+
+	pid = fork();
+	if (pid == -1) {
+		perror("  DUMP: unable to fork");
+		return -1;
+	}
+	if (pid == 0) {
+		setuid(getuid());
+		setgid(getgid());
+		execl("/bin/sh", "sh", "-c", command, 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;
+			}
+		} else {
+			if (WIFEXITED(status))
+				return WEXITSTATUS(status);
+			else
+				return -1;
+		}
+	} while(1);
+}
+
+time_t
 trewind(void)
 {
 	int f;
@@ -433,32 +472,45 @@ trewind(void)
 	while (wait((int *)NULL) >= 0)	/* wait for any signals from slaves */
 		/* void */;
 
-	if (pipeout)
-		return;
+	if (!pipeout) {
 
-	msg("Closing %s\n", tape);
+		msg("Closing %s\n", tape);
 
 #ifdef RDUMP
-	if (host) {
-		rmtclose();
-		while (rmtopen(tape, 0) < 0)
-			sleep(10);
-		rmtclose();
-		return;
-	}
+		if (host) {
+			rmtclose();
+			while (rmtopen(tape, 0) < 0)
+				sleep(10);
+			rmtclose();
+		}
+		else 
+#else
+		{
+			(void) close(tapefd);
+			while ((f = open(tape, 0)) < 0)
+				sleep (10);
+			(void) close(f);
+		}
 #endif
-	(void) close(tapefd);
-	while ((f = open(tape, 0)) < 0)
-		sleep (10);
-	(void) close(f);
+		eot_code = 1;
+		if (eot_script) {
+			msg("Launching %s\n", eot_script);
+			eot_code = system_command(eot_script);
+		}
+		if (eot_code != 0 && eot_code != 1) {
+			msg("Dump aborted by the end of tape script\n");
+			dumpabort(0);
+		}
+	}
+	return do_stats();
 }
 
+		
 void
 close_rewind(void)
 {
-	trewind();
-	(void)do_stats();
-	if (nexttape || Mflag)
+	(void)trewind();
+	if (nexttape || Mflag || (eot_code == 0) )
 		return;
 	if (!nogripe) {
 		msg("Change Volumes: Mount volume #%d\n", tapeno+1);
@@ -713,8 +765,8 @@ restore_check_point:
 		 */
 		tapeno++;               /* current tape sequence */
 		if (Mflag) {
-			snprintf(tape, NAME_MAX, "%s%03d", tapeprefix, tapeno);
-			tape[NAME_MAX - 1] = '\0';
+			snprintf(tape, MAXPATHLEN, "%s%03d", tapeprefix, tapeno);
+			tape[MAXPATHLEN - 1] = '\0';
 			msg("Dumping volume %d on %s\n", tapeno, tape);
 		}
 		else if (nexttape || strchr(tapeprefix, ',')) {
@@ -725,15 +777,16 @@ restore_check_point:
 				nexttape = p + 1;
 			} else
 				nexttape = NULL;
-			strncpy(tape, tapeprefix, NAME_MAX);
-			tape[NAME_MAX - 1] = '\0';
+			strncpy(tape, tapeprefix, MAXPATHLEN);
+			tape[MAXPATHLEN - 1] = '\0';
 			msg("Dumping volume %d on %s\n", tapeno, tape);
 		}
 #ifdef RDUMP
-		while ((tapefd = (host ? rmtopen(tape, 2) :
-			pipeout ? 1 : open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
+		while ((tapefd = (host ? rmtopen(tape, 2) : pipeout ? 
+			fileno(stdout) : 
+			open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
 #else
-		while ((tapefd = (pipeout ? 1 :
+		while ((tapefd = (pipeout ? fileno(stdout) :
 				  open(tape, O_WRONLY|O_CREAT, 0666))) < 0)
 #endif
 		    {