extern int am_root;
extern int am_server;
extern int am_daemon;
+extern int do_progress;
extern int recurse;
extern int relative_paths;
extern int keep_dirlinks;
extern int module_id;
extern int ignore_errors;
extern int remove_sent_files;
+extern int delay_updates;
extern int update_only;
extern int opt_ignore_existing;
extern int inplace;
extern int copy_dest;
extern int link_dest;
extern int whole_file;
-extern int local_server;
extern int list_only;
extern int read_batch;
extern int only_existing;
{
int fname_len, fname_suf_len;
const char *fname_suf, *fname = file->basename;
- uint32 lowest_dist = 0x7FFFFFFF;
+ uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
int j, lowest_j = -1;
fname_len = strlen(fname);
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,
int need_retouch_dir_perms = 0;
int save_only_existing = only_existing;
int save_opt_ignore_existing = opt_ignore_existing;
+ int save_do_progress = do_progress;
allowed_lull = read_batch ? 0 : (io_timeout + 1) / 2;
lull_mod = allowed_lull * 5;
if (delete_before && !local_name && flist->count > 0)
do_delete_pass(flist);
+ do_progress = 0;
if (whole_file < 0)
whole_file = 0;
rprintf(FINFO,"generate_files phase=%d\n",phase);
write_int(f_out, -1);
+ /* Reduce round-trip lag-time for a useless delay-updates phase. */
+ if (protocol_version >= 29 && !delay_updates)
+ write_int(f_out, -1);
- /* Read post-redo-phase MSG_DONE and any prior messages. */
+ /* Read MSG_DONE for the redo phase (and any prior messages). */
get_redo_num(itemizing, code);
+ if (protocol_version >= 29) {
+ phase++;
+ if (verbose > 2)
+ rprintf(FINFO, "generate_files phase=%d\n", phase);
+ if (delay_updates)
+ write_int(f_out, -1);
+ /* Read MSG_DONE for delay-updates phase & prior messages. */
+ get_redo_num(itemizing, code);
+ }
+
+ do_progress = save_do_progress;
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
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();
}