X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftape.c;h=3e41622b3f51057daa35ac73855ae17245f250f9;hp=2df4d1e242772338f88bce5b9cf6bbd5e4b48cc7;hb=eb1636e90af5ef5100ca165552b34596ba9aa1a0;hpb=9e3c33e5f154bae655a7e2e5b9a8f8b190791245

diff --git a/dump/tape.c b/dump/tape.c
index 2df4d1e..3e41622 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.86 2004/07/07 11:07:29 stelian Exp $";
+	"$Id: tape.c,v 1.90 2008/06/04 19:27:48 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -246,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) &&
@@ -420,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)
@@ -475,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;
@@ -616,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
@@ -1298,7 +1310,8 @@ doslave(int cmd,
 				if ((spclptr->c_magic == NFS_MAGIC) && 
 							(spclptr->c_type == TS_INODE) &&
 							(spclptr->c_date == gThisDumpDate) &&
-							!(spclptr->c_dinode.di_mode & S_IFDIR)
+							!(spclptr->c_dinode.di_mode & S_IFDIR) &&
+							!(spclptr->c_flags & DR_EXTATTRIBUTES)
 						) {
 					foundone = 1;
 					/* if (cntntrecs >= maxntrecs) {	 only write every maxntrecs amount of data */