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

diff --git a/CHANGES b/CHANGES
index 82a91a2f541e8ff9e44e6f4bd241b7cb7f2fe9f6..e87d4856381860af1ccf673de642c05460ab5597 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.48 2000/03/02 13:33:00 stelian Exp $
+$Id: CHANGES,v 1.49 2000/03/08 10:51:29 stelian Exp $
 
 Changes between versions 0.4b15 and 0.4b16 (released ?????????????)
 ===================================================================
@@ -6,6 +6,17 @@ Changes between versions 0.4b15 and 0.4b16 (released ?????????????)
 1.     Fixed some several duplicate 'DUMP: DUMP:' in the
        output of dump.
 
+2.     Corrected the estimation of blocks to dump. Note that
+       this is still wrong for large directory inodes, due
+       to the size of a BSD directory entry on the tape
+       (estimation is based on the size of the ext2 directory,
+       which is smaller because it doesn't contain the null
+       character at the end).
+
+3.     Made dump report the total number of MB written to
+       tape at the end of run. Thanks to W. Reilly Cooley
+       <wcooley@nakedape.cc> for the patch.
+
 Changes between versions 0.4b14 and 0.4b15 (released March 2, 2000)
 ===================================================================
 

diff --git a/THANKS b/THANKS
index de78efeb26952dc3c29fe6fce6e96b5e69b0f2c7..7b538a313cf5b18163f1d6594ee9dcec2a5f6951 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.23 2000/03/01 10:16:05 stelian Exp $
+$Id: THANKS,v 1.24 2000/03/08 10:51:29 stelian Exp $
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
@@ -26,6 +26,7 @@ Stephen Carr          sgcarr@civeng.adelaide.edu.au
 Rob Cermak             cermak@ahab.rutgers.edu
 Isaac Chuang           ike@isl.stanford.edu
 Rainer Clasen          bj@ncc.cicely.de
+W. Reilly Cooley       wcooley@nakedape.cc
 Abhijit Dasgupta       abhijit@ans.net
 Andreas Dilger         adilger@home.com
 Jason Fearon           jasonf@netrider.org.au

diff --git a/dump/main.c b/dump/main.c
index 6b666a6c5364c9d5da64e2352bf5672118859835..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.21 2000/03/03 11:43:35 stelian Exp $";
+       "$Id: main.c,v 1.22 2000/03/08 10:51:29 stelian Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -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)