Another set of compression patches from Jerry.

diff --git a/compat/include/protocols/dumprestore.h b/compat/include/protocols/dumprestore.h
index a2750cde08c2f9c413879821fe5992581ad1054a..885b9e038415d5a5bc886481b016d3569844d7c0 100644 (file)
--- a/compat/include/protocols/dumprestore.h
+++ b/compat/include/protocols/dumprestore.h
@@ -5,7 +5,7 @@
  *      Stelian Pop <pop@noos.fr>, 1999-2000
  *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  *
  *      Stelian Pop <pop@noos.fr>, 1999-2000
  *     Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  *

- *     $Id: dumprestore.h,v 1.12 2001/03/20 10:02:48 stelian Exp $
+ *     $Id: dumprestore.h,v 1.13 2001/05/12 11:36:12 stelian Exp $

  */
 
 /*
  */
 
 /*


@@ -101,7 +101,8 @@ union u_spcl {
                char    c_host[NAMELEN];    /* name of dumpped host */
                int32_t c_flags;            /* additional information */
                int32_t c_firstrec;         /* first record on volume */
                char    c_host[NAMELEN];    /* name of dumpped host */
                int32_t c_flags;            /* additional information */
                int32_t c_firstrec;         /* first record on volume */

-               int32_t c_spare[32];        /* reserved for future uses */
+               int32_t c_ntrec;            /* blocksize on volume */
+               int32_t c_spare[31];        /* reserved for future uses */

        } s_spcl;
 } u_spcl;
 #define spcl u_spcl.s_spcl
        } s_spcl;
 } u_spcl;
 #define spcl u_spcl.s_spcl

diff --git a/dump.spec b/dump.spec
index 032ab05f9a63199a67fe83b77def211674be02bf..ce128e7adcac7ba6be42824504bc1a4eced51177 100644 (file)
--- a/dump.spec
+++ b/dump.spec
@@ -1,6 +1,6 @@
 %define        _sbindir /sbin
 # XXX --enable-kerberos                needs krcmd
 %define        _sbindir /sbin
 # XXX --enable-kerberos                needs krcmd

-%define        myoptions --with-binmode=6755 --with-manowner=root --with-mangrp=root --with-manmode=0644 --with-dumpdates="%{_sysconfdir}/dumpdates" --enable-readline --enable-largefile
+%define        myoptions --with-binmode=6755 --with-manowner=root --with-mangrp=root --with-manmode=0644 --with-dumpdates="%{_sysconfdir}/dumpdates" --enable-readline --enable-largefile --enable-qfa

 
 Summary: Programs for backing up and restoring filesystems.
 Name: dump
 
 Summary: Programs for backing up and restoring filesystems.
 Name: dump

diff --git a/dump/tape.c b/dump/tape.c
index 1464812010f5f3f74ebe043796651115d05ed69c..3f2ae89a651bedf6f37189240cc2b5ff8352b09f 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.45 2001/04/27 15:22:47 stelian Exp $";
+       "$Id: tape.c,v 1.46 2001/05/12 11:36:12 stelian Exp $";

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


@@ -888,6 +888,7 @@ restore_check_point:
                spcl.c_volume++;
                spcl.c_type = TS_TAPE;
                spcl.c_flags |= DR_NEWHEADER;
                spcl.c_volume++;
                spcl.c_type = TS_TAPE;
                spcl.c_flags |= DR_NEWHEADER;

+               spcl.c_ntrec = ntrec;

                if (compressed)
                        spcl.c_flags |= DR_COMPRESSED;
                writeheader((dump_ino_t)slp->inode);
                if (compressed)
                        spcl.c_flags |= DR_COMPRESSED;
                writeheader((dump_ino_t)slp->inode);


@@ -1046,7 +1047,7 @@ doslave(int cmd, int slave_number)
        char *buffer;
 #ifdef HAVE_ZLIB
        struct tapebuf *comp_buf = NULL;
        char *buffer;
 #ifdef HAVE_ZLIB
        struct tapebuf *comp_buf = NULL;

-       int compresult, do_compress = 0;
+       int compresult, do_compress = slave_number > 0;

        unsigned long worklen;
 #endif /* HAVE_ZLIB */
        struct slave_results returns;
        unsigned long worklen;
 #endif /* HAVE_ZLIB */
        struct slave_results returns;


@@ -1119,24 +1120,24 @@ doslave(int cmd, int slave_number)
 
 #ifdef HAVE_ZLIB
                /* 
 
 #ifdef HAVE_ZLIB
                /* 

-                * When writing a compressed dump, each block is
-                * written from struct tapebuf with an 4 byte prefix
+                * When writing a compressed dump, each block except
+                * the first one on each tape is written
+                * from struct tapebuf with an 4 byte prefix

                 * followed by the data. This can be less than
                 * writesize. Restore, on a short read, can compare the
                 * length read to the compressed length in the header
                 * to verify that the read was good. Blocks which don't
                 * compress well are written uncompressed.
                 * followed by the data. This can be less than
                 * writesize. Restore, on a short read, can compare the
                 * length read to the compressed length in the header
                 * to verify that the read was good. Blocks which don't
                 * compress well are written uncompressed.

-                * The first block written by each slave is not compressed.
+                * The first block written by each slave is not compressed
+                * and does not have a prefix.

                 */
 
                 */
 

-               if (compressed) {
+               if (compressed && do_compress) {

                        comp_buf->length = bufsize;
                        worklen = TP_BSIZE + writesize;
                        comp_buf->length = bufsize;
                        worklen = TP_BSIZE + writesize;

-                       compresult = Z_DATA_ERROR;
-                       if (do_compress)
-                               compresult = compress2(comp_buf->buf, &worklen,
-                                       (char *)slp->tblock[0], writesize, compressed);
-                       if (compresult == Z_OK && worklen <= writesize-32) {
+                       compresult = compress2(comp_buf->buf, &worklen,
+                               (char *)slp->tblock[0], writesize, compressed);
+                       if (compresult == Z_OK && worklen <= (writesize - 16)) {

                                /* write the compressed buffer */
                                comp_buf->length = worklen;
                                comp_buf->compressed = 1;
                                /* write the compressed buffer */
                                comp_buf->length = worklen;
                                comp_buf->compressed = 1;


@@ -1153,7 +1154,7 @@ doslave(int cmd, int slave_number)
                                memcpy(comp_buf->buf, (char *)slp->tblock[0], writesize);
                        }
                }
                                memcpy(comp_buf->buf, (char *)slp->tblock[0], writesize);
                        }
                }

-               /* compress the remaining blocks */
+               /* compress the remaining blocks if we're compressing */

                do_compress = compressed;
 #endif /* HAVE_ZLIB */
 
                do_compress = compressed;
 #endif /* HAVE_ZLIB */
 

diff --git a/restore/symtab.c b/restore/symtab.c
index 4cabfb567bc0b44401089640e7a03bee9a05b2ad..2e157f4ab4814903bf1f044bdcafc46ca625234f 100644 (file)
--- a/restore/symtab.c
+++ b/restore/symtab.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: symtab.c,v 1.14 2001/04/24 10:59:13 stelian Exp $";
+       "$Id: symtab.c,v 1.15 2001/05/12 11:36:12 stelian Exp $";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -449,6 +449,7 @@ struct symtableheader {
        time_t  dumpdate;
        dump_ino_t maxino;
        int32_t ntrec;
        time_t  dumpdate;
        dump_ino_t maxino;
        int32_t ntrec;

+       int32_t zflag;

 };
 
 /*
 };
 
 /*


@@ -527,6 +528,7 @@ dumpsymtable(char *filename, long checkpt)
        hdr.dumptime = dumptime;
        hdr.dumpdate = dumpdate;
        hdr.ntrec = ntrec;
        hdr.dumptime = dumptime;
        hdr.dumpdate = dumpdate;
        hdr.ntrec = ntrec;

+       hdr.zflag = zflag;

        (void) fwrite((char *)&hdr, sizeof(struct symtableheader), 1, fd);
        if (ferror(fd)) {
                warn("fwrite");
        (void) fwrite((char *)&hdr, sizeof(struct symtableheader), 1, fd);
        if (ferror(fd)) {
                warn("fwrite");


@@ -596,6 +598,7 @@ initsymtable(char *filename)
                curfile.action = SKIP;
                dumptime = hdr.dumptime;
                dumpdate = hdr.dumpdate;
                curfile.action = SKIP;
                dumptime = hdr.dumptime;
                dumpdate = hdr.dumpdate;

+               zflag = hdr.zflag;

                if (!bflag)
                        newtapebuf(hdr.ntrec);
                getvol(hdr.volno);
                if (!bflag)
                        newtapebuf(hdr.ntrec);
                getvol(hdr.volno);

diff --git a/restore/tape.c b/restore/tape.c
index f5a8d556b9f2299d7b34057aa2dd5ea4c55715f6..5fac380f1024641b4969e204f83e9961a9706f79 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.37 2001/04/27 15:22:47 stelian Exp $";
+       "$Id: tape.c,v 1.38 2001/05/12 11:36:12 stelian Exp $";

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


@@ -141,9 +141,10 @@ static void         xtrlnkskip __P((char *, size_t));
 static void     xtrmap __P((char *, size_t));
 static void     xtrmapskip __P((char *, size_t));
 static void     xtrskip __P((char *, size_t));
 static void     xtrmap __P((char *, size_t));
 static void     xtrmapskip __P((char *, size_t));
 static void     xtrskip __P((char *, size_t));

+static void     setmagtapein __P((void));

 
 #ifdef HAVE_ZLIB
 
 #ifdef HAVE_ZLIB

-static void    newcomprbuf __P((long));
+static void    newcomprbuf __P((int));

 static void    readtape_set __P((char *));
 static void    readtape_uncompr __P((char *));
 static void    readtape_comprfile __P((char *));
 static void    readtape_set __P((char *));
 static void    readtape_uncompr __P((char *));
 static void    readtape_comprfile __P((char *));


@@ -231,11 +232,12 @@ newtapebuf(long size)
 
 #ifdef HAVE_ZLIB
 static void
 
 #ifdef HAVE_ZLIB
 static void

-newcomprbuf(long size)
+newcomprbuf(int size)

 {
 {

-       if (size <= comprlen)
+       size_t buf_size = (size+1) * TP_BSIZE + sizeof(struct tapebuf);
+       if (buf_size <= comprlen)

                return;
                return;

-       comprlen = size + sizeof(struct tapebuf);
+       comprlen = buf_size;

        if (comprbuf != NULL)
                free(comprbuf);
        comprbuf = malloc(comprlen);
        if (comprbuf != NULL)
                free(comprbuf);
        comprbuf = malloc(comprlen);


@@ -253,7 +255,6 @@ setup(void)
 {
        int i, j, *ip;
        struct STAT stbuf;
 {
        int i, j, *ip;
        struct STAT stbuf;

-       struct mtget mt_stat;

 
        Vprintf(stdout, "Verify tape and initialize maps\n");
 #ifdef RRESTORE
 
        Vprintf(stdout, "Verify tape and initialize maps\n");
 #ifdef RRESTORE


@@ -268,22 +269,7 @@ setup(void)
        if (mt < 0)
                err(1, "%s", magtape);
        volno = 1;
        if (mt < 0)
                err(1, "%s", magtape);
        volno = 1;

-       if (!pipein) {
-               /* need to know if input is really from a tape */
-#ifdef RRESTORE
-               if (host)
-                       magtapein = rmtioctl(MTNOP, 1) != -1;
-               else
-#endif
-                       if (ioctl(mt, MTIOCGET, (char *) &mt_stat) == 0) {
-                               if (mt_stat.mt_dsreg & 0xffff)
-                                       magtapein = 1; /* fixed blocksize */
-                               else
-                                       magtapein = 2; /* variable blocksize */
-                       }
-       }
-
-       Vprintf(stdout,"Input is from %s\n", magtapein? "tape": "file/pipe");
+       setmagtapein();

        setdumpnum();
        FLUSHTAPEBUF();
        findtapeblksize();
        setdumpnum();
        FLUSHTAPEBUF();
        findtapeblksize();


@@ -300,7 +286,7 @@ setup(void)
        if (zflag) {
                fprintf(stderr, "Dump tape is compressed.\n");
 #ifdef HAVE_ZLIB
        if (zflag) {
                fprintf(stderr, "Dump tape is compressed.\n");
 #ifdef HAVE_ZLIB

-               newcomprbuf(bufsize);
+               newcomprbuf(ntrec);

 #else
                errx(1,"This restore version doesn't support decompression");
 #endif /* HAVE_ZLIB */
 #else
                errx(1,"This restore version doesn't support decompression");
 #endif /* HAVE_ZLIB */


@@ -480,6 +466,7 @@ again:
                goto again;
        }
 gethdr:
                goto again;
        }
 gethdr:

+       setmagtapein();

        volno = newvol;
        setdumpnum();
        FLUSHTAPEBUF();
        volno = newvol;
        setdumpnum();
        FLUSHTAPEBUF();


@@ -1298,6 +1285,7 @@ readtape_set(char *buf)
        if (!zflag) 
                readtape_func = readtape_uncompr;
        else {
        if (!zflag) 
                readtape_func = readtape_uncompr;
        else {

+               newcomprbuf(ntrec);

                if (magtapein)
                        readtape_func = readtape_comprtape;
                else
                if (magtapein)
                        readtape_func = readtape_comprtape;
                else


@@ -1700,13 +1688,14 @@ msg_read_error(char *m)
 #endif /* HAVE_ZLIB */
 
 /*
 #endif /* HAVE_ZLIB */
 
 /*

- * Read the first block and set the blocksize from its length. Test
- * if the block looks like a compressed dump tape. setup() will make
- * the final determination by checking the compressed flag if gethead()
+ * Read the first block and get the blocksize from it. Test
+ * for a compressed dump tape/file. setup() will make the final
+ * determination by checking the compressed flag if gethead()

  * finds a valid header. The test here is necessary to offset the buffer
  * by the size of the compressed prefix. zflag is set here so that
  * readtape_set can set the correct function pointer for readtape().
  * finds a valid header. The test here is necessary to offset the buffer
  * by the size of the compressed prefix. zflag is set here so that
  * readtape_set can set the correct function pointer for readtape().

- * Note that the first block of each tape/file will not be compressed.
+ * Note that the first block of each tape/file is not compressed
+ * and does not have a prefix.

  */ 
 static void
 findtapeblksize(void)
  */ 
 static void
 findtapeblksize(void)


@@ -1714,7 +1703,7 @@ findtapeblksize(void)
        long i;
        size_t len;
        struct tapebuf *tpb = (struct tapebuf *) tapebuf;
        long i;
        size_t len;
        struct tapebuf *tpb = (struct tapebuf *) tapebuf;

-       struct s_spcl *spclpt = (struct s_spcl *) tpb->buf;
+       struct s_spcl *spclpt = (struct s_spcl *) tapebuf;

 
        for (i = 0; i < ntrec; i++)
                ((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;
 
        for (i = 0; i < ntrec; i++)
                ((struct s_spcl *)&tapebuf[i * TP_BSIZE])->c_magic = 0;


@@ -1724,67 +1713,57 @@ findtapeblksize(void)
         * For a pipe or file, read in the first record. For a tape, read
         * the first block.
         */
         * For a pipe or file, read in the first record. For a tape, read
         * the first block.
         */

-       if (magtapein == 1)     /* fixed blocksize tape, not compressed */
-               len = ntrec * TP_BSIZE;
-       else if (magtapein == 2)/* variable blocksize tape */
-               len = bufsize + PREFIXSIZE;
-       else                    /* not mag tape */
-               len = TP_BSIZE;
+       len = magtapein ? ntrec * TP_BSIZE : TP_BSIZE;

 
        if (read_a_block(mt, tapebuf, len, &i) <= 0)
                errx(1, "Tape read error on first record");
 
        /*
         * If the input is from a file or a pipe, we read TP_BSIZE
 
        if (read_a_block(mt, tapebuf, len, &i) <= 0)
                errx(1, "Tape read error on first record");
 
        /*
         * If the input is from a file or a pipe, we read TP_BSIZE

-        * bytes looking for a compressed dump header, we then
-        * need to read in the rest of the record, as determined by
-        * tpb->length or bufsize. The first block of the dump is
-        * guaranteed to not be compressed so we look at the header.
+        * bytes looking for a dump header. If the dump is compressed
+        * we need to read in the rest of the block, as determined
+        * by c_ntrec in the dump header. The first block of the
+        * dump is not compressed and does not have a prefix.

         */
        if (!magtapein) {
         */
        if (!magtapein) {

-               if (tpb->length % TP_BSIZE == 0
-                   && tpb->length <= bufsize
-                   && tpb->compressed == 0
-                   && spclpt->c_type == TS_TAPE 
+               if (spclpt->c_type == TS_TAPE

                    && spclpt->c_flags & DR_COMPRESSED) {
                    && spclpt->c_flags & DR_COMPRESSED) {

-                       /* Looks like it's a compressed dump block prefix, */
-                       /* read in the rest of the block based on tpb->length. */
-                       len = tpb->length - TP_BSIZE + PREFIXSIZE;
-                       if (read_a_block(mt, tapebuf+TP_BSIZE, len, &i) <= 0
-                           || i != len)
-                               errx(1,"Error reading dump file header");
-                       tbufptr = tpb->buf;
-                       numtrec = ntrec = tpb->length / TP_BSIZE;
+                       /* It's a compressed dump file, read in the */
+                       /* rest of the block based on spclpt->c_ntrec. */
+                       if (spclpt->c_ntrec > ntrec)
+                               errx(1, "Tape blocksize is too large, use "
+                                    "\'-b %d\' ", spclpt->c_ntrec);
+                       ntrec = spclpt->c_ntrec;
+                       len = (ntrec - 1) * TP_BSIZE;

                        zflag = 1;   
                }
                else {
                        /* read in the rest of the block based on bufsize */
                        len = bufsize - TP_BSIZE;
                        zflag = 1;   
                }
                else {
                        /* read in the rest of the block based on bufsize */
                        len = bufsize - TP_BSIZE;

-                       if (read_a_block(mt, tapebuf+TP_BSIZE, len, &i) < 0
-                           || (i != len && i % TP_BSIZE != 0))
-                               errx(1,"Error reading dump file header");
-                       tbufptr = tapebuf;
-                       numtrec = ntrec;

                }
                }

+               if (read_a_block(mt, tapebuf+TP_BSIZE, len, &i) < 0
+                   || (i != len && i % TP_BSIZE != 0))
+                       errx(1,"Error reading dump file header");
+               tbufptr = tapebuf;
+               numtrec = ntrec;

                Vprintf(stdout, "Input block size is %ld\n", ntrec);
                return;
                Vprintf(stdout, "Input block size is %ld\n", ntrec);
                return;

-       }
+       } /* if (!magtapein) */

 
        /*
 
        /*

-        * If the input is a variable block size tape, we tried to
-        * read PREFIXSIZE + ntrec * TP_BSIZE bytes. 
-        * If it's not a compressed dump tape or the value of ntrec is 
-        * too large, we have read less than * what we asked for; 
-        * adjust the value of ntrec and test for * a compressed dump 
-        * tape prefix.
+        * If the input is a tape, we tried to read ntrec * TP_BSIZE bytes.
+        * If the value of ntrec is too large, we read less than
+        * what we asked for; adjust the value of ntrec and test for 
+        * a compressed dump tape.

         */
 
        if (i % TP_BSIZE != 0) {
         */
 
        if (i % TP_BSIZE != 0) {

+               /* may be old format compressed dump tape with a prefix */
+               spclpt = (struct s_spcl *) tpb->buf;

                if (i % TP_BSIZE == PREFIXSIZE
                    && tpb->compressed == 0
                    && spclpt->c_type == TS_TAPE
                    && spclpt->c_flags & DR_COMPRESSED) {
                if (i % TP_BSIZE == PREFIXSIZE
                    && tpb->compressed == 0
                    && spclpt->c_type == TS_TAPE
                    && spclpt->c_flags & DR_COMPRESSED) {

-

                        zflag = 1;
                        tbufptr = tpb->buf;
                        if (tpb->length > bufsize)
                        zflag = 1;
                        tbufptr = tpb->buf;
                        if (tpb->length > bufsize)


@@ -1796,6 +1775,13 @@ findtapeblksize(void)
                                i, TP_BSIZE);
        }
        ntrec = i / TP_BSIZE;
                                i, TP_BSIZE);
        }
        ntrec = i / TP_BSIZE;

+       if (spclpt->c_type == TS_TAPE) {
+               if (spclpt->c_flags & DR_COMPRESSED)
+                       zflag = 1;
+               if (spclpt->c_ntrec > ntrec)
+                       errx(1, "Tape blocksize is too large, use "
+                               "\'-b %d\' ", spclpt->c_ntrec);
+       }

        numtrec = ntrec;
        Vprintf(stdout, "Tape block size is %ld\n", ntrec);
 }
        numtrec = ntrec;
        Vprintf(stdout, "Tape block size is %ld\n", ntrec);
 }


@@ -1841,6 +1827,26 @@ closemt(void)
                (void) close(mt);
 }
 
                (void) close(mt);
 }
 

+static void
+setmagtapein(void) {
+       struct mtget mt_stat;
+       static int done = 0;
+       if (done)
+               return;
+       done = 1;
+       if (!pipein) {
+               /* need to know if input is really from a tape */
+#ifdef RRESTORE
+               if (host)
+                       magtapein = rmtioctl(MTNOP, 1) != -1;
+               else
+#endif
+                       magtapein = ioctl(mt, MTIOCGET, (char *)&mt_stat) == 0;
+       }
+
+       Vprintf(stdout,"Input is from %s\n", magtapein? "tape": "file/pipe");
+}
+

 /*
  * Read the next block from the tape.
  * Check to see if it is one of several vintage headers.
 /*
  * Read the next block from the tape.
  * Check to see if it is one of several vintage headers.