From: Stelian Pop <stelian@popies.net>
Date: Fri, 3 Mar 2000 11:43:35 +0000 (+0000)
Subject: Corrected the size estimate.
X-Git-Tag: release_0_4b16~6
X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=commitdiff_plain;h=a0d8fe2d66d132550f5a46eeda46f37c5c960efa

Corrected the size estimate.
---

diff --git a/dump/main.c b/dump/main.c
index cd844ae..6b666a6 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: main.c,v 1.20 2000/03/02 13:52:52 stelian Exp $";
+	"$Id: main.c,v 1.21 2000/03/03 11:43:35 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -511,7 +511,7 @@ main(int argc, char *argv[])
 	usedinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
 	dumpdirmap = (char *)calloc((unsigned) mapsize, sizeof(char));
 	dumpinomap = (char *)calloc((unsigned) mapsize, sizeof(char));
-	tapesize = 3 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
+	tapesize = 2 * (howmany(mapsize * sizeof(char), TP_BSIZE) + 1);
 
 	nonodump = spcl.c_level < honorlevel;
 
@@ -537,12 +537,12 @@ main(int argc, char *argv[])
 	}
 
 	if (sizest) {
-		printf("%.0f\n", ((double)tapesize + 10) * TP_BSIZE);
+		printf("%.0f\n", ((double)tapesize + 11) * TP_BSIZE);
 		exit(X_FINOK);
 	} /* stop here for size estimate */
 
 	if (pipeout || unlimited) {
-		tapesize += 10;	/* 10 trailer blocks */
+		tapesize += 11;	/* 10 trailer blocks + 1 map header */
 		msg("estimated %ld tape blocks.\n", tapesize);
 	} else {
 		double fetapes;
diff --git a/dump/traverse.c b/dump/traverse.c
index 204f518..f485ab3 100644
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -40,7 +40,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: traverse.c,v 1.16 2000/02/10 09:42:32 stelian Exp $";
+	"$Id: traverse.c,v 1.17 2000/03/03 11:43:35 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -164,7 +164,7 @@ blockest(struct dinode *dp)
 		/* calculate the number of indirect blocks on the dump tape */
 		blkest +=
 			howmany(sizeest - NDADDR * fs->blocksize / TP_BSIZE,
-			TP_NINDIR);
+			NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super));
 	}
 #else
 	if (dp->di_size > sblock->fs_bsize * NDADDR) {