Fix restore of files spanning on the first and second volumes of a dump.

[dump.git] / restore / tape.c

diff --git a/restore/tape.c b/restore/tape.c
index 3d673b62b740c9c1057e70a2ef6c3d0cd9dec469..b779fd72517dd904a17b3430cd2a8d90790e4081 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.92 2007/02/22 20:16:23 stelian Exp $";
+       "$Id: tape.c,v 1.93 2009/07/23 14:10:39 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -474,7 +474,6 @@ getvol(long nextvol)
        if (nextvol == 1) {
                tapesread = 0;
                gettingfile = 0;
        if (nextvol == 1) {
                tapesread = 0;
                gettingfile = 0;

-               tpblksread = 0;

                blksread = 0;
        }
        if (pipein) {
                blksread = 0;
        }
        if (pipein) {


@@ -1333,7 +1332,11 @@ loop:
                        break;
                }
        }
                        break;
                }
        }

-       if (gethead(&spcl) == GOOD && size > 0) {
+       while (gethead(&spcl) != GOOD) {
+               fprintf(stderr, "Incorrect block for %s at %ld blocks\n",
+                       curfile.name, (long)blksread);
+       }
+       if (size > 0) {

                if (spcl.c_type == TS_ADDR)
                        goto loop;
                Dprintf(stdout,
                if (spcl.c_type == TS_ADDR)
                        goto loop;
                Dprintf(stdout,