Fixed a lot of warnings in the code thanks to 'gcc -W'

[dump.git] / restore / interactive.c

diff --git a/restore/interactive.c b/restore/interactive.c
index 473c11301340f575b09f677805b0379c5c6e3eb2..c1b8aa2a2a064821108ef69281768dbc3544e7e8 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.22 2002/02/04 12:07:38 stelian Exp $";
+       "$Id: interactive.c,v 1.25 2002/07/19 14:57:39 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -211,7 +211,7 @@ loop:
                        goto bad;
                createfiles();
                createlinks();
-               setdirmodes(0);
+               setdirmodes(oflag ? FORCE : 0);
                if (dflag)
                        checkrestore();
                volno = 0;
@@ -510,7 +510,7 @@ canon(char *rawname, char *canonname, int len)
                (void) strcpy(canonname, ".");
        else
                (void) strcpy(canonname, "./");
-       if (strlen(canonname) + strlen(rawname) >= len)
+       if (strlen(canonname) + strlen(rawname) >= (unsigned)len)
                errx(1, "canonname: not enough buffer space");
                
        (void) strcat(canonname, rawname);
@@ -570,7 +570,7 @@ printlist(char *name, char *basename)
                list = &single;
                mkentry(name, dp, list);
                len = strlen(basename) + 1;
-               if (strlen(name) - len > single.len) {
+               if (strlen(name) - len > (unsigned)single.len) {
                        freename(single.fname);
                        single.fname = savename(&name[len]);
                        single.len = strlen(single.fname);
@@ -591,7 +591,7 @@ printlist(char *name, char *basename)
                entries = 0;
                listp = list;
                namelen = snprintf(locname, sizeof(locname), "%s/", name);
-               if (namelen >= sizeof(locname))
+               if (namelen >= (int)sizeof(locname))
                        namelen = sizeof(locname) - 1;
                while ((dp = rst_readdir(dirp))) {
                        if (dp == NULL)
@@ -709,7 +709,7 @@ formatf(struct afile *list, int nentry)
        bigino = ROOTINO;
        endlist = &list[nentry];
        for (fp = &list[0]; fp < endlist; fp++) {
-               if (bigino < fp->fnum)
+               if (bigino < (int)fp->fnum)
                        bigino = fp->fnum;
                if (width < fp->len)
                        width = fp->len;
@@ -822,7 +822,7 @@ fcmp(const void *f1, const void *f2)
  * respond to interrupts
  */
 void
-onintr(int signo)
+onintr(UNUSED(int signo))
 {
        int save_errno = errno;
 
@@ -836,6 +836,10 @@ onintr(int signo)
 
 #if HAVE_READLINE
 
+#if !HAVE_READLINE_RLCM
+#define rl_completion_matches completion_matches
+#endif
+
 /* A static variable for holding the line. */
 static char *line_read = NULL;
 
@@ -1006,7 +1010,7 @@ filename_generator(const char *text, int state)
 }
 
 static char **
-restore_completion (const char *text, int start, int end)
+restore_completion (const char *text, int start, UNUSED(int end))
 {
        char **matches;
 
@@ -1024,7 +1028,9 @@ initialize_readline(void)
        rl_readline_name = "dump";
        rl_attempted_completion_function = restore_completion;
        rl_completion_entry_function = NULL;
+#if HAVE_READLINE_CAC  /* compile with readline 2.0 */
        rl_completion_append_character = '\0';
+#endif
        rl_instream = terminal;
 }