need BIG_ENDIAN test for inet_ntoa replacement

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 86bf4aa..f5c69b9 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -895,10 +895,10 @@ static void clean_flist(struct file_list *flist, int strip_root)
        for (i=0;i<flist->count;i++) {
                rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%d\n",
                        getpid(), i, 
-                       flist->files[i]->dirname,
-                       flist->files[i]->basename,
+                       NS(flist->files[i]->dirname),
+                       NS(flist->files[i]->basename),
                        flist->files[i]->mode,
-                       flist->files[i]->length);
+                       (int)flist->files[i]->length);
        }
 }
 
@@ -917,7 +917,9 @@ char *f_name(struct file_struct *f)
        n = (n+1)%10;
 
        if (f->dirname) {
-               slprintf(p, MAXPATHLEN-1, "%s/%s", f->dirname, f->basename);
+               strlcpy(p, f->dirname, MAXPATHLEN-1);
+               strlcat(p, "/", MAXPATHLEN-1);
+               strlcat(p, f->basename, MAXPATHLEN-1);
        } else {
                strlcpy(p, f->basename, MAXPATHLEN-1);
        }