Readline cleanups (warning compiles)

[dump.git] / restore / interactive.c

diff --git a/restore/interactive.c b/restore/interactive.c
index 2dad978a46a8fc91c5e57208325e07f78bd44af2..473c11301340f575b09f677805b0379c5c6e3eb2 100644 (file)
--- a/restore/interactive.c
+++ b/restore/interactive.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: interactive.c,v 1.18 2002/01/16 09:32:14 stelian Exp $";
+       "$Id: interactive.c,v 1.22 2002/02/04 12:07:38 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -83,9 +83,9 @@ extern char * __progname;
 
 static char *rl_gets (char *prompt);
 static void initialize_readline(void);
-static char **restore_completion (char *text, int start, int end);
-static char *command_generator(char *text, int state);
-static char *filename_generator(char *text, int state);
+static char **restore_completion (const char *text, int start, int end);
+static char *command_generator(const char *text, int state);
+static char *filename_generator(const char *text, int state);
 #endif
 
 #define round(a, b) (((a) + (b) - 1) / (b) * (b))
@@ -129,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];
@@ -145,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) {
@@ -316,6 +316,7 @@ loop:
                if (strncmp(cmd, "what", strlen(cmd)) != 0)
                        goto bad;
                printdumpinfo();
+               printvolinfo();
                break;
        /*
         * Turn on debugging.
@@ -356,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 */
@@ -452,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++)
@@ -501,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, "");
@@ -553,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;
@@ -698,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;
 
@@ -795,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))
@@ -897,30 +898,8 @@ rl_gets (char *dir)
        return (line_read);
 }
 
-static void 
-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 **
-restore_completion (char *text, int start, int end)
-{
-       char **matches;
-
-       if (start == 0)
-               matches = completion_matches (text, command_generator);
-       else
-               matches = completion_matches (text, filename_generator);
-
-       return (matches);
-}
-
 static char *
-command_generator(char *text, int state)
+command_generator(const char *text, int state)
 {
        static int list_index, len;
        char *name;
@@ -942,7 +921,7 @@ command_generator(char *text, int state)
 }
 
 static char *
-filename_generator(char *text, int state)
+filename_generator(const char *text, int state)
 {
        static int list_index;
        char *name;
@@ -1025,4 +1004,28 @@ filename_generator(char *text, int state)
 
        return name;
 }
+
+static char **
+restore_completion (const char *text, int start, int end)
+{
+       char **matches;
+
+       if (start == 0)
+               matches = rl_completion_matches (text, command_generator);
+       else
+               matches = rl_completion_matches (text, filename_generator);
+
+       return (matches);
+}
+
+static void 
+initialize_readline(void) 
+{
+       rl_readline_name = "dump";
+       rl_attempted_completion_function = restore_completion;
+       rl_completion_entry_function = NULL;
+       rl_completion_append_character = '\0';
+       rl_instream = terminal;
+}
+
 #endif /* HAVE_READLINE */