X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftape.c;h=644ed8a2ba92ab6a555598b1c234086f6f34cf4c;hp=f048a78bb6f7fc1b4f7787ad5ce9bf872d8fbbec;hb=caea5c768eb239f9b987791f0c665b10d7550741;hpb=e79790783b6826af94196b1ecb74358a675460ed

diff --git a/dump/tape.c b/dump/tape.c
index f048a78..644ed8a 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.52 2001/07/20 09:01:46 stelian Exp $";
+	"$Id: tape.c,v 1.56 2001/09/12 09:02:51 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -68,10 +68,12 @@ int    write(), read();
 #endif
 #include <sys/param.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <sys/wait.h>
 #include <sys/mtio.h>
 #ifdef __linux__
+#include <linux/fs.h>
+#undef atomic_read	/* this get wrongly defined in kernel */
+			/* headers and we don't want it */
 #ifdef HAVE_EXT2FS_EXT2_FS_H
 #include <ext2fs/ext2_fs.h>
 #else
@@ -95,6 +97,10 @@ int    write(), read();
 #include <zlib.h>
 #endif /* HAVE_ZLIB */
 
+#ifdef HAVE_BZLIB
+#include <bzlib.h>
+#endif /* HAVE_BZLIB */
+
 #include "dump.h"
 
 int	writesize;		/* size of malloc()ed buffer for tape */
@@ -443,12 +449,11 @@ flushtape(void)
 	nextblock = slp->tblock;
 	trecno = 0;
 	asize += tenths + returned.clen / density;
-	csize += returned.clen;
 	blockswritten += ntrec;
 	blocksthisvol += ntrec;
 	if (!pipeout && !unlimited) {
 		if (blocksperfile) {
-			if ( compressed ? csize + writesize >= blocksperfile * 1024
+			if ( compressed ? (bytes_written - tapea_bytes + SLAVES * (writesize + sizeof(struct tapebuf))) >= blocksperfile * 1024
 					: blocksthisvol >= blocksperfile ) {
 				close_rewind();
 				startnewtape(0);
@@ -559,7 +564,7 @@ close_rewind(void)
 void
 rollforward(void)
 {
-	register struct req *p, *q, *prev;
+	register struct req *p, *q = NULL, *prev;
 	register struct slave *tslp;
 	int i, size, savedtapea, got;
 	union u_spcl *ntb, *otb;
@@ -693,7 +698,6 @@ 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
@@ -850,7 +854,6 @@ restore_check_point:
 		enslave();  /* Share open tape file descriptor with slaves */
 
 		asize = 0;
-		csize = 0;
 		blocksthisvol = 0;
 		if (top)
 			newtape++;		/* new tape signal */
@@ -1020,11 +1023,14 @@ doslave(int cmd, int slave_number, int first)
 	int nextslave, size, eot_count, bufsize;
 	volatile int wrote = 0;
 	char *buffer;
-#ifdef HAVE_ZLIB
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
 	struct tapebuf *comp_buf = NULL;
 	int compresult, do_compress = !first;
 	unsigned long worklen;
-#endif /* HAVE_ZLIB */
+#ifdef HAVE_BZLIB
+	unsigned int worklen2;
+#endif
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
 	struct slave_results returns;
 #ifdef	__linux__
 	errcode_t retval;
@@ -1042,6 +1048,9 @@ doslave(int cmd, int slave_number, int first)
 	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)
@@ -1056,15 +1065,18 @@ doslave(int cmd, int slave_number, int first)
 		quit("master/slave protocol botched - didn't get pid of next slave.\n");
 	}
 
-#ifdef HAVE_ZLIB
+#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");
-		comp_buf->flags = 0;
+		if (bzipflag)
+			comp_buf->flags = COMPRESS_BZLIB;
+		else
+			comp_buf->flags = COMPRESS_ZLIB;
 	}
-#endif /* HAVE_ZLIB */
+#endif /* HAVE_ZLIB || HAVE_BZLIB */
 
 	/*
 	 * Get list of blocks to dump, read the blocks into tape buffer
@@ -1093,7 +1105,7 @@ doslave(int cmd, int slave_number, int first)
 		bufsize = writesize;			/* length to write */
 		returns.clen = returns.unclen = bufsize;
 
-#ifdef HAVE_ZLIB
+#if defined(HAVE_ZLIB) || defined(HAVE_BZLIB)
 		/* 
 		 * When writing a compressed dump, each block except
 		 * the first one on each tape is written
@@ -1110,9 +1122,38 @@ doslave(int cmd, int slave_number, int first)
 		if (compressed && do_compress) {
 			comp_buf->length = bufsize;
 			worklen = TP_BSIZE + writesize;
-			compresult = compress2(comp_buf->buf, &worklen,
-				(char *)slp->tblock[0], writesize, compressed);
-			if (compresult == Z_OK && worklen <= (writesize - 16)) {
+#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;
@@ -1131,7 +1172,7 @@ doslave(int cmd, int slave_number, int first)
 		}
 		/* compress the remaining blocks if we're compressing */
 		do_compress = compressed;
-#endif /* HAVE_ZLIB */
+#endif /* HAVE_ZLIB  || HAVE_BZLIB */
 
 		if (sigsetjmp(jmpbuf, 1) == 0) {
 			ready = 1;