X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Finteractive.c;h=c8f54f5dfa92a2de432a57131f732a106201210c;hb=132daf888086bd9816955545c6b6073440cf8b60;hp=d8854c663e84523364ddb21df32b52b82e051ae6;hpb=c38e5b6a9c658f06d9b27f33e9db131ffa23d947;p=dump.git

diff --git a/restore/interactive.c b/restore/interactive.c
index d8854c6..c8f54f5 100644
--- a/restore/interactive.c
+++ b/restore/interactive.c
@@ -2,7 +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@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*
@@ -40,14 +41,19 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: interactive.c,v 1.11 2000/05/29 14:17:37 stelian Exp $";
+	"$Id: interactive.c,v 1.17 2001/06/18 10:58: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>
@@ -95,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 */
@@ -124,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];
@@ -897,6 +903,7 @@ initialize_readline(void)
 	rl_attempted_completion_function = restore_completion;
 	rl_completion_entry_function = (Function *)NULL;
 	rl_completion_append_character = '\0';
+	rl_instream = terminal;
 }
 
 static char **