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_specials;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_uid;
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;
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;
* call will append names onto the end, but the old dir value will be restored
* on exit). */
static void delete_in_dir(struct file_list *flist, char *fbuf,
- struct file_struct *file)
+ struct file_struct *file, STRUCT_STAT *stp)
{
static int min_depth = MAXPATHLEN, cur_depth = -1;
static void *filt_array[MAXPATHLEN/2+1];
static int already_warned = 0;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
- STRUCT_STAT st;
int dlen, i;
if (!flist) {
dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
- if (link_stat(fbuf, &st, keep_dirlinks) < 0 || !S_ISDIR(st.st_mode))
- return;
-
if (one_file_system) {
if (file->flags & FLAG_TOP_DIR)
- filesystem_dev = st.st_dev;
- else if (filesystem_dev != st.st_dev)
+ filesystem_dev = stp->st_dev;
+ else if (filesystem_dev != stp->st_dev)
return;
}
if (!fp->basename || fp->flags & FLAG_MOUNT_POINT)
continue;
if (flist_find(flist, fp) < 0) {
- int mode = fp->mode;
f_name(fp, delbuf);
- delete_item(delbuf, mode, DEL_FORCE_RECURSE);
+ delete_item(delbuf, fp->mode, DEL_FORCE_RECURSE);
}
}
static void do_delete_pass(struct file_list *flist)
{
char fbuf[MAXPATHLEN];
+ STRUCT_STAT st;
int j;
if (dry_run > 1 /* destination doesn't exist yet */
if (verbose > 1 && file->flags & FLAG_TOP_DIR)
rprintf(FINFO, "deleting in %s\n", fbuf);
- delete_in_dir(flist, fbuf, file);
+ if (link_stat(fbuf, &st, keep_dirlinks) < 0
+ || !S_ISDIR(st.st_mode))
+ continue;
+
+ delete_in_dir(flist, fbuf, file, &st);
}
- delete_in_dir(NULL, NULL, NULL);
+ delete_in_dir(NULL, NULL, NULL, NULL);
if (do_progress && !am_server)
rprintf(FINFO, " \r");
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",
* value if we found an alternate basis file. */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
char *cmpbuf, STRUCT_STAT *stp, int itemizing,
- int maybe_PERMS_REPORT, enum logcode code)
+ int maybe_ATTRS_REPORT, enum logcode code)
{
int best_match = -1;
int match_level = 0;
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;
hard_link_cluster(file, ndx, itemizing, code);
} else if (itemizing)
itemize(file, ndx, 0, stp, 0, 0, NULL);
- if (verbose > 1 && maybe_PERMS_REPORT) {
+ if (verbose > 1 && maybe_ATTRS_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
}
if (itemizing)
itemize(file, ndx, 0, stp, ITEM_LOCAL_CHANGE, 0, NULL);
- set_perms(fname, file, NULL, 0);
- if (maybe_PERMS_REPORT
+ set_file_attrs(fname, file, NULL, 0);
+ if (maybe_ATTRS_REPORT
&& ((!itemizing && verbose && match_level == 2)
|| (verbose > 1 && match_level == 3))) {
code = daemon_log_format_has_i || dry_run
* handling the file, or -1 if no dest-linking occurred. */
static int try_dests_non(struct file_struct *file, char *fname, int ndx,
int itemizing, int *possible_ptr,
- int maybe_PERMS_REPORT, enum logcode code)
+ int maybe_ATTRS_REPORT, enum logcode code)
{
char fnamebuf[MAXPATHLEN], lnk[MAXPATHLEN];
STRUCT_STAT st;
|| !unchanged_attrs(file, &st))
continue;
if (S_ISLNK(file->mode)) {
+#ifdef SUPPORT_LINKS
if ((len = readlink(fnamebuf, lnk, MAXPATHLEN-1)) <= 0)
continue;
lnk[len] = '\0';
if (strcmp(lnk, file->u.link) != 0)
+#endif
continue;
} else {
if (!IS_DEVICE(st.st_mode) || st.st_rdev != file->u.rdev)
char *lp = link_dest ? "" : NULL;
itemize(file, ndx, 0, &st, changes, 0, lp);
}
- if (verbose > 1 && maybe_PERMS_REPORT) {
+ if (verbose > 1 && maybe_ATTRS_REPORT) {
code = daemon_log_format_has_i || dry_run
? FCLIENT : FINFO;
rprintf(code, "%s is uptodate\n", fname);
* Note that f_out is set to -1 when doing final directory-permission and
* modification-time repair. */
static void recv_generator(char *fname, struct file_struct *file, int ndx,
- int itemizing, int maybe_PERMS_REPORT,
+ int itemizing, int maybe_ATTRS_REPORT,
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 struct file_list *need_dirlist = (struct file_list *)"";
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_mode ? DEL_FORCE_RECURSE : 0);
if (list_only)
return;
if (!fname) {
if (fuzzy_dirlist) {
- flist_free(fuzzy_dirlist);
+ if (fuzzy_dirlist != need_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)
+ char *dn = file->dirname ? file->dirname : ".";
+ if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
+ if (relative_paths && !implied_dirs && stat(dn, &st) < 0
+ && create_directory_path(fname, orig_umask) < 0) {
+ rsyserr(FERROR, errno,
+ "recv_generator: mkdir %s failed",
+ full_fname(dn));
+ }
+ if (fuzzy_dirlist) {
+ if (fuzzy_dirlist != need_dirlist)
flist_free(fuzzy_dirlist);
- fuzzy_dirlist = get_dirlist(dn, -1, 1);
+ fuzzy_dirlist = NULL;
}
- fuzzy_dirname = dn;
+ if (fuzzy_basis)
+ fuzzy_dirlist = need_dirlist;
}
+ parent_dirname = dn;
+
+ if (fuzzy_dirlist == need_dirlist && S_ISREG(file->mode))
+ fuzzy_dirlist = get_dirlist(dn, -1, 1);
statret = link_stat(fname, &st,
keep_dirlinks && S_ISDIR(file->mode));
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)) {
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
- if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ if (delete_item(fname, st.st_mode, del_opts) < 0)
return;
statret = -1;
}
full_fname(fname));
}
}
- if (set_perms(fname, file, statret ? NULL : &st, 0)
+ if (set_file_attrs(fname, file, statret ? NULL : &st, 0)
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
&& (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file);
+ delete_in_dir(the_file_list, fname, file, &st);
return;
}
itemize(file, ndx, 0, &st, 0,
0, NULL);
}
- set_perms(fname, file, &st,
- maybe_PERMS_REPORT);
+ set_file_attrs(fname, file, &st,
+ maybe_ATTRS_REPORT);
if (preserve_hard_links
&& file->link_u.links) {
hard_link_cluster(file, ndx,
}
/* Not the right symlink (or not a symlink), so
* delete it. */
- if (delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ if (delete_item(fname, st.st_mode, del_opts) < 0)
return;
if (!S_ISLNK(st.st_mode))
statret = -1;
} else if (basis_dir[0] != NULL && can_link_symlinks) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_symlinks,
- maybe_PERMS_REPORT, code) == -2) {
+ maybe_ATTRS_REPORT, code) == -2) {
if (!copy_dest)
return;
itemizing = code = 0;
rsyserr(FERROR, errno, "symlink %s -> \"%s\" failed",
full_fname(fname), file->u.link);
} else {
- set_perms(fname,file,NULL,0);
+ set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
return;
}
- if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
+ if ((am_root && preserve_devices && IS_DEVICE(file->mode))
+ || (preserve_specials && IS_SPECIAL(file->mode))) {
if (statret != 0
&& (basis_dir[0] != NULL && can_link_devices)) {
if (try_dests_non(file, fname, ndx, itemizing,
&can_link_devices,
- maybe_PERMS_REPORT, code) == -2) {
+ maybe_ATTRS_REPORT, code) == -2) {
if (!copy_dest)
return;
itemizing = code = 0;
|| (st.st_mode & ~CHMOD_BITS) != (file->mode & ~CHMOD_BITS)
|| st.st_rdev != file->u.rdev) {
if (statret == 0
- && delete_item(fname, st.st_mode, DEL_TERSE) < 0)
+ && delete_item(fname, st.st_mode, del_opts) < 0)
return;
if (preserve_hard_links && file->link_u.links
&& hard_link_check(file, ndx, fname, -1, &st,
itemizing, code, HL_SKIP))
return;
- if (!IS_DEVICE(st.st_mode))
+ if ((IS_DEVICE(file->mode) && !IS_DEVICE(st.st_mode))
+ || (IS_SPECIAL(file->mode) && !IS_SPECIAL(st.st_mode)))
statret = -1;
if (verbose > 2) {
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
rsyserr(FERROR, errno, "mknod %s failed",
full_fname(fname));
} else {
- set_perms(fname,file,NULL,0);
+ set_file_attrs(fname, file, NULL, 0);
if (itemizing) {
itemize(file, ndx, statret, &st,
ITEM_LOCAL_CHANGE, 0, NULL);
} else {
if (itemizing)
itemize(file, ndx, statret, &st, 0, 0, NULL);
- set_perms(fname, file, &st, maybe_PERMS_REPORT);
+ set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
}
}
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;
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 && !S_ISREG(st.st_mode)) {
- if (delete_item(fname, st.st_mode, DEL_TERSE) != 0)
+ if (delete_item(fname, st.st_mode, del_opts) != 0)
return;
statret = -1;
stat_errno = ENOENT;
if (statret != 0 && basis_dir[0] != NULL) {
int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &st,
- itemizing, maybe_PERMS_REPORT, code);
+ itemizing, maybe_ATTRS_REPORT, code);
if (j == -2)
return;
if (j != -1) {
} 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];
itemize(file, ndx, real_ret, &real_st,
0, 0, NULL);
}
- set_perms(fname, file, &st, maybe_PERMS_REPORT);
+ set_file_attrs(fname, file, &st, maybe_ATTRS_REPORT);
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
return;
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;
if (f_copy >= 0) {
close(f_copy);
- set_perms(backupptr, back_file, NULL, 0);
+ set_file_attrs(backupptr, back_file, NULL, 0);
if (verbose > 1) {
rprintf(FINFO, "backed up %s to %s\n",
fname, backupptr);
{
int i;
char fbuf[MAXPATHLEN];
- int itemizing, maybe_PERMS_REPORT;
+ int itemizing, maybe_ATTRS_REPORT;
enum logcode code;
int lull_mod = allowed_lull * 5;
int need_retouch_dir_times = preserve_times && !omit_dir_times;
if (protocol_version >= 29) {
itemizing = 1;
- maybe_PERMS_REPORT = log_format_has_i ? 0 : PERMS_REPORT;
+ maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
code = daemon_log_format_has_i ? 0 : FLOG;
} else if (am_daemon) {
itemizing = daemon_log_format_has_i && do_xfers;
- maybe_PERMS_REPORT = PERMS_REPORT;
+ maybe_ATTRS_REPORT = ATTRS_REPORT;
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;
+ maybe_ATTRS_REPORT = log_format_has_i ? 0 : ATTRS_REPORT;
code = itemizing ? 0 : FINFO;
} else {
itemizing = 0;
- maybe_PERMS_REPORT = PERMS_REPORT;
+ maybe_ATTRS_REPORT = ATTRS_REPORT;
code = FINFO;
}
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
+ recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT,
code, f_out);
/* We need to ensure that any dirs we create have writeable
#ifdef HAVE_CHMOD
if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
&& !list_only) {
- int mode = file->mode | S_IWUSR; /* user write */
+ mode_t mode = file->mode | S_IWUSR; /* user write */
char *fname = local_name ? local_name : fbuf;
if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR, errno,
}
recv_generator(NULL, NULL, 0, 0, 0, code, -1);
if (delete_during)
- delete_in_dir(NULL, NULL, NULL);
+ delete_in_dir(NULL, NULL, NULL, NULL);
phase++;
csum_length = SUM_LENGTH;
strlcpy(fbuf, local_name, sizeof fbuf);
else
f_name(file, fbuf);
- recv_generator(fbuf, file, i, itemizing, maybe_PERMS_REPORT,
+ recv_generator(fbuf, file, i, itemizing, maybe_ATTRS_REPORT,
code, f_out);
}
if (!need_retouch_dir_times && file->mode & S_IWUSR)
continue;
recv_generator(f_name(file, NULL), file, i, itemizing,
- maybe_PERMS_REPORT, code, -1);
+ maybe_ATTRS_REPORT, code, -1);
if (allowed_lull && !(++j % lull_mod))
maybe_send_keepalive();
else if (!(j % 200))
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff