Fixed tape size calculation when compression is on.

diff --git a/CHANGES b/CHANGES
index 678487d35f15031227b95fc82b81d1aa71e783d0..1d7db5936a15b42d8069055439741fe4aacac90f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.182 2002/06/25 19:00:37 stelian Exp $
+$Id: CHANGES,v 1.183 2002/07/01 11:54:39 stelian Exp $
 
 Changes between versions 0.4b29 and 0.4b30 (released ????????????????)
 ======================================================================
@@ -11,6 +11,10 @@ Changes between versions 0.4b29 and 0.4b30 (released ????????????????)
 2.     Fixed a problem in restore when reading tapes written on big
        endian machines with very old versions of dump. The patch was
        contributed by George Helffrich <george@geology.bristol.ac.uk>.
+
+3.     Fixed the tape length calculation when using large tapes
+       and compression. Thanks to Georg Lippold 
+       <g_lippold@sourceforge.net> for reporting the bug.
        
 Changes between versions 0.4b28 and 0.4b29 (released June 8, 2002)
 ==================================================================

diff --git a/THANKS b/THANKS
index 4b20e6943a66d73bccdf991d83202f5d71014eef..88da77faf13ee5f1d8881a83bfcb4152455208b3 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.61 2002/06/25 19:00:37 stelian Exp $
+$Id: THANKS,v 1.62 2002/07/01 11:54:39 stelian Exp $
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
@@ -60,6 +60,7 @@ Klaus Kudielka                kkudielk@cacofonix.nt.tuwien.ac.at
 Thorsten Kukuk         kukuk@suse.de
 Florian La Roche       florian@jurix.jura.uni-sb.de
 Ambrose Li             acli@mingpaoxpress.com
+Georg Lippold          g_lippold@sourceforge.net
 Patrick J. LoPresti    patl@cag.lcs.mit.edu
 Greg Lutz              greglutz@ix.netcom.com
 Eric Maisonobe         virnet@nat.fr

diff --git a/dump/tape.c b/dump/tape.c
index 54b387eac62559d092a687ab18eca75d7a36a479..c6161bedbec52d4863d00af48831f349ec474f0b 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.68 2002/05/21 15:48:46 stelian Exp $";
+       "$Id: tape.c,v 1.69 2002/07/01 11:54:40 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -479,7 +479,7 @@ flushtape(void)
        blocksthisvol += ntrec;
        if (!pipeout && !unlimited) {
                if (blocksperfile) {
-                       if ( compressed ? (bytes_written - tapea_bytes + SLAVES * (writesize + sizeof(struct tapebuf))) >= blocksperfile * 1024
+                       if ( compressed ? (bytes_written - tapea_bytes + SLAVES * (writesize + sizeof(struct tapebuf))) >= (((long long)blocksperfile) * 1024)
                                        : blocksthisvol >= blocksperfile ) {
                                close_rewind();
                                startnewtape(0);