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;
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;
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)
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);
{
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);
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;
if (max_size && file->length > max_size) {
if (verbose > 1) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO, "%s is over max-size\n",
safe_fname(fname));
}
#ifdef SUPPORT_LINKS
if (safe_symlinks && unsafe_symlink(file->u.link, fname)) {
if (verbose) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO,
"ignoring unsafe symlink %s -> \"%s\"\n",
full_fname(fname),
return;
}
- if (preserve_hard_links && hard_link_check(file, ndx, HL_CHECK_MASTER))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_CHECK_MASTER))
return;
if (!S_ISREG(file->mode)) {
+ if (the_file_list->count == 1)
+ fname = f_name(file);
rprintf(FINFO, "skipping non-regular file \"%s\"\n",
safe_fname(fname));
return;
itemizing && verbose > 1,
code) == 0)
return;
- if (verbose) {
- rsyserr(FINFO, errno, "link %s => %s",
- full_fname(fnamecmpbuf),
- safe_fname(fname));
- }
match_level = 2;
}
#endif
}
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;
}
if (statret != 0) {
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
if (stat_errno == ENOENT)
goto notify_others;
statret = 0;
}
- if (dry_run || read_batch || whole_file)
+ if (!do_xfers || read_batch || whole_file)
goto notify_others;
if (fuzzy_basis) {
full_fname(fnamecmp));
pretend_missing:
/* pretend the file didn't exist */
- if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
+ if (preserve_hard_links
+ && hard_link_check(file, ndx, fname, statret, &st,
+ itemizing, code, HL_SKIP))
return;
statret = real_ret = -1;
goto notify_others;
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 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;
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 (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);
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;
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);
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");
}
git.samba.org / rsync.git / blobdiff