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 do_progress;
extern int recurse;
extern int relative_paths;
+extern int implied_dirs;
extern int keep_dirlinks;
extern int preserve_links;
extern int preserve_devices;
extern int preserve_gid;
extern int preserve_times;
extern int omit_dir_times;
+extern int delete_mode;
extern int delete_before;
extern int delete_during;
extern int delete_after;
extern int whole_file;
extern int list_only;
extern int read_batch;
-extern int orig_umask;
extern int safe_symlinks;
extern long block_size; /* "long" because popt can't set an int32. */
extern int max_delete;
return -1;
}
- zap_dir = flags & DEL_FORCE_RECURSE || (force_delete && recurse);
+ zap_dir = flags & DEL_FORCE_RECURSE || force_delete;
if ((max_delete && ++deletion_count > max_delete)
|| (dry_run && zap_dir)) {
ok = 0;
iflags |= ITEM_REPORT_SIZE;
if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
- || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
- if (preserve_perms
- && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+ if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
if (preserve_uid && am_root && file->uid != st->st_uid)
iflags |= ITEM_REPORT_OWNER;
if (ignore_times)
return 0;
- return cmp_modtime(st->st_mtime, file->modtime) == 0;
+ return cmp_time(st->st_mtime, file->modtime) == 0;
}
name = fp->basename;
if (fp->length == file->length
- && cmp_modtime(fp->modtime, file->modtime) == 0) {
+ && cmp_time(fp->modtime, file->modtime) == 0) {
if (verbose > 4) {
rprintf(FINFO,
"fuzzy size/modtime match for %s\n",
if (!unchanged_attrs(file, stp))
continue;
if ((always_checksum || ignore_times)
- && cmp_modtime(stp->st_mtime, file->modtime))
+ && cmp_time(stp->st_mtime, file->modtime))
continue;
best_match = j;
match_level = 3;
enum logcode code, int f_out)
{
static int missing_below = -1, excluded_below = -1;
- static char *fuzzy_dirname = "";
+ static char *parent_dirname = "";
static struct file_list *fuzzy_dirlist = NULL;
+ static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
STRUCT_STAT st, real_st, partial_st;
char *fnamecmp, *partialptr, *backupptr = NULL;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
- int del_opts = DEL_TERSE | (delete_after ? DEL_FORCE_RECURSE : 0);
+ int del_opts = DEL_TERSE | (delete_mode ? DEL_FORCE_RECURSE : 0);
if (list_only)
return;
if (fuzzy_dirlist) {
flist_free(fuzzy_dirlist);
fuzzy_dirlist = NULL;
- fuzzy_dirname = "";
}
if (missing_below >= 0) {
dry_run--;
missing_below = -1;
}
+ parent_dirname = "";
return;
}
statret = -1;
stat_errno = ENOENT;
} else {
- if (fuzzy_basis && S_ISREG(file->mode)) {
- char *dn = file->dirname ? file->dirname : ".";
- if (fuzzy_dirname != dn
- && strcmp(fuzzy_dirname, dn) != 0) {
- if (fuzzy_dirlist)
- flist_free(fuzzy_dirlist);
- fuzzy_dirlist = get_dirlist(dn, -1, 1);
+ char *dn = file->dirname ? file->dirname : ".";
+ if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
+ if (relative_paths && !implied_dirs
+ && do_stat(dn, &st) < 0
+ && create_directory_path(fname) < 0) {
+ rsyserr(FERROR, errno,
+ "recv_generator: mkdir %s failed",
+ full_fname(dn));
+ }
+ if (fuzzy_dirlist) {
+ flist_free(fuzzy_dirlist);
+ fuzzy_dirlist = NULL;
}
- fuzzy_dirname = dn;
+ if (fuzzy_basis)
+ need_fuzzy_dirlist = 1;
+ }
+ parent_dirname = dn;
+
+ if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
+ fuzzy_dirlist = get_dirlist(dn, -1, 1);
+ need_fuzzy_dirlist = 0;
}
statret = link_stat(fname, &st,
return;
}
- if (statret == 0 && !preserve_perms
- && S_ISDIR(st.st_mode) == S_ISDIR(file->mode)) {
- /* if the file exists already and we aren't perserving
- * permissions then act as though the remote end sent
- * us the file permissions we already have */
- file->mode = (file->mode & ~CHMOD_BITS)
- | (st.st_mode & CHMOD_BITS);
+ /* If we're not preserving permissions, change the file-list's
+ * mode based on the local permissions and some heuristics. */
+ if (!preserve_perms) {
+ int exists = statret == 0
+ && S_ISDIR(st.st_mode) == S_ISDIR(file->mode);
+ file->mode = dest_mode(file->mode, st.st_mode, exists);
}
if (S_ISDIR(file->mode)) {
}
if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
- || create_directory_path(fname, orig_umask) < 0
+ || create_directory_path(fname) < 0
|| (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
rsyserr(FERROR, errno,
"recv_generator: mkdir %s failed",
}
if (update_only && statret == 0
- && cmp_modtime(st.st_mtime, file->modtime) > 0) {
+ && cmp_time(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
} else
partialptr = NULL;
- if (statret != 0 && fuzzy_basis && dry_run <= 1) {
+ if (statret != 0 && fuzzy_dirlist && dry_run <= 1) {
int j = find_fuzzy(file, fuzzy_dirlist);
if (j >= 0) {
fuzzy_file = fuzzy_dirlist->files[j];
if (!do_xfers || read_batch || whole_file)
goto notify_others;
- if (fuzzy_basis) {
+ if (fuzzy_dirlist) {
int j = flist_find(fuzzy_dirlist, file);
if (j >= 0) /* don't use changing file as future fuzzy basis */
fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY;
rprintf(FINFO, "generating and sending sums for %d\n", ndx);
notify_others:
+ if (remove_sent_files && !delay_updates && !phase)
+ increment_active_files(ndx, itemizing, code);
write_int(f_out, ndx);
if (itemizing) {
int iflags = ITEM_TRANSFER;
int save_ignore_non_existing = ignore_non_existing;
int save_do_progress = do_progress;
int save_make_backups = make_backups;
+ int dir_tweaking = !(list_only || local_name || dry_run);
if (protocol_version >= 29) {
itemizing = 1;
* them. This is then fixed after the transfer is done. */
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
- && !list_only) {
+ && dir_tweaking) {
mode_t mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
if (delete_after && !local_name && flist->count > 0)
do_delete_pass(flist);
- if ((need_retouch_dir_perms || need_retouch_dir_times)
- && !list_only && !local_name && !dry_run) {
+ if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) {
int j = 0;
/* Now we need to fix any directory permissions that were
* modified during the transfer and/or re-set any tweaked