X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Finteractive.c;h=fb29a4fd51e232ca22b2539754c4c7d1469cd471;hp=3b184fcea3242a243f4b2a1b785518ce07f0b38f;hb=e51470bfc05d83f82c37d24504220c7163bbd4c1;hpb=a1b67fc50f87e9febfd56bd2a7089eb569b852f6

diff --git a/restore/interactive.c b/restore/interactive.c
index 3b184fc..fb29a4f 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@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
  */
 
 /*
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: interactive.c,v 1.16 2001/03/20 10:02:48 stelian Exp $";
+	"$Id: interactive.c,v 1.20 2002/01/25 14:59:53 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -49,7 +49,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>
@@ -141,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) {
@@ -312,6 +316,7 @@ loop:
 		if (strncmp(cmd, "what", strlen(cmd)) != 0)
 			goto bad;
 		printdumpinfo();
+		printvolinfo();
 		break;
 	/*
 	 * Turn on debugging.