extern char *partial_dir;
extern char *basis_dir[];
extern int compare_dest;
+extern int copy_dest;
extern int link_dest;
extern int whole_file;
extern int local_server;
{
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);
{
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;
- STRUCT_STAT st, partial_st;
+ STRUCT_STAT st, real_st, partial_st;
struct file_struct *back_file = NULL;
- int statret, stat_errno;
+ int statret, real_ret, stat_errno;
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
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,
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- delete_item(fname, st.st_mode, DEL_TERSE);
+ if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ return;
statret = -1;
}
if (dry_run && statret != 0 && missing_below < 0) {
}
/* Not the right symlink (or not a symlink), so
* delete it. */
- if (S_ISLNK(st.st_mode))
- delete_item(fname, st.st_mode, DEL_TERSE);
- else {
- delete_item(fname, st.st_mode, DEL_TERSE);
+ if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ return;
+ if (!S_ISLNK(st.st_mode))
statret = -1;
- }
}
if (do_symlink(file->u.link,fname) != 0) {
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
if (statret != 0 ||
st.st_mode != file->mode ||
st.st_rdev != file->u.rdev) {
- delete_item(fname, st.st_mode, DEL_TERSE);
+ if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ return;
if (!IS_DEVICE(st.st_mode))
statret = -1;
if (verbose > 2) {
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
+ if (statret == 0 && !S_ISREG(st.st_mode)) {
+ if (delete_item(fname, st.st_mode, DEL_TERSE) != 0)
+ return;
+ statret = -1;
+ stat_errno = ENOENT;
+ }
+
if (statret != 0 && basis_dir[0] != NULL) {
int best_match = -1;
int match_level = 0;
continue;
best_match = i;
match_level = 2;
+ if (copy_dest)
+ break;
/* FALL THROUGH */
case 2:
if (!unchanged_attrs(file, &st))
match_level = 2;
}
#endif
- if (compare_dest || (match_level && match_level < 3)) {
+ if (match_level == 2) {
+ /* Copy the file locally. */
+ if (copy_file(fnamecmpbuf, fname, file->mode) < 0) {
+ if (verbose) {
+ rsyserr(FINFO, errno,
+ "copy_file %s => %s",
+ full_fname(fnamecmpbuf),
+ safe_fname(fname));
+ }
+ match_level = 0;
+ statret = -1;
+ } else
+ set_perms(fname, file, NULL, 0);
+ } else if (compare_dest || match_level == 1) {
fnamecmp = fnamecmpbuf;
fnamecmp_type = i;
}
}
}
- if (statret == 0 && !S_ISREG(st.st_mode)) {
- if (delete_item(fname, st.st_mode, DEL_TERSE) != 0)
- return;
- statret = -1;
- stat_errno = ENOENT;
- }
+ real_ret = statret;
+ real_st = st;
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
&& link_stat(partialptr, &partial_st, 0) == 0
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
safe_fname(fname), safe_fname(fnamecmpbuf));
}
- st.st_mode = fuzzy_file->mode;
st.st_size = fuzzy_file->length;
- st.st_mtime = fuzzy_file->modtime;
statret = 0;
fnamecmp = fnamecmpbuf;
fnamecmp_type = FNAMECMP_FUZZY;
;
else if (unchanged_file(fnamecmp, file, &st)) {
if (fnamecmp_type == FNAMECMP_FNAME) {
- if (itemizing)
- itemize(file, ndx, statret, &st, 0, 0, NULL);
+ if (itemizing) {
+ itemize(file, ndx, real_ret, &real_st,
+ 0, 0, NULL);
+ }
set_perms(fname, file, &st, maybe_PERMS_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
}
/* Only --compare-dest gets here. */
- if (unchanged_attrs(file, &st)) {
- itemize(file, ndx, statret, &st,
- ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
- return;
- }
+ itemize(file, ndx, real_ret, &real_st,
+ ITEM_NO_DEST_AND_NO_UPDATE, 0, NULL);
+ return;
}
prepare_to_open:
/* pretend the file didn't exist */
if (preserve_hard_links && hard_link_check(file, ndx, HL_SKIP))
return;
- statret = -1;
+ statret = real_ret = -1;
goto notify_others;
}
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
if (fnamecmp_type == FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
- itemize(file, -1, statret, &st, iflags, fnamecmp_type,
+ itemize(file, -1, real_ret, &real_st, iflags, fnamecmp_type,
fuzzy_file ? fuzzy_file->basename : NULL);
}
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);
+ write_int(f_out, -1);
+ /* Read MSG_DONE for delay-update phase & prior messages. */
+ get_redo_num(itemizing, code);
+ }
+
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();
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff