Fixed the looping problem in dump (deal with holes at the end of files).

diff --git a/CHANGES b/CHANGES
index 2ed2c17663794c80bd2350a3daa33d185a715554..94821f4bdf3bfb67f95d78852645f981bcd6e383 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.118 2001/06/18 11:07:45 stelian Exp $
+$Id: CHANGES,v 1.119 2001/07/18 08:50:58 stelian Exp $
 
 Changes between versions 0.4b22 and 0.4b23 (released ????????????)
 ==================================================================
@@ -18,6 +18,9 @@ Changes between versions 0.4b22 and 0.4b23 (released ????????????)
        positive passno or /etc/dumpdates in dump -w output.
        Patch submitted by Andreas Dilger <adilger@turbolinux.com>.
 
+5.     Fixed the looping problem in dump introduced in the 
+       previous version.
+
 Changes between versions 0.4b21 and 0.4b22 (released May 12, 2001)
 ==================================================================
 

diff --git a/dump/traverse.c b/dump/traverse.c
index df59305113a4288ca7b9b148099b9af8f87a6fe5..632a6a39d4350823cd042318a36b17dd41ff3fab 100644 (file)
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: traverse.c,v 1.34 2001/06/18 10:58:28 stelian Exp $";
+       "$Id: traverse.c,v 1.35 2001/07/18 08:50:58 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -921,8 +921,8 @@ dumpino(struct dinode *dp, dump_ino_t ino)
 
        ext2fs_block_iterate2(fs, (ext2_ino_t)ino, 0, NULL, dumponeblock, (void *)&bc);
        /* deal with holes at the end of the inode */
-       remaining = i_size - bc.next_block*sblock->fs_fsize;
-       if (remaining > 0) 
+       if (i_size > bc.next_block*sblock->fs_fsize) {
+               remaining = i_size - bc.next_block*sblock->fs_fsize;
                for (i = 0; i < howmany(remaining, sblock->fs_fsize); i++) {
                        bc.buf[bc.cnt++] = 0;
                        if (bc.cnt == bc.max) {
@@ -930,6 +930,7 @@ dumpino(struct dinode *dp, dump_ino_t ino)
                                bc.cnt = 0;
                        }
                }
+       }
        if (bc.cnt > 0) {
                blksout (bc.buf, bc.cnt, bc.ino);
        }