X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fdirs.c;h=b15b1d0a6d1282594b0752b2ba78bf45f05c7955;hp=eb90558ef7369819fa66eaaef4da5d86d2a3d5a1;hb=e4a8bde40a6d8319d1b28e054e1a419ba3df2363;hpb=d6967896bc4e18f9b4359a2ef5be5c0f1bcc456a

diff --git a/restore/dirs.c b/restore/dirs.c
index eb90558..b15b1d0 100644
--- a/restore/dirs.c
+++ b/restore/dirs.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: dirs.c,v 1.13 2000/12/21 11:14:54 stelian Exp $";
+	"$Id: dirs.c,v 1.15 2001/06/18 10:58:28 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -55,7 +55,11 @@ static const char rcsid[] =
 #include <sys/stat.h>
 
 #ifdef	__linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #else	/* __linux__ */
 #include <ufs/ufs/dinode.h>
@@ -87,7 +91,7 @@ static const char rcsid[] =
 #define INOHASH(val) (val % HASHSIZE)
 struct inotab {
 	struct	inotab *t_next;
-	ino_t	t_ino;
+	dump_ino_t t_ino;
 	int32_t	t_seekpt;
 	int32_t	t_size;
 };
@@ -97,7 +101,7 @@ static struct inotab *inotab[HASHSIZE];
  * Information retained about directories.
  */
 struct modeinfo {
-	ino_t ino;
+	dump_ino_t ino;
 	struct timeval timep[2];
 	mode_t mode;
 	uid_t uid;
@@ -137,19 +141,19 @@ struct odirect {
 };
 
 #ifdef	__linux__
-static struct inotab	*allocinotab __P((ino_t, struct new_bsd_inode *, long));
+static struct inotab	*allocinotab __P((dump_ino_t, struct new_bsd_inode *, long));
 #else
-static struct inotab	*allocinotab __P((ino_t, struct dinode *, long));
+static struct inotab	*allocinotab __P((dump_ino_t, struct dinode *, long));
 #endif
 static void		 dcvt __P((struct odirect *, struct direct *));
 static void		 flushent __P((void));
-static struct inotab	*inotablookup __P((ino_t));
+static struct inotab	*inotablookup __P((dump_ino_t));
 static RST_DIR		*opendirfile __P((const char *));
 static void		 putdir __P((char *, size_t));
 static void		 putent __P((struct direct *));
 static void		 rst_seekdir __P((RST_DIR *, long, long));
 static long		 rst_telldir __P((RST_DIR *));
-static struct direct	*searchdir __P((ino_t, char *));
+static struct direct	*searchdir __P((dump_ino_t, char *));
 
 /*
  *	Extract directory contents, building up a directory structure
@@ -246,7 +250,7 @@ skipdirs(void)
  *	pname and pass them off to be processed.
  */
 void
-treescan(char *pname, ino_t ino, long (*todo) __P((char *, ino_t, int)))
+treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)))
 {
 	register struct inotab *itp;
 	register struct direct *dp;
@@ -311,7 +315,7 @@ treescan(char *pname, ino_t ino, long (*todo) __P((char *, ino_t, int)))
 struct direct *
 pathsearch(const char *pathname)
 {
-	ino_t ino;
+	dump_ino_t ino;
 	struct direct *dp;
 	char *path, *name, buffer[MAXPATHLEN];
 
@@ -334,7 +338,7 @@ pathsearch(const char *pathname)
  * Return its inode number if found, zero if it does not exist.
  */
 static struct direct *
-searchdir(ino_t inum, char *name)
+searchdir(dump_ino_t inum, char *name)
 {
 	register struct direct *dp;
 	register struct inotab *itp;
@@ -547,7 +551,7 @@ rst_opendir(const char *name)
 {
 	struct inotab *itp;
 	RST_DIR *dirp;
-	ino_t ino;
+	dump_ino_t ino;
 
 	if ((ino = dirlookup(name)) > 0 &&
 	    (itp = inotablookup(ino)) != NULL) {
@@ -668,7 +672,7 @@ setdirmodes(int flags)
  * Generate a literal copy of a directory.
  */
 int
-genliteraldir(char *name, ino_t ino)
+genliteraldir(char *name, dump_ino_t ino)
 {
 	register struct inotab *itp;
 	int ofile, dp, i, size;
@@ -705,7 +709,7 @@ genliteraldir(char *name, ino_t ino)
  * Determine the type of an inode
  */
 int
-inodetype(ino_t ino)
+inodetype(dump_ino_t ino)
 {
 	struct inotab *itp;
 
@@ -721,9 +725,9 @@ inodetype(ino_t ino)
  */
 static struct inotab *
 #ifdef	__linux__
-allocinotab(ino_t ino, struct new_bsd_inode *dip, long seekpt)
+allocinotab(dump_ino_t ino, struct new_bsd_inode *dip, long seekpt)
 #else
-allocinotab(ino_t ino, struct dinode *dip, long seekpt)
+allocinotab(dump_ino_t ino, struct dinode *dip, long seekpt)
 #endif
 {
 	register struct inotab	*itp;
@@ -763,7 +767,7 @@ allocinotab(ino_t ino, struct dinode *dip, long seekpt)
  * Look up an inode in the table of directories
  */
 static struct inotab *
-inotablookup(ino_t ino)
+inotablookup(dump_ino_t ino)
 {
 	register struct inotab *itp;