X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=compat%2Finclude%2Fprotocols%2Fdumprestore.h;h=73729b8336eba1b0a042e15d9451d95c41c848b7;hp=236912000dc5ea1999cd4cbc9ddfc44d334af6e6;hb=e1abc9ce25132eef1239047a071c2c1d4822dd9f;hpb=4d5ed2f38cb1dce0244a05f94c8aec7f725a1f33

diff --git a/compat/include/protocols/dumprestore.h b/compat/include/protocols/dumprestore.h
index 2369120..73729b8 100644
--- a/compat/include/protocols/dumprestore.h
+++ b/compat/include/protocols/dumprestore.h
@@ -2,10 +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@noos.fr>, 1999-2000
- *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ *	Stelian Pop <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *	$Id: dumprestore.h,v 1.10 2001/02/21 16:13:05 stelian Exp $
+ *	$Id: dumprestore.h,v 1.18 2003/03/30 15:40:34 stelian Exp $
  */
 
 /*
@@ -25,11 +25,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -67,6 +63,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
 
@@ -74,6 +71,13 @@
 #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 {
@@ -82,7 +86,7 @@ union u_spcl {
 		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__
@@ -91,7 +95,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 */
@@ -99,10 +103,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
  */
@@ -119,12 +127,23 @@ 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_METAONLY	0x0100	/* only the metadata of the inode has
+				   been dumped */
+#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
 
 /* used for compressed dump tapes */
 struct tapebuf {
-	int32_t	clen;	/* compressed length of data */
-	int32_t	unclen;	/* uncompressed length of data */
-	char	buf[0];	/* the data */
+	unsigned int	compressed:1;
+	unsigned int	flags:3;
+	unsigned int	length:28;
+	char		buf[0];	/* the data */
 };
 
 #endif /* !_DUMPRESTORE_H_ */