X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Finteractive.c;h=10cc5bfac6a1c7412fbae1c5190fdc1f2b0d8f36;hp=ca7b2e93841d7c4e1fa24cadc5fa6bc3e6af0094;hb=9d8b11d7653be6f936234e8e71e003a18c6cdd4d;hpb=0a99352128efc4af44160eee69e8990686bf9ad5

diff --git a/restore/interactive.c b/restore/interactive.c
index ca7b2e9..10cc5bf 100644
--- a/restore/interactive.c
+++ b/restore/interactive.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@cybercable.fr>, 1999-2000
- *	Stelian Pop <pop@cybercable.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
  */
 
 /*
@@ -41,14 +41,19 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: interactive.c,v 1.13 2000/11/10 14:42:25 stelian Exp $";
+	"$Id: interactive.c,v 1.19 2002/01/16 10:53:28 stelian Exp $";
 #endif /* not lint */
 
+#include <config.h>
 #include <sys/param.h>
 #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>
@@ -96,7 +101,7 @@ static int pflag = 0;		/* prompt mode */
  * Structure and routines associated with listing directories.
  */
 struct afile {
-	ino_t	fnum;		/* inode number of file */
+	dump_ino_t fnum;	/* inode number of file */
 	char	*fname;		/* file name */
 	short	len;		/* name length */
 	char	prefix;		/* prefix character */
@@ -125,7 +130,7 @@ void
 runcmdshell(void)
 {
 	register struct entry *np;
-	ino_t ino;
+	dump_ino_t ino;
 	struct arglist arglist;
 	char curdir[MAXPATHLEN];
 	char name[MAXPATHLEN];
@@ -140,8 +145,8 @@ runcmdshell(void)
 	arglist.glob.gl_opendir = (void *)rst_opendir;
 	arglist.glob.gl_readdir = (void *)glob_readdir;
 	arglist.glob.gl_closedir = (void *)rst_closedir;
-	arglist.glob.gl_lstat = glob_stat;
-	arglist.glob.gl_stat = glob_stat;
+	arglist.glob.gl_lstat = (int (*)(const char *, void *))glob_stat;
+	arglist.glob.gl_stat = (int (*)(const char *, void *))glob_stat;
 	canon("/", curdir, sizeof(curdir));
 loop:
 	if (setjmp(reset) != 0) {