added --backup-dir option from Bob Edwards

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index b97c919..14fa5a3 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -409,7 +409,8 @@ static int skip_filesystem(char *fname, STRUCT_STAT *st)
        return (st2.st_dev != filesystem_dev);
 }
 
-static struct file_struct *make_file(int f, char *fname)
+/* create a file_struct for a named file */
+struct file_struct *make_file(int f, char *fname)
 {
        struct file_struct *file;
        STRUCT_STAT st;
@@ -737,8 +738,7 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
                if (one_file_system)
                        set_filesystem(fname);
 
-               if (!recurse || !send_included_file_names(f,flist))
-                       send_file_name(f,flist,fname,recurse,FLAG_DELETE);
+               send_file_name(f,flist,fname,recurse,FLAG_DELETE);
 
                if (olddir != NULL) {
                        flist_dir = NULL;
@@ -922,7 +922,7 @@ int flist_find(struct file_list *flist,struct file_struct *f)
 /*
  * free up one file
  */
-static void free_file(struct file_struct *file)
+void free_file(struct file_struct *file)
 {
        if (!file) return;
        if (file->basename) free(file->basename);
@@ -999,12 +999,12 @@ static void clean_flist(struct file_list *flist, int strip_root)
        if (verbose <= 3) return;
 
        for (i=0;i<flist->count;i++) {
-               rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%d\n",
+               rprintf(FINFO,"[%d] i=%d %s %s mode=0%o len=%.0f\n",
                        getpid(), i, 
                        NS(flist->files[i]->dirname),
                        NS(flist->files[i]->basename),
                        flist->files[i]->mode,
-                       (int)flist->files[i]->length);
+                       (double)flist->files[i]->length);
        }
 }