X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftape.c;h=ebee4d89a455ed38bd76193387a944b7dcc72e9f;hp=d615960b1dc05b3cedfde591d9ed50002e041dca;hb=0c78942bcf1ab271d7202a7abb20e43317c391be;hpb=e1e4be20b0192a2988eab70a31fb1428c4c81eec

diff --git a/dump/tape.c b/dump/tape.c
index d615960..ebee4d8 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.85 2004/07/01 09:14:49 stelian Exp $";
+	"$Id: tape.c,v 1.89 2005/08/20 21:00:48 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -60,7 +60,11 @@ int    write(), read();
 #ifdef __linux__
 #include <sys/types.h>
 #include <sys/time.h>
-#include <linux/fs.h>	/* for definition of BLKFLSBUF */
+#include <sys/ioctl.h>
+#include <sys/mount.h>	/* for definition of BLKFLSBUF */
+#ifndef BLKFLSBUF	/* last resort... */
+#define BLKFLSBUF _IO(0x12, 97) /* Flush buffer cache.  */
+#endif
 #include <time.h>
 #endif
 #include <sys/param.h>
@@ -242,7 +246,7 @@ writerec(const void *dp, int isspcl)
 	/* Need to write it to the archive file */
 	if (! AfileActive && isspcl && (spcl.c_type == TS_END))
 		AfileActive = 1;
-	if (AfileActive && Afile >= 0) {
+	if (AfileActive && Afile >= 0 && !(spcl.c_flags & DR_EXTATTRIBUTES)) {
 		/* When we dump an inode which is not a directory,
 		 * it means we ended the archive contents */
 		if (isspcl && (spcl.c_type == TS_INODE) &&
@@ -416,6 +420,10 @@ flushtape(void)
 
 	int siz = (char *)nextblock - (char *)slp->req;
 
+	/* make sure returned has sane values in case we don't read 
+	 * them from the slave in this pass */
+	returned.unclen = returned.clen = writesize;
+
 	slp->req[trecno].count = 0;			/* Sentinel */
 
 	if (dump_atomic_write( slp->fd, (char *)slp->req, siz) != siz)
@@ -471,10 +479,14 @@ flushtape(void)
 	}
 
 	blks = 0;
-	if (spcl.c_type != TS_END) {
-		for (i = 0; i < spcl.c_count; i++)
-			if (spcl.c_addr[i] != 0)
-				blks++;
+	if (spcl.c_type == TS_CLRI || spcl.c_type == TS_BITS)
+		blks = spcl.c_count;
+	else {
+		if (spcl.c_type != TS_END) {
+			for (i = 0; i < spcl.c_count; i++)
+				if (spcl.c_addr[i] != 0)
+					blks++;
+		}
 	}
 	slp->count = lastspclrec + blks + 1 - spcl.c_tapea;
 	slp->tapea = spcl.c_tapea;
@@ -612,6 +624,10 @@ rollforward(void)
 	tslp = &slaves[SLAVES];
 	ntb = (union u_spcl *)tslp->tblock[1];
 
+	/* make sure returned has sane values in case we don't read 
+	 * them from the slave in this pass */
+	returned.unclen = returned.clen = writesize;
+
 	/*
 	 * Each of the N slaves should have requests that need to
 	 * be replayed on the next tape.  Use the extra slave buffers