Made restore able to understand extra TS_ADDR headers when ufsdump dumped inodes...

diff --git a/CHANGES b/CHANGES
index d17b090f281a62195d1b40b4e02048b6f7c4d53b..9c18c539e35a76e95f14b4866588b48a340731dd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.168 2002/03/27 16:48:38 stelian Exp $
+$Id: CHANGES,v 1.169 2002/03/28 14:53:01 stelian Exp $
 
 Changes between versions 0.4b27 and 0.4b28 (released ?????????????????)
 =======================================================================
@@ -32,6 +32,13 @@ Changes between versions 0.4b27 and 0.4b28 (released ?????????????????)
        open the output file for writing. Thanks to Amith Varghese
        <amithv@yahoo.com> for reporting this bug.
 
+7.     Made restore able to understand large Solaris ufsdump tapes 
+       (containing inodes bigger than 4194304). Sun have introduced
+       an "extension" to the dump tape format when dealing with
+       those inodes, which was uncorrectly handled by Linux restore.
+       Thanks to Uwe Gohlke <uwe@ugsoft.de> for reporting the bug and
+       providing a test case.
+
 Changes between versions 0.4b26 and 0.4b27 (released February 15, 2002)
 =======================================================================
 

diff --git a/restore/tape.c b/restore/tape.c
index b6d27f7a691060a9656337bcab4c1e6ca6da353c..43ce99eaddf42ec9bc0b50fb9102a588f4134df6 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.58 2002/02/04 11:18:46 stelian Exp $";
+       "$Id: tape.c,v 1.59 2002/03/28 14:53:01 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -175,6 +175,7 @@ static void xtrcmpskip __P((char *, size_t));
 #endif
 
 static int readmapflag;
+static int readingmaps;                /* set to 1 while reading the maps */
 
 /*
  * Set up an input source. This is called from main.c before setup() is.
@@ -360,18 +361,33 @@ setup(void)
                Dprintf(stdout, "header read failed at %ld blocks\n", (long)blksread);
                panic("no header after volume mark!\n");
        }
+       readingmaps = 1;
        findinode(&spcl);
        if (spcl.c_type != TS_CLRI)
                errx(1, "Cannot find file removal list");
        maxino = (spcl.c_count * TP_BSIZE * NBBY) + 1;
-       Dprintf(stdout, "maxino = %ld\n", (long)maxino);
        map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
        if (map == NULL)
                errx(1, "no memory for active inode map");
        usedinomap = map;
        curfile.action = USING;
        getfile(xtrmap, xtrmapskip);
-       findinode(&spcl);
+       while (spcl.c_type == TS_ADDR) {
+               /* Recompute maxino and the map */
+               char *oldmap = usedinomap;
+               dump_ino_t oldmaxino = maxino;
+               maxino += (spcl.c_count * TP_BSIZE * NBBY) + 1;
+               map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
+               if (map == NULL)
+                       errx(1, "no memory for active inode map");
+               usedinomap = map;
+               memcpy(usedinomap, oldmap, howmany(oldmaxino, NBBY));
+               free(oldmap);
+
+               spcl.c_dinode.di_size = spcl.c_count * TP_BSIZE;
+               getfile(xtrmap, xtrmapskip);
+       }
+       Dprintf(stdout, "maxino = %lu\n", (unsigned long)maxino);
        if (spcl.c_type != TS_BITS)
                errx(1, "Cannot find file dump list");
        map = calloc((unsigned)1, (unsigned)howmany(maxino, NBBY));
@@ -380,6 +396,10 @@ setup(void)
        dumpmap = map;
        curfile.action = USING;
        getfile(xtrmap, xtrmapskip);
+       while (spcl.c_type == TS_ADDR) {
+               spcl.c_dinode.di_size = spcl.c_count * TP_BSIZE;
+               getfile(xtrmap, xtrmapskip);
+       }
        /*
         * If there may be whiteout entries on the tape, pretend that the
         * whiteout inode exists, so that the whiteout entries can be
@@ -387,6 +407,7 @@ setup(void)
         */
        if (oldinofmt == 0)
                SETINO(WINO, dumpmap);
+       readingmaps = 0;
        findinode(&spcl);
 }
 
@@ -946,7 +967,8 @@ loop:
        if (last_write_was_hole) {
                FTRUNCATE(ofile, origsize);
        }
-       findinode(&spcl);
+       if (!readingmaps) 
+               findinode(&spcl);
        gettingfile = 0;
 }