X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=compat%2Finclude%2Fprotocols%2Fdumprestore.h;h=54bc19071de249d14b3b3badcab05db33d68eb19;hb=cc7747ebe3cb5b31e059155a8bb1ee4cecc67236;hp=d9e72fe0e5e69fd028375c94e5e2ba7fa1c870fc;hpb=0cedbda5e645e6a30ef47fa3e0fae683160d4431;p=dump.git

diff --git a/compat/include/protocols/dumprestore.h b/compat/include/protocols/dumprestore.h
index d9e72fe..54bc190 100644
--- a/compat/include/protocols/dumprestore.h
+++ b/compat/include/protocols/dumprestore.h
@@ -5,7 +5,7 @@
  *	Stelian Pop <stelian@popies.net>, 1999-2000
  *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *	$Id: dumprestore.h,v 1.17 2002/04/04 08:20:23 stelian Exp $
+ *	$Id: dumprestore.h,v 1.21 2004/04/13 13:03:55 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.
  *
@@ -73,9 +69,16 @@
 
 #define OFS_MAGIC   	(int)60011
 #define NFS_MAGIC   	(int)60012
+#define FS_UFS2_MAGIC   (int)0x19540119
 #define CHECKSUM	(int)84446
 
+#ifdef __linux__
 typedef u_int32_t	dump_ino_t;
+#endif
+
+#ifdef sunos
+typedef unsigned int	dump_ino_t;
+#endif
 
 union u_data {
 	char	s_addrs[TP_NINDIR];	/* 1 => data; 0 => hole in inode */
@@ -95,8 +98,12 @@ union u_spcl {
 		int32_t	c_checksum;	    /* record checksum */
 #ifdef	__linux__
 		struct	new_bsd_inode c_dinode;
+#else
+#ifdef sunos
+		struct	new_bsd_inode c_dinode;
 #else
 		struct	dinode	c_dinode;   /* ownership and mode of inode */
+#endif
 #endif
 		int32_t	c_count;	    /* number of valid c_addr entries */
 		union u_data c_data;	    /* see above */
@@ -108,7 +115,8 @@ union u_spcl {
 		int32_t	c_flags;	    /* additional information */
 		int32_t	c_firstrec;	    /* first record on volume */
 		int32_t	c_ntrec;	    /* blocksize on volume */
-		int32_t	c_spare[31];	    /* reserved for future uses */
+                int32_t	c_extattributes;    /* additional inode info */
+                int32_t	c_spare[30];	    /* reserved for future uses */
 	} s_spcl;
 } u_spcl;
 #define spcl u_spcl.s_spcl
@@ -134,6 +142,15 @@ union u_spcl {
 #define DR_METAONLY	0x0100	/* only the metadata of the inode has
 				   been dumped */
 #define DR_INODEINFO	0x0002	/* TS_END header contains c_inos information */
+#define DR_EXTATTRIBUTES	0x8000
+
+/*
+ * extattributes inode info
+ */
+#define EXT_REGULAR		0
+#define EXT_MACOSFNDRINFO	1
+#define EXT_MACOSRESFORK	2
+#define EXT_ACL			3
 
 
 /*
@@ -141,13 +158,18 @@ union u_spcl {
  */
 #define COMPRESS_ZLIB	0
 #define COMPRESS_BZLIB	1
+#define COMPRESS_LZO	2
 
 /* used for compressed dump tapes */
 struct tapebuf {
 	unsigned int	compressed:1;
 	unsigned int	flags:3;
 	unsigned int	length:28;
+#ifdef sunos
+	char		buf;
+#else
 	char		buf[0];	/* the data */
+#endif
 };
 
 #endif /* !_DUMPRESTORE_H_ */