static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
-@@ -2263,6 +2305,25 @@ struct file_list *recv_file_list(int f)
+@@ -2281,6 +2323,25 @@ struct file_list *recv_file_list(int f)
flist_sort_and_clean(flist, relative_paths);
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -1213,6 +1361,7 @@ static void list_file_entry(struct file_struct *f)
+@@ -1225,6 +1373,7 @@ static void list_file_entry(struct file_struct *f)
}
}
static int phase = 0;
static int dflt_perms;
-@@ -1484,9 +1633,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1501,9 +1650,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
else if (delete_during && f_out != -1 && !phase
&& !(file->flags & FLAG_MISSING_DIR)) {
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
goto cleanup;
-@@ -1764,8 +1916,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1781,8 +1933,14 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
goto cleanup;
}
#endif
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
-@@ -2155,6 +2313,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -2178,6 +2336,12 @@ void generate_files(int f_out, const char *local_name)
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -2165,7 +2329,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2188,7 +2352,7 @@ void generate_files(int f_out, const char *local_name)
}
do_progress = 0;
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -2204,7 +2368,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -2230,7 +2394,7 @@ void generate_files(int f_out, const char *local_name)
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
-@@ -2248,7 +2412,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -2274,7 +2438,21 @@ void generate_files(int f_out, const char *local_name)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)