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

[dump.git] / restore / dirs.c

diff --git a/restore/dirs.c b/restore/dirs.c
index 45d4cbe0743981208e96fa82ce6544ee4deb83de..228877733a4388fd90cb82c91315142ffd91790b 100644 (file)
--- a/restore/dirs.c
+++ b/restore/dirs.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: dirs.c,v 1.18 2002/02/04 11:18:46 stelian Exp $";
+       "$Id: dirs.c,v 1.21 2002/07/19 14:57:39 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -276,7 +276,7 @@ treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)
         * skipping over "." and ".."
         */
        namelen = snprintf(locname, sizeof(locname), "%s/", pname);
-       if (namelen >= sizeof(locname))
+       if (namelen >= (int)sizeof(locname))
                namelen = sizeof(locname) - 1;
        rst_seekdir(dirp, itp->t_seekpt, itp->t_seekpt);
        dp = rst_readdir(dirp); /* "." */
@@ -296,7 +296,7 @@ treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)
         */
        while (dp != NULL) {
                locname[namelen] = '\0';
-               if (namelen + dp->d_namlen >= sizeof(locname)) {
+               if (namelen + dp->d_namlen >= (int)sizeof(locname)) {
                        fprintf(stderr, "%s%s: name exceeds %ld char\n",
                                locname, dp->d_name, (long)sizeof(locname) - 1);
                } else {
@@ -381,7 +381,7 @@ putdir(char *buf, size_t size)
                                putent(&cvtbuf);
                        }
        } else {
-               for (loc = 0; loc < size; ) {
+               for (loc = 0; loc < (long)size; ) {
                        dp = (struct direct *)(buf + loc);
 #ifdef DIRDEBUG
                        printf ("reclen = %d, namlen = %d, type = %d\n",
@@ -397,6 +397,8 @@ putdir(char *buf, size_t size)
                                        if (!Bcvt)
                                                dp->d_namlen = dp->d_type;
 #                              endif
+                               if (dp->d_namlen == 0 && dp->d_type != 0)
+                                       dp->d_namlen = dp->d_type;
                                dp->d_type = DT_UNKNOWN;
                        }
 #ifdef DIRDEBUG
@@ -647,7 +649,8 @@ setdirmodes(int flags)
                                ep->e_flags &= ~NEW;
                                continue;
                        }
-                       if (node.ino == ROOTINO &&
+                       if ((flags & FORCE) == 0 &&
+                           node.ino == ROOTINO &&
                            reply("set owner/mode for '.'") == FAIL)
                                continue;
                }