extern int verbose;
extern int dry_run;
+extern int do_xfers;
extern int log_format_has_i;
extern int log_format_has_o_or_i;
extern int daemon_log_format_has_i;
if (only_existing && statret == -1 && stat_errno == ENOENT) {
/* we only want to update existing files */
if (verbose > 1) {
- rprintf(FINFO, "not creating new file \"%s\"\n",
+ rprintf(FINFO, "not creating new %s \"%s\"\n",
+ S_ISDIR(file->mode) ? "directory" : "file",
safe_fname(fname));
}
return;
statret = 0;
}
- if (dry_run || read_batch || whole_file)
+ if (!do_xfers || read_batch || whole_file)
goto notify_others;
if (fuzzy_basis) {
fuzzy_file ? fuzzy_file->basename : NULL);
}
- if (dry_run) {
+ if (!do_xfers) {
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing;
int save_do_progress = do_progress;
+ int save_make_backups = make_backups;
allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
lull_mod = allowed_lull * 5;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
- itemizing = daemon_log_format_has_i && !dry_run;
+ itemizing = daemon_log_format_has_i && do_xfers;
maybe_PERMS_REPORT = PERMS_REPORT;
- code = itemizing || dry_run ? FCLIENT : FINFO;
+ code = itemizing || !do_xfers ? FCLIENT : FINFO;
} else if (!am_server) {
itemizing = log_format_has_i;
maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
- else if (!(i % 50))
+ else if (!(i % 200))
maybe_flush_socket();
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
phase++;
only_existing = save_only_existing;
opt_ignore_existing = save_opt_ignore_existing;
+ make_backups = save_make_backups;
if (verbose > 2)
rprintf(FINFO,"generate_files phase=%d\n",phase);
maybe_PERMS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
- else if (!(j % 50))
+ else if (!(j % 200))
maybe_flush_socket();
}
}