X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Fdirs.c;h=60f5b23673b15eebe42576aa3887ded3b2e8c894;hp=6398f8768f399249735bb829a82aeae650b47bfb;hb=5d2a3d246d400d45dfd4c49ddb588c69fb60873d;hpb=a1b67fc50f87e9febfd56bd2a7089eb569b852f6

diff --git a/restore/dirs.c b/restore/dirs.c
index 6398f87..60f5b23 100644
--- a/restore/dirs.c
+++ b/restore/dirs.c
@@ -2,8 +2,8 @@
  *	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
  */
 
 /*
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: dirs.c,v 1.14 2001/03/20 10:02:48 stelian Exp $";
+	"$Id: dirs.c,v 1.17 2002/01/25 15:08:59 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>
@@ -160,11 +164,11 @@ static struct direct	*searchdir __P((dump_ino_t, char *));
 void
 extractdirs(int genmode)
 {
-	register int i;
+	int i;
 #ifdef	__linux__
-	register struct new_bsd_inode *ip;
+	struct new_bsd_inode *ip;
 #else
-	register struct dinode *ip;
+	struct dinode *ip;
 #endif
 	struct inotab *itp;
 	struct direct nulldir;
@@ -248,8 +252,8 @@ skipdirs(void)
 void
 treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)))
 {
-	register struct inotab *itp;
-	register struct direct *dp;
+	struct inotab *itp;
+	struct direct *dp;
 	int namelen;
 	long bpt;
 	char locname[MAXPATHLEN + 1];
@@ -336,8 +340,8 @@ pathsearch(const char *pathname)
 static struct direct *
 searchdir(dump_ino_t inum, char *name)
 {
-	register struct direct *dp;
-	register struct inotab *itp;
+	struct direct *dp;
+	struct inotab *itp;
 	int len;
 
 	itp = inotablookup(inum);
@@ -360,9 +364,9 @@ static void
 putdir(char *buf, size_t size)
 {
 	struct direct cvtbuf;
-	register struct odirect *odp;
+	struct odirect *odp;
 	struct odirect *eodp;
-	register struct direct *dp;
+	struct direct *dp;
 	long loc, i;
 
 	if (cvtflag) {
@@ -505,7 +509,7 @@ rst_seekdir(RST_DIR *dirp, long loc, long base)
 struct direct *
 rst_readdir(RST_DIR *dirp)
 {
-	register struct direct *dp;
+	struct direct *dp;
 
 	for (;;) {
 		if (dirp->dd_loc == 0) {
@@ -586,8 +590,8 @@ rst_telldir(RST_DIR *dirp)
 static RST_DIR *
 opendirfile(const char *name)
 {
-	register RST_DIR *dirp;
-	register int fd;
+	RST_DIR *dirp;
+	int fd;
 
 	if ((fd = open(name, O_RDONLY)) == -1)
 		return (NULL);
@@ -670,7 +674,7 @@ setdirmodes(int flags)
 int
 genliteraldir(char *name, dump_ino_t ino)
 {
-	register struct inotab *itp;
+	struct inotab *itp;
 	int ofile, dp, i, size;
 	char buf[BUFSIZ];
 
@@ -726,7 +730,7 @@ allocinotab(dump_ino_t ino, struct new_bsd_inode *dip, long seekpt)
 allocinotab(dump_ino_t ino, struct dinode *dip, long seekpt)
 #endif
 {
-	register struct inotab	*itp;
+	struct inotab	*itp;
 	struct modeinfo node;
 
 	itp = calloc(1, sizeof(struct inotab));
@@ -765,7 +769,7 @@ allocinotab(dump_ino_t ino, struct dinode *dip, long seekpt)
 static struct inotab *
 inotablookup(dump_ino_t ino)
 {
-	register struct inotab *itp;
+	struct inotab *itp;
 
 	for (itp = inotab[INOHASH(ino)]; itp != NULL; itp = itp->t_next)
 		if (itp->t_ino == ino)