{
static int min_depth = MAXPATHLEN, cur_depth = -1;
static void *filt_array[MAXPATHLEN/2+1];
- static int already_output_warning = 0;
+ static int already_warned = 0;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
STRUCT_STAT st;
return; /* Impossible... */
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
- if (already_output_warning)
+ if (already_warned)
return;
rprintf(FINFO,
"IO error encountered -- skipping file deletion\n");
- already_output_warning = 1;
+ already_warned = 1;
return;
}
if ((iflags & SIGNIFICANT_ITEM_FLAGS || verbose > 1
|| (xname && *xname)) && !read_batch) {
if (protocol_version >= 29) {
+ if (iflags & (ITEM_LOCAL_CHANGE|ITEM_TRANSFER))/* XXX */
+ iflags |= ITEM_DUMMY_BIT; /* XXX Remove soon */
if (ndx >= 0)
write_int(sock_f_out, ndx);
write_shortint(sock_f_out, iflags);
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
- static char *fuzzy_dirname = NULL;
+ static char *fuzzy_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
if (fuzzy_dirlist) {
flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
- fuzzy_dirname = NULL;
+ fuzzy_dirname = "";
}
if (missing_below >= 0) {
dry_run--;
} else {
if (fuzzy_basis && S_ISREG(file->mode)) {
char *dn = file->dirname ? file->dirname : ".";
- /* Yes, identical dirnames are guaranteed to have
- * identical pointers at this point. */
- if (fuzzy_dirname != dn) {
+ if (fuzzy_dirname != dn
+ && strcmp(fuzzy_dirname, dn) != 0) {
if (fuzzy_dirlist)
flist_free(fuzzy_dirlist);
- fuzzy_dirname = dn;
- fuzzy_dirlist = get_dirlist(fuzzy_dirname, -1,
- 1);
+ fuzzy_dirlist = get_dirlist(dn, -1, 1);
}
+ fuzzy_dirname = dn;
}
statret = link_stat(fname, &st,
continue;
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
- recv_generator(local_name ? local_name : f_name(file),
- file, i, itemizing, maybe_PERMS_REPORT,
- code, -1);
+ recv_generator(f_name(file), file, i, itemizing,
+ maybe_PERMS_REPORT, code, -1);
if (allowed_lull && !(j++ % lull_mod))
maybe_send_keepalive();
}
io_error |= IOERR_DEL_LIMIT;
}
+ if (protocol_version >= 29) {
+ write_int(f_out, -1);
+ /* Read post-delay-phase MSG_DONE and any prior messages. */
+ get_redo_num(itemizing, code);
+ }
+
if (verbose > 2)
rprintf(FINFO,"generate_files finished\n");
}