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

diff --git a/dump/tape.c b/dump/tape.c
index 6f829f8..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.87 2004/11/22 10:32:32 stelian Exp $";
+	"$Id: tape.c,v 1.89 2005/08/20 21:00: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)
@@ -620,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