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

diff --git a/dump/tape.c b/dump/tape.c
index bd1e2f9..6f829f8 100644
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: tape.c,v 1.84 2004/05/25 10:39:29 stelian Exp $";
+	"$Id: tape.c,v 1.87 2004/11/22 10:32:32 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>
@@ -142,7 +146,7 @@ static int MkTapeString __P((struct s_spcl *, long long));
  * The following structure defines the instruction packets sent to slaves.
  */
 struct req {
-	daddr_t dblk;
+	ext2_loff_t dblk;
 	int count;
 };
 int reqsiz;
@@ -234,7 +238,7 @@ void
 writerec(const void *dp, int isspcl)
 {
 
-	slp->req[trecno].dblk = (daddr_t)0;
+	slp->req[trecno].dblk = (ext2_loff_t)0;
 	slp->req[trecno].count = 1;
 	/* XXX post increment triggers an egcs-1.1.2-12 bug on alpha/sparc */
 	*(union u_spcl *)(*(nextblock)) = *(union u_spcl *)dp;
@@ -272,9 +276,10 @@ writerec(const void *dp, int isspcl)
 }
 
 void
-dumpblock(daddr_t blkno, int size)
+dumpblock(blk_t blkno, int size)
 {
-	int avail, tpblks, dblkno;
+	int avail, tpblks;
+	ext2_loff_t dblkno;
 
 	dblkno = fsbtodb(sblock, blkno);
 	tpblks = size >> tp_bshift;
@@ -470,10 +475,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;