X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=compat%2Finclude%2Fprotocols%2Fdumprestore.h;h=2c3a945fc851ad88c76a0d45724cd6d7b769057e;hb=e51470bfc05d83f82c37d24504220c7163bbd4c1;hp=72e999aa6fc5c361a789b138869d19557c81f9c0;hpb=b45f51d61e911ac8a040bef1efda6afd82261e03;p=dump.git

diff --git a/compat/include/protocols/dumprestore.h b/compat/include/protocols/dumprestore.h
index 72e999a..2c3a945 100644
--- a/compat/include/protocols/dumprestore.h
+++ b/compat/include/protocols/dumprestore.h
@@ -2,8 +2,10 @@
  *	Ported to Linux's Second Extended File System as part of the
  *	dump and restore backup suit
  *	Remy Card <card@Linux.EU.Org>, 1994-1997
- *      Stelian Pop <pop@cybercable.fr>, 1999
+ *	Stelian Pop <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
+ *	$Id: dumprestore.h,v 1.16 2002/01/25 14:59:53 stelian Exp $
  */
 
 /*
@@ -42,13 +44,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)dumprestore.h	8.2 (Berkeley) 1/21/94
  */
 
 #ifndef _PROTOCOLS_DUMPRESTORE_H_
 #define _PROTOCOLS_DUMPRESTORE_H_
 
+#include <config.h>
+
 /*
  * TP_BSIZE is the size of file blocks on the dump tapes.
  * Note that TP_BSIZE must be a multiple of DEV_BSIZE.
@@ -65,6 +67,7 @@
 #define NTREC   	10
 #define HIGHDENSITYTREC	32
 #define TP_NINDIR	(TP_BSIZE/2)
+#define TP_NINOS	(TP_NINDIR / sizeof (int32_t))
 #define LBLSIZE		16
 #define NAMELEN		64
 
@@ -72,15 +75,22 @@
 #define NFS_MAGIC   	(int)60012
 #define CHECKSUM	(int)84446
 
+typedef u_int32_t	dump_ino_t;
+
+union u_data {
+	char	s_addrs[TP_NINDIR];	/* 1 => data; 0 => hole in inode */
+	int32_t	s_inos[TP_NINOS];	/* table of first inode on each volume */
+} u_data;
+
 union u_spcl {
 	char dummy[TP_BSIZE];
 	struct	s_spcl {
 		int32_t	c_type;		    /* record type (see below) */
-		time_t	c_date;		    /* date of this dump */
-		time_t	c_ddate;	    /* date of previous dump */
+		int32_t	c_date;		    /* date of this dump */
+		int32_t	c_ddate;	    /* date of previous dump */
 		int32_t	c_volume;	    /* dump volume number */
 		daddr_t	c_tapea;	    /* logical block of this record */
-		ino_t	c_inumber;	    /* number of inode */
+		dump_ino_t c_inumber;	    /* number of inode */
 		int32_t	c_magic;	    /* magic number (see above) */
 		int32_t	c_checksum;	    /* record checksum */
 #ifdef	__linux__
@@ -89,7 +99,7 @@ union u_spcl {
 		struct	dinode	c_dinode;   /* ownership and mode of inode */
 #endif
 		int32_t	c_count;	    /* number of valid c_addr entries */
-		char	c_addr[TP_NINDIR];  /* 1 => data; 0 => hole in inode */
+		union u_data c_data;	    /* see above */
 		char	c_label[LBLSIZE];   /* dump label */
 		int32_t	c_level;	    /* level of this dump */
 		char	c_filesys[NAMELEN]; /* name of dumpped file system */
@@ -97,10 +107,14 @@ 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 */
-		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
+#define c_addr c_data.s_addrs
+#define c_inos c_data.s_inos
+
 /*
  * special record types
  */
@@ -116,9 +130,22 @@ union u_spcl {
  */
 #define DR_NEWHEADER	0x0001	/* new format tape header */
 #define DR_NEWINODEFMT	0x0002	/* new format inodes on tape */
+#define DR_COMPRESSED	0x0080	/* dump tape is compressed */
+#define DR_INODEINFO	0x0002	/* TS_END header contains c_inos information */
+
+
+/*
+ * compression flags for the tapebuf header.
+ */
+#define COMPRESS_ZLIB	0
+#define COMPRESS_BZLIB	1
 
-#define	DUMPOUTFMT	"%-16s %c %s"		/* for printf */
-						/* name, level, ctime(date) */
-#define	DUMPINFMT	"%16s %c %[^\n]\n"	/* inverse for scanf */
+/* used for compressed dump tapes */
+struct tapebuf {
+	unsigned int	compressed:1;
+	unsigned int	flags:3;
+	unsigned int	length:28;
+	char		buf[0];	/* the data */
+};
 
 #endif /* !_DUMPRESTORE_H_ */