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 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;
delete_in_dir(flist, fbuf, file);
}
+ if (do_progress && !am_server)
+ rprintf(FINFO, " \r");
}
static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st)
}
match_level = 0;
statret = -1;
- } else
- set_perms(fname, file, NULL, 0);
+ } else {
+ if (itemizing) {
+ itemize(file, ndx, 0, &st,
+ ITEM_LOCAL_CHANGE, 0,
+ NULL);
+ } else if (verbose && code) {
+ rprintf(code, "%s\n",
+ safe_fname(fname));
+ }
+ set_perms(fname, file, NULL,
+ maybe_PERMS_REPORT);
+ if (preserve_hard_links
+ && file->link_u.links) {
+ hard_link_cluster(file, ndx,
+ itemizing,
+ code);
+ }
+ return;
+ }
} else if (compare_dest || match_level == 1) {
fnamecmp = fnamecmpbuf;
fnamecmp_type = i;
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;
+ int save_make_backups = make_backups;
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;
/* We need to ensure that any dirs we create have writeable
* permissions during the time we are putting files within
* them. This is then fixed after the transfer is done. */
- if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)) {
+ if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
+ && !list_only) {
int mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode & CHMOD_BITS) < 0) {
if (allowed_lull && !(i % lull_mod))
maybe_send_keepalive();
+ else if (!(i % 200))
+ maybe_flush_socket();
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
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);
get_redo_num(itemizing, code);
}
+ do_progress = save_do_progress;
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
continue;
recv_generator(f_name(file), file, i, itemizing,
maybe_PERMS_REPORT, code, -1);
- if (allowed_lull && !(j++ % lull_mod))
+ if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
+ else if (!(j % 200))
+ maybe_flush_socket();
}
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);