Made dump report the total number of MB written to tape.

[dump.git] / dump / main.c

diff --git a/dump/main.c b/dump/main.c
index cd844ae52cf97db163fe3b0463772a0522ca2f7a..0890d409105e919d5115acce22642bbbf2313351 100644 (file)
--- 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.22 2000/03/08 10:51:29 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;
@@ -664,10 +664,13 @@ main(int argc, char *argv[])
        tnow = trewind();
 
        if (pipeout)
-               msg("%ld tape blocks\n", spcl.c_tapea);
+               msg("%ld tape blocks (%.2fMB)\n", spcl.c_tapea,
+                       ((double)spcl.c_tapea * TP_BSIZE / 1048576));
        else
-               msg("%ld tape blocks on %d volumes(s)\n",
-                   spcl.c_tapea, spcl.c_volume);
+               msg("%ld tape blocks (%.2fMB) on %d volume(s)\n",
+                   spcl.c_tapea, 
+                   ((double)spcl.c_tapea * TP_BSIZE / 1048576),
+                   spcl.c_volume);
 
        /* report dump performance, avoid division through zero */
        if (tend_writing - tstart_writing == 0)