X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=compat%2Finclude%2Fbsdcompat.h;h=881f50582b725fb65987aa08e0b7b58483740751;hp=a29421e18a41825b064fe19ead6aa18981edf3dd;hb=11856e771fadee7ddb9b5a613c91f562bf363da7;hpb=b45f51d61e911ac8a040bef1efda6afd82261e03

diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h
index a29421e..881f505 100644
--- a/compat/include/bsdcompat.h
+++ b/compat/include/bsdcompat.h
@@ -2,12 +2,15 @@
  *	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: bsdcompat.h,v 1.16 2002/01/16 09:32:14 stelian Exp $
  */
 
 #include <config.h>
 #include <sys/time.h>
+#include <dirent.h>
 
 #define	__dead		volatile
 
@@ -19,7 +22,7 @@
 #define MIN(a,b)	((a < b) ? a : b)
 #endif
 
-#define	WINO		((ino_t)1)
+#define	WINO		1
 #define	DEV_BSIZE	512
 #define	DEV_BSHIFT	9
 #define	MAXBSIZE	EXT2_MAX_BLOCK_SIZE
@@ -57,10 +60,9 @@ typedef __u64		u_quad_t;
 /*
  * The BSD dump format reserves 4 bytes for a time_t, but other architectures
  * (notably axp) have larger time_t.  ctime4() is a modified ctime() which
- * always accepts short 4-byte times.  time4() is a similarly modified time().
+ * always accepts short 4-byte times.
  */
 #define ctime4(timep) ({ time_t t = *(timep); ctime(&t); })
-#define time4(timep) ({time_t t; t = time(0); if (timep) *timep=t; t; })
 
 /*
  * This is the ext2_inode structure but the fields have been renamed
@@ -99,6 +101,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
@@ -107,23 +110,14 @@ struct dinode {
  * This is the 4.4BSD directory entry structure
  */
 #define DIRBLKSIZ	DEV_BSIZE
+#ifndef MAXNAMLEN
 #define MAXNAMLEN	255
-
-struct direct {
-	__u32	d_ino;
-	__u16	d_reclen;
-#if 1
-	__u8	d_namlen;
-	__u8	d_type;
-#else
-	__u16	d_namlen;
 #endif
-	char		d_name[MAXNAMLEN + 1];
-};
 
 /*
- * File types
+ * For old libc.
  */
+#ifndef DT_UNKNOWN
 #define DT_UNKNOWN	 0
 #define DT_FIFO		 1
 #define DT_CHR		 2
@@ -132,8 +126,36 @@ struct direct {
 #define DT_REG		 8
 #define DT_LNK		10
 #define DT_SOCK		12
-#define	DT_WHT		14
+#endif
+
+#ifndef d_fileno
+#define d_fileno d_ino
+#endif
 
+/*
+ * 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;
+	__u16	d_namlen;
+	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.
  */
@@ -205,6 +227,11 @@ struct old_bsd_inode {
 	__u32		di_spare[4];
 };
 
+struct bsdtimeval {    /* XXX alpha-*-linux is deviant */
+	__u32   tv_sec;
+	__u32   tv_usec;
+};
+
 /*
  * This is the new (4.4) BSD inode structure
  * copied from the FreeBSD 2.0 <ufs/ufs/dinode.h> include file
@@ -217,9 +244,9 @@ struct new_bsd_inode {
 		__u32		inumber;
 	}		di_u;
 	u_quad_t	di_size;
-	struct timeval	di_atime;
-	struct timeval	di_mtime;
-	struct timeval	di_ctime;
+	struct bsdtimeval	di_atime;
+	struct bsdtimeval	di_mtime;
+	struct bsdtimeval	di_ctime;
 	daddr_t		di_db[NDADDR];
 	daddr_t		di_ib[NIADDR];
 	__u32		di_flags;