X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=compat%2Finclude%2Fbsdcompat.h;h=71ba0e2b1ff23c539ae5eafab27be63c9cbeee25;hb=d6967896bc4e18f9b4359a2ef5be5c0f1bcc456a;hp=8aad39790066845569e9338e6ec39c65d9a26e0e;hpb=ebcbe7f6c10482913b60fc792e72e494b439b242;p=dump.git

diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h
index 8aad397..71ba0e2 100644
--- a/compat/include/bsdcompat.h
+++ b/compat/include/bsdcompat.h
@@ -2,9 +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-2000
+ *	Stelian Pop <pop@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  *
- *	$Id: bsdcompat.h,v 1.9 2000/01/21 10:17:41 stelian Exp $
+ *	$Id: bsdcompat.h,v 1.13 2000/12/21 11:14:53 stelian Exp $
  */
 
 #include <config.h>
@@ -101,6 +102,7 @@ struct dinode {
 #define di_rdev		di_db[0]
 /* #define di_ouid		di_uid */
 /* #define di_ogid		di_gid */
+#define di_size_high	di_dir_acl
 
 /*
  * This is the ext2_dir_entry structure but the fields have been renamed
@@ -131,18 +133,30 @@ struct dinode {
 #define d_fileno d_ino
 #endif
 
-struct direct {
+/*
+ * This is the direct structure used by dump. In needs to be
+ * different from direct because linux dump generates only
+ * 'old inode format' dumps. And BSD supposes that the old
+ * inode dumps have the d_namelen field written in machine byte
+ * order...
+ */
+struct olddirect {
 	__u32	d_ino;
 	__u16	d_reclen;
-#if 1
-	__u8	d_namlen;
-	__u8	d_type;
-#else
 	__u16	d_namlen;
-#endif
-	char		d_name[MAXNAMLEN + 1];
+	char	d_name[MAXNAMLEN + 1];
 };
 
+/*
+ * The direct structure used by restore.
+ */
+struct direct {
+	__u32	d_ino;
+	__u16	d_reclen;
+	__u8	d_type;
+	__u8	d_namlen;
+	char	d_name[MAXNAMLEN + 1];
+};
 /*
  * Convert between stat structure types and directory types.
  */