kill "register".

[dump.git] / restore / interactive.c

diff --git a/restore/interactive.c b/restore/interactive.c
index 3b184fcea3242a243f4b2a1b785518ce07f0b38f..bc94ed45c339cdff5c5bd02eae8598e1d83ee1b9 100644 (file)
--- 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.21 2002/01/25 15:08:59 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>
@@ -125,7 +129,7 @@ static void  printlist __P((char *, char *));
 void
 runcmdshell(void)
 {
-       register struct entry *np;
+       struct entry *np;
        dump_ino_t ino;
        struct arglist arglist;
        char curdir[MAXPATHLEN];
@@ -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.
@@ -352,7 +357,7 @@ loop:
 static void
 getcmd(char *curdir, char *cmd, char *name, int size, struct arglist *ap)
 {
-       register char *cp;
+       char *cp;
        static char input[BUFSIZ];
        char output[BUFSIZ];
 #      define rawname input    /* save space by reusing input buffer */
@@ -448,7 +453,7 @@ retnext:
 static char *
 copynext(char *input, char *output)
 {
-       register char *cp, *bp;
+       char *cp, *bp;
        char quote;
 
        for (cp = input; *cp == ' ' || *cp == '\t'; cp++)
@@ -497,7 +502,7 @@ copynext(char *input, char *output)
 void
 canon(char *rawname, char *canonname, int len)
 {
-       register char *cp, *np;
+       char *cp, *np;
 
        if (strcmp(rawname, ".") == 0 || strncmp(rawname, "./", 2) == 0)
                (void) strcpy(canonname, "");
@@ -549,8 +554,8 @@ canon(char *rawname, char *canonname, int len)
 static void
 printlist(char *name, char *basename)
 {
-       register struct afile *fp, *list, *listp = NULL;
-       register struct direct *dp;
+       struct afile *fp, *list, *listp = NULL;
+       struct direct *dp;
        struct afile single;
        RST_DIR *dirp;
        int entries, len, namelen;
@@ -694,7 +699,7 @@ mkentry(char *name, struct direct *dp, struct afile *fp)
 static void
 formatf(struct afile *list, int nentry)
 {
-       register struct afile *fp, *endlist;
+       struct afile *fp, *endlist;
        int width, bigino, haveprefix, havepostfix;
        int i, j, w, precision = 0, columns, lines;
 
@@ -791,7 +796,7 @@ glob_readdir(RST_DIR *dirp)
 static int
 glob_stat(const char *name, struct stat *stp)
 {
-       register struct direct *dp;
+       struct direct *dp;
        dp = pathsearch(name);
        if (dp == NULL || (!dflag && TSTINO(dp->d_ino, dumpmap) == 0) ||
            (!vflag && dp->d_ino == WINO))