* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-2009 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
extern int relative_paths;
extern int implied_dirs;
extern int keep_dirlinks;
+extern int write_devices;
extern int preserve_acls;
extern int preserve_xattrs;
extern int preserve_links;
extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_perms;
-extern int preserve_times;
-extern int uid_ndx;
-extern int gid_ndx;
+extern int preserve_mtimes;
+extern int omit_dir_times;
+extern int omit_link_times;
extern int delete_mode;
extern int delete_before;
extern int delete_during;
extern int human_readable;
extern int ignore_existing;
extern int ignore_non_existing;
+extern int want_xattr_optim;
+extern int modify_window;
extern int inplace;
extern int append_mode;
extern int make_backups;
extern int flist_eof;
extern int allowed_lull;
extern int sock_f_out;
-extern int ignore_timeout;
extern int protocol_version;
extern int file_total;
extern int fuzzy_basis;
extern int always_checksum;
-extern int checksum_len;
+extern int flist_csum_len;
extern char *partial_dir;
-extern int compare_dest;
-extern int copy_dest;
-extern int link_dest;
+extern int alt_dest_type;
extern int whole_file;
extern int list_only;
extern int read_batch;
+extern int write_batch;
extern int safe_symlinks;
-extern long block_size; /* "long" because popt can't set an int32. */
+extern int32 block_size;
extern int unsort_ndx;
extern int max_delete;
extern int force_delete;
extern int one_file_system;
extern int skipped_deletes;
-extern struct stats stats;
extern dev_t filesystem_dev;
extern mode_t orig_umask;
extern uid_t our_uid;
extern filter_rule_list filter_list, daemon_filter_list;
int maybe_ATTRS_REPORT = 0;
+int maybe_ATTRS_ACCURATE_TIME = 0;
static dev_t dev_zero;
static int deldelay_size = 0, deldelay_cnt = 0;
static int need_retouch_dir_perms;
static const char *solo_file = NULL;
-enum nonregtype {
- TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
-};
-
/* Forward declarations. */
#ifdef SUPPORT_HARD_LINKS
static void handle_skipped_hlink(struct file_struct *file, int itemizing,
deldelay_buf[deldelay_cnt++] = '!';
while (1) {
- len = snprintf(deldelay_buf + deldelay_cnt,
- deldelay_size - deldelay_cnt,
- "%x %s%c",
- (int)file->mode, fname, '\0');
+ len = snprintf(deldelay_buf + deldelay_cnt, deldelay_size - deldelay_cnt,
+ "%x %s%c", (int)file->mode, fname, '\0');
if ((deldelay_cnt += len) <= deldelay_size)
break;
deldelay_cnt -= len;
static int read_delay_line(char *buf, int *flags_p)
{
static int read_pos = 0;
- int j, len, mode;
+ unsigned int mode;
+ int j, len;
char *bp, *past_space;
while (1) {
deldelay_size - deldelay_cnt);
if (len == 0) {
if (deldelay_cnt) {
- rprintf(FERROR,
- "ERROR: unexpected EOF in delete-delay file.\n");
+ rprintf(FERROR, "ERROR: unexpected EOF in delete-delay file.\n");
}
return -1;
}
* MAXPATHLEN buffer with the name of the directory in it (the functions we
* call will append names onto the end, but the old dir value will be restored
* on exit). */
-static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
+static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t fs_dev)
{
static int already_warned = 0;
+ static struct hashtable *dev_tbl;
struct file_list *dirlist;
char delbuf[MAXPATHLEN];
int dlen, i;
- int save_uid_ndx = uid_ndx;
if (!fbuf) {
change_local_filter_dir(NULL, 0, 0);
rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
if (allowed_lull)
- maybe_send_keepalive();
+ maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
- if (io_error && !ignore_errors) {
+ if (io_error & IOERR_GENERAL && !ignore_errors) {
if (already_warned)
return;
rprintf(FINFO,
change_local_filter_dir(fbuf, dlen, F_DEPTH(file));
if (one_file_system) {
- if (file->flags & FLAG_TOP_DIR)
- filesystem_dev = *fs_dev;
- else if (filesystem_dev != *fs_dev)
- return;
+ if (!dev_tbl)
+ dev_tbl = hashtable_create(16, HT_KEY64);
+ if (file->flags & FLAG_TOP_DIR) {
+ hashtable_find(dev_tbl, fs_dev+1, "");
+ filesystem_dev = fs_dev;
+ } else if (filesystem_dev != fs_dev) {
+ if (!hashtable_find(dev_tbl, fs_dev+1, NULL))
+ return;
+ filesystem_dev = fs_dev; /* it's a prior top-dir dev */
+ }
}
- if (!uid_ndx)
- uid_ndx = ++file_extra_cnt;
-
dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
* a delete_item call with a DEL_MAKE_ROOM flag. */
if (flist_find_ignore_dirness(cur_flist, fp) < 0) {
int flags = DEL_RECURSE;
- if (!(fp->mode & S_IWUSR) && !am_root && (uid_t)F_OWNER(fp) == our_uid)
+ if (!(fp->mode & S_IWUSR) && !am_root && fp->flags & FLAG_OWNED_BY_US)
flags |= DEL_NO_UID_WRITE;
f_name(fp, delbuf);
if (delete_during == 2) {
}
flist_free(dirlist);
-
- if (!save_uid_ndx) {
- --file_extra_cnt;
- uid_ndx = 0;
- }
}
/* This deletes any files on the receiving side that are not present on the
for (j = 0; j < cur_flist->used; j++) {
struct file_struct *file = cur_flist->sorted[j];
+ if (!F_IS_ACTIVE(file))
+ continue;
+
f_name(file, fbuf);
if (!(file->flags & FLAG_CONTENT_DIR)) {
|| !S_ISDIR(st.st_mode))
continue;
- delete_in_dir(fbuf, file, &st.st_dev);
+ delete_in_dir(fbuf, file, st.st_dev);
}
- delete_in_dir(NULL, NULL, &dev_zero);
+ delete_in_dir(NULL, NULL, dev_zero);
if (INFO_GTE(FLIST, 2) && !am_server)
rprintf(FINFO, " \r");
}
-int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+static inline int mtime_differs(STRUCT_STAT *stp, struct file_struct *file)
{
-#ifndef CAN_SET_SYMLINK_TIMES
- if (S_ISLNK(file->mode)) {
- ;
- } else
+#ifdef ST_MTIME_NSEC
+ return !same_time(stp->st_mtime, stp->ST_MTIME_NSEC, file->modtime, F_MOD_NSEC_or_0(file));
+#else
+ return !same_time(stp->st_mtime, 0, file->modtime, 0);
#endif
- if (preserve_times && cmp_time(sxp->st.st_mtime, file->modtime) != 0)
- return 0;
+}
- if (preserve_perms) {
- if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
- return 0;
- } else if (preserve_executability
- && ((sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0)))
- return 0;
+static inline int any_time_differs(stat_x *sxp, struct file_struct *file, UNUSED(const char *fname))
+{
+ int differs = mtime_differs(&sxp->st, file);
+#ifdef SUPPORT_CRTIMES
+ if (!differs && crtimes_ndx) {
+ if (sxp->crtime == 0)
+ sxp->crtime = get_create_time(fname, &sxp->st);
+ differs = !same_time(sxp->crtime, 0, F_CRTIME(file), 0);
+ }
+#endif
+ return differs;
+}
+static inline int perms_differ(struct file_struct *file, stat_x *sxp)
+{
+ if (preserve_perms)
+ return !BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS);
+
+ if (preserve_executability)
+ return (sxp->st.st_mode & 0111 ? 1 : 0) ^ (file->mode & 0111 ? 1 : 0);
+
+ return 0;
+}
+
+static inline int ownership_differs(struct file_struct *file, stat_x *sxp)
+{
if (am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file))
- return 0;
+ return 1;
if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
- return 0;
+ return 1;
+
+ return 0;
+}
#ifdef SUPPORT_ACLS
- if (preserve_acls && !S_ISLNK(file->mode)) {
+static inline int acls_differ(const char *fname, struct file_struct *file, stat_x *sxp)
+{
+ if (preserve_acls) {
if (!ACL_READY(*sxp))
get_acl(fname, sxp);
- if (set_acl(NULL, file, sxp) == 0)
- return 0;
+ if (set_acl(NULL, file, sxp, file->mode))
+ return 1;
}
+
+ return 0;
+}
#endif
+
#ifdef SUPPORT_XATTRS
+static inline int xattrs_differ(const char *fname, struct file_struct *file, stat_x *sxp)
+{
if (preserve_xattrs) {
if (!XATTR_READY(*sxp))
get_xattr(fname, sxp);
if (xattr_diff(file, sxp, 0))
- return 0;
+ return 1;
}
+
+ return 0;
+}
#endif
+int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+{
+ if (S_ISLNK(file->mode)) {
+#ifdef CAN_SET_SYMLINK_TIMES
+ if (preserve_mtimes && !omit_link_times && any_time_differs(sxp, file, fname))
+ return 0;
+#endif
+#ifdef CAN_CHMOD_SYMLINK
+ if (perms_differ(file, sxp))
+ return 0;
+#endif
+#ifdef CAN_CHOWN_SYMLINK
+ if (ownership_differs(file, sxp))
+ return 0;
+#endif
+#if defined SUPPORT_ACLS && 0 /* no current symlink-ACL support */
+ if (acls_differ(fname, file, sxp))
+ return 0;
+#endif
+#if defined SUPPORT_XATTRS && !defined NO_SYMLINK_XATTRS
+ if (xattrs_differ(fname, file, sxp))
+ return 0;
+#endif
+ } else {
+ if (preserve_mtimes && any_time_differs(sxp, file, fname))
+ return 0;
+ if (perms_differ(file, sxp))
+ return 0;
+ if (ownership_differs(file, sxp))
+ return 0;
+#ifdef SUPPORT_ACLS
+ if (acls_differ(fname, file, sxp))
+ return 0;
+#endif
+#ifdef SUPPORT_XATTRS
+ if (xattrs_differ(fname, file, sxp))
+ return 0;
+#endif
+ }
+
return 1;
}
const char *xname)
{
if (statret >= 0) { /* A from-dest-dir statret can == 1! */
- int keep_time = !preserve_times ? 0
- : S_ISDIR(file->mode) ? preserve_times > 1 :
-#ifdef CAN_SET_SYMLINK_TIMES
- 1;
-#else
- !S_ISLNK(file->mode);
-#endif
+ int keep_time = !preserve_mtimes ? 0
+ : S_ISDIR(file->mode) ? !omit_dir_times
+ : S_ISLNK(file->mode) ? !omit_link_times
+ : 1;
if (S_ISREG(file->mode) && F_LENGTH(file) != sxp->st.st_size)
iflags |= ITEM_REPORT_SIZE;
if (iflags & ITEM_LOCAL_CHANGE)
iflags |= symlink_timeset_failed_flags;
} else if (keep_time
- ? cmp_time(file->modtime, sxp->st.st_mtime) != 0
+ ? mtime_differs(&sxp->st, file)
: iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
iflags |= ITEM_REPORT_TIME;
-#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
+ if (atimes_ndx && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
+ && !same_time(F_ATIME(file), 0, sxp->st.st_atime, 0))
+ iflags |= ITEM_REPORT_ATIME;
+#ifdef SUPPORT_CRTIMES
+ if (crtimes_ndx) {
+ if (sxp->crtime == 0)
+ sxp->crtime = get_create_time(fnamecmp, &sxp->st);
+ if (!same_time(sxp->crtime, 0, F_CRTIME(file), 0))
+ iflags |= ITEM_REPORT_CRTIME;
+ }
+#endif
+#ifndef CAN_CHMOD_SYMLINK
if (S_ISLNK(file->mode)) {
;
} else
iflags |= ITEM_REPORT_PERMS;
if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
iflags |= ITEM_REPORT_OWNER;
- if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
- && sxp->st.st_gid != (gid_t)F_GROUP(file))
+ if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
iflags |= ITEM_REPORT_GROUP;
#ifdef SUPPORT_ACLS
if (preserve_acls && !S_ISLNK(file->mode)) {
if (!ACL_READY(*sxp))
get_acl(fnamecmp, sxp);
- if (set_acl(NULL, file, sxp) == 0)
+ if (set_acl(NULL, file, sxp, file->mode))
iflags |= ITEM_REPORT_ACL;
}
#endif
#ifdef SUPPORT_XATTRS
if (preserve_xattrs && do_xfers
&& iflags & (ITEM_REPORT_XATTR|ITEM_TRANSFER)) {
- send_xattr_request(NULL, file,
- iflags & ITEM_REPORT_XATTR ? sock_f_out : -1);
+ int fd = iflags & ITEM_REPORT_XATTR
+ && !(want_xattr_optim && BITS_SET(iflags, ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))
+ ? sock_f_out : -1;
+ send_xattr_request(NULL, file, fd);
}
#endif
} else if (ndx >= 0) {
enum logcode code = logfile_format_has_i ? FINFO : FCLIENT;
- log_item(code, file, &stats, iflags, xname);
+ log_item(code, file, iflags, xname);
}
}
}
+static enum filetype get_file_type(mode_t mode)
+{
+ if (S_ISREG(mode))
+ return FT_REG;
+ if (S_ISLNK(mode))
+ return FT_SYMLINK;
+ if (S_ISDIR(mode))
+ return FT_DIR;
+ if (IS_SPECIAL(mode))
+ return FT_SPECIAL;
+ if (IS_DEVICE(mode))
+ return FT_DEVICE;
+ return FT_UNSUPPORTED;
+}
/* Perform our quick-check heuristic for determining if a file is unchanged. */
-int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+int quick_check_ok(enum filetype ftype, const char *fn, struct file_struct *file, STRUCT_STAT *st)
{
- if (st->st_size != F_LENGTH(file))
- return 0;
+ switch (ftype) {
+ case FT_REG:
+ if (st->st_size != F_LENGTH(file))
+ return 0;
- /* if always checksum is set then we use the checksum instead
- of the file time to determine whether to sync */
- if (always_checksum > 0 && S_ISREG(st->st_mode)) {
- char sum[MAX_DIGEST_LEN];
- file_checksum(fn, sum, st->st_size);
- return memcmp(sum, F_SUM(file), checksum_len) == 0;
- }
+ /* If always_checksum is set then we use the checksum instead
+ * of the file mtime to determine whether to sync. */
+ if (always_checksum > 0) {
+ char sum[MAX_DIGEST_LEN];
+ file_checksum(fn, st, sum);
+ return memcmp(sum, F_SUM(file), flist_csum_len) == 0;
+ }
- if (size_only > 0)
- return 1;
+ if (size_only > 0)
+ return 1;
- if (ignore_times)
- return 0;
+ if (ignore_times)
+ return 0;
- return cmp_time(st->st_mtime, file->modtime) == 0;
+ if (mtime_differs(st, file))
+ return 0;
+ break;
+ case FT_DIR:
+ break;
+ case FT_SYMLINK: {
+#ifdef SUPPORT_LINKS
+ char lnk[MAXPATHLEN];
+ int len = do_readlink(fn, lnk, MAXPATHLEN-1);
+ if (len <= 0)
+ return 0;
+ lnk[len] = '\0';
+ if (strcmp(lnk, F_SYMLINK(file)) != 0)
+ return 0;
+ break;
+#else
+ return -1;
+#endif
+ }
+ case FT_SPECIAL:
+ if (!BITS_EQUAL(file->mode, st->st_mode, _S_IFMT))
+ return 0;
+ break;
+ case FT_DEVICE: {
+ uint32 *devp = F_RDEV_P(file);
+ if (st->st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
+ return 0;
+ break;
+ }
+ case FT_UNSUPPORTED:
+ return -1;
+ }
+ return 1;
}
-
/*
* set (initialize) the size entries in the per-file sum_struct
* calculating dynamic block and checksum sizes.
int s2length;
int64 l;
+ if (len < 0) {
+ /* The file length overflowed our int64 var, so we can't process this file. */
+ sum->count = -1; /* indicate overflow error */
+ return;
+ }
+
if (block_size)
blength = block_size;
else if (len <= BLOCK_SIZE * BLOCK_SIZE)
if (c < 0 || c >= max_blength)
blength = max_blength;
else {
- blength = 0;
- do {
- blength |= c;
- if (len < (int64)blength * blength)
- blength &= ~c;
- c >>= 1;
- } while (c >= 8); /* round to multiple of 8 */
- blength = MAX(blength, BLOCK_SIZE);
+ blength = 0;
+ do {
+ blength |= c;
+ if (len < (int64)blength * blength)
+ blength &= ~c;
+ c >>= 1;
+ } while (c >= 8); /* round to multiple of 8 */
+ blength = MAX(blength, BLOCK_SIZE);
}
}
/* Try to find a filename in the same dir as "fname" with a similar name. */
-static int find_fuzzy(struct file_struct *file, struct file_list *dirlist)
+static struct file_struct *find_fuzzy(struct file_struct *file, struct file_list *dirlist_array[], uchar *fnamecmp_type_ptr)
{
int fname_len, fname_suf_len;
const char *fname_suf, *fname = file->basename;
uint32 lowest_dist = 25 << 16; /* ignore a distance greater than 25 */
- int j, lowest_j = -1;
+ int i, j;
+ struct file_struct *lowest_fp = NULL;
fname_len = strlen(fname);
fname_suf = find_filename_suffix(fname, fname_len, &fname_suf_len);
- for (j = 0; j < dirlist->used; j++) {
- struct file_struct *fp = dirlist->files[j];
- const char *suf, *name;
- int len, suf_len;
- uint32 dist;
+ /* Try to find an exact size+mtime match first. */
+ for (i = 0; i < fuzzy_basis; i++) {
+ struct file_list *dirlist = dirlist_array[i];
- if (!S_ISREG(fp->mode) || !F_LENGTH(fp)
- || fp->flags & FLAG_FILE_SENT)
+ if (!dirlist)
continue;
- name = fp->basename;
+ for (j = 0; j < dirlist->used; j++) {
+ struct file_struct *fp = dirlist->files[j];
- if (F_LENGTH(fp) == F_LENGTH(file)
- && cmp_time(fp->modtime, file->modtime) == 0) {
- if (DEBUG_GTE(FUZZY, 2)) {
- rprintf(FINFO,
- "fuzzy size/modtime match for %s\n",
- name);
+ if (!F_IS_ACTIVE(fp))
+ continue;
+
+ if (!S_ISREG(fp->mode) || !F_LENGTH(fp) || fp->flags & FLAG_FILE_SENT)
+ continue;
+
+ if (F_LENGTH(fp) == F_LENGTH(file) && same_time(fp->modtime, 0, file->modtime, 0)) {
+ if (DEBUG_GTE(FUZZY, 2))
+ rprintf(FINFO, "fuzzy size/modtime match for %s\n", f_name(fp, NULL));
+ *fnamecmp_type_ptr = FNAMECMP_FUZZY + i;
+ return fp;
}
- return j;
+
}
+ }
- len = strlen(name);
- suf = find_filename_suffix(name, len, &suf_len);
+ for (i = 0; i < fuzzy_basis; i++) {
+ struct file_list *dirlist = dirlist_array[i];
- dist = fuzzy_distance(name, len, fname, fname_len);
- /* Add some extra weight to how well the suffixes match. */
- dist += fuzzy_distance(suf, suf_len, fname_suf, fname_suf_len)
- * 10;
- if (DEBUG_GTE(FUZZY, 2)) {
- rprintf(FINFO, "fuzzy distance for %s = %d.%05d\n",
- name, (int)(dist>>16), (int)(dist&0xFFFF));
- }
- if (dist <= lowest_dist) {
- lowest_dist = dist;
- lowest_j = j;
+ if (!dirlist)
+ continue;
+
+ for (j = 0; j < dirlist->used; j++) {
+ struct file_struct *fp = dirlist->files[j];
+ const char *suf, *name;
+ int len, suf_len;
+ uint32 dist;
+
+ if (!F_IS_ACTIVE(fp))
+ continue;
+
+ if (!S_ISREG(fp->mode) || !F_LENGTH(fp) || fp->flags & FLAG_FILE_SENT)
+ continue;
+
+ name = fp->basename;
+ len = strlen(name);
+ suf = find_filename_suffix(name, len, &suf_len);
+
+ dist = fuzzy_distance(name, len, fname, fname_len);
+ /* Add some extra weight to how well the suffixes match. */
+ dist += fuzzy_distance(suf, suf_len, fname_suf, fname_suf_len) * 10;
+ if (DEBUG_GTE(FUZZY, 2)) {
+ rprintf(FINFO, "fuzzy distance for %s = %d.%05d\n",
+ f_name(fp, NULL), (int)(dist>>16), (int)(dist&0xFFFF));
+ }
+ if (dist <= lowest_dist) {
+ lowest_dist = dist;
+ lowest_fp = fp;
+ *fnamecmp_type_ptr = FNAMECMP_FUZZY + i;
+ }
}
}
- return lowest_j;
+ return lowest_fp;
}
/* Copy a file found in our --copy-dest handling. */
/* This is only called for regular files. We return -2 if we've finished
* handling the file, -1 if no dest-linking occurred, or a non-negative
- * value if we found an alternate basis file. */
+ * value if we found an alternate basis file. If we're called with the
+ * find_exact_for_existing flag, the destination file already exists, so
+ * we only try to find an exact alt-dest match. In this case, the returns
+ * are only -2 & -1 (both as above). */
static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
- char *cmpbuf, stat_x *sxp, int itemizing,
- enum logcode code)
+ char *cmpbuf, stat_x *sxp, int find_exact_for_existing,
+ int itemizing, enum logcode code)
{
+ STRUCT_STAT real_st = sxp->st;
int best_match = -1;
int match_level = 0;
int j = 0;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, &sxp->st, 0) < 0 || !S_ISREG(sxp->st.st_mode))
continue;
- switch (match_level) {
- case 0:
+ if (match_level == 0) {
best_match = j;
match_level = 1;
- /* FALL THROUGH */
- case 1:
- if (!unchanged_file(cmpbuf, file, &sxp->st))
- continue;
+ }
+ if (!quick_check_ok(FT_REG, cmpbuf, file, &sxp->st))
+ continue;
+ if (match_level == 1) {
best_match = j;
match_level = 2;
- /* FALL THROUGH */
- case 2:
- if (!unchanged_attrs(cmpbuf, file, sxp))
- continue;
+ }
+ if (unchanged_attrs(cmpbuf, file, sxp)) {
best_match = j;
match_level = 3;
break;
}
- break;
+ free_stat_x(sxp);
} while (basis_dir[++j] != NULL);
if (!match_level)
- return -1;
+ goto got_nothing_for_ya;
if (j != best_match) {
j = best_match;
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, &sxp->st, 0) < 0)
- return -1;
+ goto got_nothing_for_ya;
}
- if (match_level == 3 && !copy_dest) {
+ if (match_level == 3 && alt_dest_type != COPY_DEST) {
+ if (find_exact_for_existing) {
+ if (alt_dest_type == LINK_DEST && real_st.st_dev == sxp->st.st_dev && real_st.st_ino == sxp->st.st_ino)
+ return -1;
+ if (do_unlink(fname) < 0 && errno != ENOENT)
+ goto got_nothing_for_ya;
+ }
#ifdef SUPPORT_HARD_LINKS
- if (link_dest) {
+ if (alt_dest_type == LINK_DEST) {
if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
+ if (atimes_ndx)
+ set_file_attrs(fname, file, sxp, NULL, 0);
if (preserve_hard_links && F_IS_HLINKED(file))
finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
if (!maybe_ATTRS_REPORT && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) {
}
} else
#endif
- if (itemizing)
- itemize(cmpbuf, file, ndx, 0, sxp, 0, 0, NULL);
+ {
+ if (itemizing)
+ itemize(cmpbuf, file, ndx, 0, sxp, 0, 0, NULL);
+ }
if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT)
rprintf(FCLIENT, "%s is uptodate\n", fname);
return -2;
}
+ if (find_exact_for_existing)
+ goto got_nothing_for_ya;
+
if (match_level >= 2) {
#ifdef SUPPORT_HARD_LINKS
try_a_copy: /* Copy the file locally. */
#endif
- if (!dry_run && copy_altdest_file(cmpbuf, fname, file) < 0)
+ if (!dry_run && copy_altdest_file(cmpbuf, fname, file) < 0) {
+ if (find_exact_for_existing) /* Can get here via hard-link failure */
+ goto got_nothing_for_ya;
return -1;
+ }
if (itemizing)
itemize(cmpbuf, file, ndx, 0, sxp, ITEM_LOCAL_CHANGE, 0, NULL);
if (maybe_ATTRS_REPORT
}
return FNAMECMP_BASIS_DIR_LOW + j;
+
+got_nothing_for_ya:
+ sxp->st = real_st;
+ return -1;
}
/* This is only called for non-regular files. We return -2 if we've finished
{
int best_match = -1;
int match_level = 0;
- enum nonregtype type;
- uint32 *devp;
-#ifdef SUPPORT_LINKS
- char lnk[MAXPATHLEN];
- int len;
-#endif
+ enum filetype ftype = get_file_type(file->mode);
int j = 0;
#ifndef SUPPORT_LINKS
- if (S_ISLNK(file->mode))
+ if (ftype == FT_SYMLINK)
return -1;
#endif
- if (S_ISDIR(file->mode)) {
- type = TYPE_DIR;
- } else if (IS_SPECIAL(file->mode))
- type = TYPE_SPECIAL;
- else if (IS_DEVICE(file->mode))
- type = TYPE_DEVICE;
-#ifdef SUPPORT_LINKS
- else if (S_ISLNK(file->mode))
- type = TYPE_SYMLINK;
-#endif
- else {
+ if (ftype == FT_REG || ftype == FT_UNSUPPORTED) {
rprintf(FERROR,
"internal: try_dests_non() called with invalid mode (%o)\n",
(int)file->mode);
pathjoin(cmpbuf, MAXPATHLEN, basis_dir[j], fname);
if (link_stat(cmpbuf, &sxp->st, 0) < 0)
continue;
- switch (type) {
- case TYPE_DIR:
- if (!S_ISDIR(sxp->st.st_mode))
- continue;
- break;
- case TYPE_SPECIAL:
- if (!IS_SPECIAL(sxp->st.st_mode))
- continue;
- break;
- case TYPE_DEVICE:
- if (!IS_DEVICE(sxp->st.st_mode))
- continue;
- break;
- case TYPE_SYMLINK:
-#ifdef SUPPORT_LINKS
- if (!S_ISLNK(sxp->st.st_mode))
- continue;
- break;
-#else
- return -1;
-#endif
- }
+ if (ftype != get_file_type(sxp->st.st_mode))
+ continue;
if (match_level < 1) {
match_level = 1;
best_match = j;
}
- switch (type) {
- case TYPE_DIR:
- case TYPE_SPECIAL:
- break;
- case TYPE_DEVICE:
- devp = F_RDEV_P(file);
- if (sxp->st.st_rdev != MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp)))
- continue;
- break;
- case TYPE_SYMLINK:
-#ifdef SUPPORT_LINKS
- if ((len = do_readlink(cmpbuf, lnk, MAXPATHLEN-1)) <= 0)
- continue;
- lnk[len] = '\0';
- if (strcmp(lnk, F_SYMLINK(file)) != 0)
- continue;
- break;
-#else
- return -1;
-#endif
- }
+ if (!quick_check_ok(ftype, cmpbuf, file, &sxp->st))
+ continue;
if (match_level < 2) {
match_level = 2;
best_match = j;
if (match_level == 3) {
#ifdef SUPPORT_HARD_LINKS
- if (link_dest
+ if (alt_dest_type == LINK_DEST
#ifndef CAN_HARDLINK_SYMLINK
&& !S_ISLNK(file->mode)
#endif
match_level = 2;
if (itemizing && stdout_format_has_i
&& (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) {
- int chg = compare_dest && type != TYPE_DIR ? 0
+ int chg = alt_dest_type == COMPARE_DEST && ftype != FT_DIR ? 0
: ITEM_LOCAL_CHANGE + (match_level == 3 ? ITEM_XNAME_FOLLOWS : 0);
char *lp = match_level == 3 ? "" : NULL;
itemize(cmpbuf, file, ndx, 0, sxp, chg + ITEM_MATCHED, 0, lp);
}
if (INFO_GTE(NAME, 2) && maybe_ATTRS_REPORT) {
rprintf(FCLIENT, "%s%s is uptodate\n",
- fname, type == TYPE_DIR ? "/" : "");
+ fname, ftype == FT_DIR ? "/" : "");
}
return -2;
}
static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
- int64 len;
- int colwidth = human_readable ? 14 : 11;
+ const char *mtime_str = timestring(f->modtime);
+ int size_width = human_readable ? 14 : 11;
+ int mtime_width = 1 + strlen(mtime_str);
+ int atime_width = atimes_ndx ? mtime_width : 0;
+ int crtime_width = crtimes_ndx ? mtime_width : 0;
if (!F_IS_ACTIVE(f)) {
/* this can happen if duplicate names were removed */
return;
}
- permstring(permbuf, f->mode);
- len = F_LENGTH(f);
-
/* TODO: indicate '+' if the entry has an ACL. */
-#ifdef SUPPORT_LINKS
- if (preserve_links && S_ISLNK(f->mode)) {
- rprintf(FINFO, "%s %*s %s %s -> %s\n",
- permbuf, colwidth, comma_num(len),
- timestring(f->modtime), f_name(f, NULL),
- F_SYMLINK(f));
- } else
-#endif
if (missing_args == 2 && f->mode == 0) {
rprintf(FINFO, "%-*s %s\n",
- colwidth + 31, "*missing",
+ 10 + 1 + size_width + mtime_width + atime_width + crtime_width, "*missing",
f_name(f, NULL));
} else {
- rprintf(FINFO, "%s %*s %s %s\n",
- permbuf, colwidth, comma_num(len),
- timestring(f->modtime), f_name(f, NULL));
+ const char *atime_str = atimes_ndx && !S_ISDIR(f->mode) ? timestring(F_ATIME(f)) : "";
+ const char *crtime_str = crtimes_ndx ? timestring(F_CRTIME(f)) : "";
+ const char *arrow, *lnk;
+
+ permstring(permbuf, f->mode);
+
+#ifdef SUPPORT_LINKS
+ if (preserve_links && S_ISLNK(f->mode)) {
+ arrow = " -> ";
+ lnk = F_SYMLINK(f);
+ } else
+#endif
+ arrow = lnk = "";
+
+ rprintf(FINFO, "%s %*s %s%*s%*s %s%s%s\n",
+ permbuf, size_width, human_num(F_LENGTH(f)),
+ timestring(f->modtime), atime_width, atime_str, crtime_width, crtime_str,
+ f_name(f, NULL), arrow, lnk);
}
}
int itemizing, enum logcode code, int f_out)
{
static const char *parent_dirname = "";
+ static struct file_struct *prior_dir_file = NULL;
/* Missing dir not created due to --dry-run; will still be scanned. */
static struct file_struct *dry_missing_dir = NULL;
/* Missing dir whose contents are skipped altogether due to
* --ignore-non-existing, daemon exclude, or mkdir failure. */
static struct file_struct *skip_dir = NULL;
- static struct file_list *fuzzy_dirlist = NULL;
+ static struct file_list *fuzzy_dirlist[MAX_BASIS_DIRS+1];
static int need_fuzzy_dirlist = 0;
struct file_struct *fuzzy_file = NULL;
int fd = -1, f_copy = -1;
char fnamecmpbuf[MAXPATHLEN];
uchar fnamecmp_type;
int del_opts = delete_mode || force_delete ? DEL_RECURSE : 0;
- int is_dir = !S_ISDIR(file->mode) ? 0
+ enum filetype stype, ftype = get_file_type(file->mode);
+ int is_dir = ftype != FT_DIR ? 0
: inc_recurse && ndx != cur_flist->ndx_start - 1 ? -1
: 1;
return;
}
+ maybe_ATTRS_ACCURATE_TIME = always_checksum ? ATTRS_ACCURATE_TIME : 0;
+
if (skip_dir) {
if (is_below(file, skip_dir)) {
if (is_dir)
skip_dir = NULL;
}
+ init_stat_x(&sx);
if (daemon_filter_list.head && (*fname != '.' || fname[1])) {
if (check_filter(&daemon_filter_list, FLOG, fname, is_dir) < 0) {
if (is_dir < 0)
handle_skipped_hlink(file, itemizing, code, f_out);
#endif
rprintf(FERROR_XFER,
- "skipping daemon-excluded %s \"%s\"\n",
+ "ERROR: daemon refused to receive %s \"%s\"\n",
is_dir ? "directory" : "file", fname);
if (is_dir)
goto skipping_dir_contents;
}
}
- init_stat_x(&sx);
if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
+ int i;
parent_is_dry_missing:
- if (fuzzy_dirlist) {
- flist_free(fuzzy_dirlist);
- fuzzy_dirlist = NULL;
+ for (i = 0; i < fuzzy_basis; i++) {
+ if (fuzzy_dirlist[i]) {
+ flist_free(fuzzy_dirlist[i]);
+ fuzzy_dirlist[i] = NULL;
+ }
}
parent_dirname = "";
statret = -1;
const char *dn = file->dirname ? file->dirname : ".";
dry_missing_dir = NULL;
if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
- if (relative_paths && !implied_dirs
+ /* Each parent dir must be in the file list or the flist data is bad.
+ * Optimization: most of the time the parent dir will be the last dir
+ * this function was asked to process in the file list. */
+ if (!inc_recurse
+ && (*dn != '.' || dn[1]) /* Avoid an issue with --relative and the "." dir. */
+ && (!prior_dir_file || strcmp(dn, f_name(prior_dir_file, NULL)) != 0)) {
+ int ok = 0, j = flist_find_name(cur_flist, dn, -1);
+ if (j >= 0) {
+ struct file_struct *f = cur_flist->sorted[j];
+ if (S_ISDIR(f->mode) || (missing_args == 2 && !file->mode && !f->mode))
+ ok = 1;
+ }
+ /* The --delete-missing-args option can actually put invalid entries into
+ * the file list, so if that option was specified, we'll just complain about
+ * it and allow it. */
+ if (!ok && missing_args == 2 && file->mode == 0 && j < 0)
+ rprintf(FERROR, "WARNING: parent dir is absent in the file list: %s\n", dn);
+ else if (!ok) {
+ rprintf(FERROR, "ABORTING due to invalid path from sender: %s/%s\n",
+ dn, file->basename);
+ exit_cleanup(RERR_PROTOCOL);
+ }
+ }
+ if (relative_paths && !implied_dirs && file->mode != 0
&& do_stat(dn, &sx.st) < 0) {
if (dry_run)
goto parent_is_dry_missing;
full_fname(dn));
}
}
- if (fuzzy_dirlist) {
- flist_free(fuzzy_dirlist);
- fuzzy_dirlist = NULL;
- }
- if (fuzzy_basis)
+ if (fuzzy_basis) {
+ int i;
+ for (i = 0; i < fuzzy_basis; i++) {
+ if (fuzzy_dirlist[i]) {
+ flist_free(fuzzy_dirlist[i]);
+ fuzzy_dirlist[i] = NULL;
+ }
+ }
need_fuzzy_dirlist = 1;
+ }
#ifdef SUPPORT_ACLS
if (!preserve_perms)
dflt_perms = default_perms_for_dir(dn);
}
parent_dirname = dn;
- if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
- strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf);
- fuzzy_dirlist = get_dirlist(fnamecmpbuf, -1, 1);
- need_fuzzy_dirlist = 0;
- }
-
statret = link_stat(fname, &sx.st, keep_dirlinks && is_dir);
stat_errno = errno;
}
&& !am_root && sx.st.st_uid == our_uid)
del_opts |= DEL_NO_UID_WRITE;
+ if (statret == 0)
+ stype = get_file_type(sx.st.st_mode);
+ else
+ stype = FT_UNSUPPORTED;
+
if (ignore_existing > 0 && statret == 0
- && (!is_dir || !S_ISDIR(sx.st.st_mode))) {
- if (INFO_GTE(SKIP, 1) && is_dir >= 0)
- rprintf(FINFO, "%s exists\n", fname);
+ && (!is_dir || stype != FT_DIR)) {
+ if (INFO_GTE(SKIP, 1) && is_dir >= 0) {
+ const char *suf = "";
+ if (INFO_GTE(SKIP, 2)) {
+ if (ftype != stype)
+ suf = " (type change)";
+ else if (!quick_check_ok(ftype, fname, file, &sx.st))
+ suf = always_checksum ? " (sum change)" : " (file change)";
+ else if (!unchanged_attrs(fname, file, &sx))
+ suf = " (attr change)";
+ else
+ suf = " (uptodate)";
+ }
+ rprintf(FINFO, "%s exists%s\n", fname, suf);
+ }
#ifdef SUPPORT_HARD_LINKS
if (F_IS_HLINKED(file))
handle_skipped_hlink(file, itemizing, code, f_out);
goto cleanup;
}
+ fnamecmp = fname;
+
if (is_dir) {
+ mode_t added_perms;
if (!implied_dirs && file->flags & FLAG_IMPLIED_DIR)
goto cleanup;
+ if (am_root < 0) {
+ /* For --fake-super, the dir must be useable by the copying
+ * user, just like it would be for root. */
+ added_perms = S_IRUSR|S_IWUSR|S_IXUSR;
+ } else
+ added_perms = 0;
if (is_dir < 0) {
+ if (!preserve_mtimes || omit_dir_times)
+ goto cleanup;
/* In inc_recurse mode we want to make sure any missing
* directories get created while we're still processing
* the parent dir (which allows us to touch the parent
* dir's mtime right away). We will handle the dir in
* full later (right before we handle its contents). */
if (statret == 0
- && (S_ISDIR(sx.st.st_mode)
+ && (stype == FT_DIR
|| delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0))
goto cleanup; /* Any errors get reported later. */
- if (do_mkdir(fname, file->mode & 0700) == 0)
+ if (do_mkdir(fname, (file->mode|added_perms) & 0700) == 0)
file->flags |= FLAG_DIR_CREATED;
goto cleanup;
}
* file of that name and it is *not* a directory, then
* we need to delete it. If it doesn't exist, then
* (perhaps recursively) create it. */
- if (statret == 0 && !S_ISDIR(sx.st.st_mode)) {
+ if (statret == 0 && stype != FT_DIR) {
if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_DIR) != 0)
goto skipping_dir_contents;
statret = -1;
dry_missing_dir = file;
file->flags |= FLAG_MISSING_DIR;
}
+ init_stat_x(&real_sx);
+ real_sx.st = sx.st;
real_ret = statret;
- real_sx = sx;
if (file->flags & FLAG_DIR_CREATED)
statret = -1;
if (!preserve_perms) { /* See comment in non-dir code below. */
- file->mode = dest_mode(file->mode, sx.st.st_mode,
- dflt_perms, statret == 0);
+ file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, statret == 0);
}
if (statret != 0 && basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, code);
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, itemizing, code);
if (j == -2) {
itemizing = 0;
code = FNONE;
statret = 1;
- } else if (j >= 0)
+ } else if (j >= 0) {
statret = 1;
+ fnamecmp = fnamecmpbuf;
+ }
}
if (itemizing && f_out != -1) {
- itemize(fname, file, ndx, statret, &sx,
+ itemize(fnamecmp, file, ndx, statret, &sx,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
- if (real_ret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
+ if (real_ret != 0 && do_mkdir(fname,file->mode|added_perms) < 0 && errno != EEXIST) {
if (!relative_paths || errno != ENOENT
|| make_path(fname, MKP_DROP_NAME | MKP_SKIP_SLASH) < 0
- || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
+ || (do_mkdir(fname, file->mode|added_perms) < 0 && errno != EEXIST)) {
rsyserr(FERROR_XFER, errno,
"recv_generator: mkdir %s failed",
full_fname(fname));
skipping_dir_contents:
- rprintf(FERROR,
- "*** Skipping any contents from this failed directory ***\n");
+ rprintf(FERROR, "*** Skipping any contents from this failed directory ***\n");
skip_dir = file;
file->flags |= FLAG_MISSING_DIR;
goto cleanup;
}
}
+
#ifdef SUPPORT_XATTRS
if (preserve_xattrs && statret == 1)
copy_xattrs(fnamecmpbuf, fname);
#endif
if (set_file_attrs(fname, file, real_ret ? NULL : &real_sx, NULL, 0)
- && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1)
+ && INFO_GTE(NAME, 1) && code != FNONE && f_out != -1)
rprintf(code, "%s/\n", fname);
- /* We need to ensure that the dirs in the transfer have writable
- * permissions during the time we are putting files within them.
- * This is then fixed after the transfer is done. */
+ /* We need to ensure that the dirs in the transfer have both
+ * readable and writable permissions during the time we are
+ * putting files within them. This is then restored to the
+ * former permissions after the transfer is done. */
#ifdef HAVE_CHMOD
- if (!am_root && !(file->mode & S_IWUSR) && dir_tweaking) {
- mode_t mode = file->mode | S_IWUSR;
+ if (!am_root && (file->mode & S_IRWXU) != S_IRWXU && dir_tweaking) {
+ mode_t mode = file->mode | S_IRWXU;
if (do_chmod(fname, mode) < 0) {
rsyserr(FERROR_XFER, errno,
"failed to modify permissions on %s",
else if (delete_during && f_out != -1 && !phase
&& !(file->flags & FLAG_MISSING_DIR)) {
if (file->flags & FLAG_CONTENT_DIR)
- delete_in_dir(fname, file, &real_sx.st.st_dev);
+ delete_in_dir(fname, file, real_sx.st.st_dev);
else
change_local_filter_dir(fname, strlen(fname), F_DEPTH(file));
}
+ prior_dir_file = file;
goto cleanup;
}
/* 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(sx.st.st_mode);
- file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms,
- exists);
+ int exists = statret == 0 && stype != FT_DIR;
+ file->mode = dest_mode(file->mode, sx.st.st_mode, dflt_perms, exists);
}
#ifdef SUPPORT_HARD_LINKS
goto cleanup;
#endif
- if (preserve_links && S_ISLNK(file->mode)) {
+ if (preserve_links && ftype == FT_SYMLINK) {
#ifdef SUPPORT_LINKS
const char *sl = F_SYMLINK(file);
if (safe_symlinks && unsafe_symlink(sl, fname)) {
if (INFO_GTE(NAME, 1)) {
- if (solo_file)
+ if (solo_file) {
+ /* fname contains the destination path, but we
+ * want to report the source path. */
fname = f_name(file, NULL);
+ }
rprintf(FINFO,
- "ignoring unsafe symlink %s -> \"%s\"\n",
- full_fname(fname), sl);
+ "ignoring unsafe symlink \"%s\" -> \"%s\"\n",
+ fname, sl);
}
- return;
+ goto cleanup;
}
if (statret == 0) {
- char lnk[MAXPATHLEN];
- int len;
-
- if (S_ISLNK(sx.st.st_mode)
- && (len = do_readlink(fname, lnk, MAXPATHLEN-1)) > 0
- && strncmp(lnk, sl, len) == 0 && sl[len] == '\0') {
+ if (stype == FT_SYMLINK && quick_check_ok(stype, fname, file, &sx.st)) {
/* The link is pointing to the right place. */
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
if (itemizing)
itemize(fname, file, ndx, 0, &sx, 0, 0, NULL);
-#if defined SUPPORT_HARD_LINKS && defined CAN_HARDLINK_SYMLINK
+#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
finish_hard_link(file, fname, ndx, &sx.st, itemizing, code, -1);
#endif
goto cleanup;
}
} else if (basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, code);
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SYMLINK
- if (link_dest) {
+ if (alt_dest_type == LINK_DEST) {
/* Resort to --copy-dest behavior. */
} else
#endif
- if (!copy_dest)
+ if (alt_dest_type != COPY_DEST)
goto cleanup;
itemizing = 0;
code = FNONE;
- } else if (j >= 0)
+ } else if (j >= 0) {
statret = 1;
+ fnamecmp = fnamecmpbuf;
+ }
}
- if (atomic_create(file, fname, sl, MAKEDEV(0, 0), &sx, statret == 0 ? DEL_FOR_SYMLINK : 0)) {
+ if (atomic_create(file, fname, sl, NULL, MAKEDEV(0, 0), &sx, statret == 0 ? DEL_FOR_SYMLINK : 0)) {
set_file_attrs(fname, file, NULL, NULL, 0);
if (itemizing) {
- if (statret == 0 && !S_ISLNK(sx.st.st_mode))
+ if (statret == 0 && stype != FT_SYMLINK)
statret = -1;
- itemize(fname, file, ndx, statret, &sx,
+ itemize(fnamecmp, file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL);
}
if (code != FNONE && INFO_GTE(NAME, 1))
goto cleanup;
}
- if ((am_root && preserve_devices && IS_DEVICE(file->mode))
- || (preserve_specials && IS_SPECIAL(file->mode))) {
+ if ((am_root && preserve_devices && ftype == FT_DEVICE)
+ || (preserve_specials && ftype == FT_SPECIAL)) {
dev_t rdev;
- int del_for_flag = 0;
- if (IS_DEVICE(file->mode)) {
+ int del_for_flag;
+ if (ftype == FT_DEVICE) {
uint32 *devp = F_RDEV_P(file);
rdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
- } else
+ del_for_flag = DEL_FOR_DEVICE;
+ } else {
rdev = 0;
+ del_for_flag = DEL_FOR_SPECIAL;
+ }
if (statret == 0) {
- if (IS_DEVICE(file->mode)) {
- if (!IS_DEVICE(sx.st.st_mode))
- statret = -1;
- del_for_flag = DEL_FOR_DEVICE;
- } else {
- if (!IS_SPECIAL(sx.st.st_mode))
- statret = -1;
- del_for_flag = DEL_FOR_SPECIAL;
- }
- if (statret == 0
- && BITS_EQUAL(sx.st.st_mode, file->mode, _S_IFMT)
- && (IS_SPECIAL(sx.st.st_mode) || sx.st.st_rdev == rdev)) {
+ if (ftype != stype)
+ statret = -1;
+ else if (quick_check_ok(ftype, fname, file, &sx.st)) {
/* The device or special file is identical. */
set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
if (itemizing)
goto cleanup;
}
} else if (basis_dir[0] != NULL) {
- int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, code);
+ int j = try_dests_non(file, fname, ndx, fnamecmpbuf, &sx, itemizing, code);
if (j == -2) {
#ifndef CAN_HARDLINK_SPECIAL
- if (link_dest) {
+ if (alt_dest_type == LINK_DEST) {
/* Resort to --copy-dest behavior. */
} else
#endif
- if (!copy_dest)
+ if (alt_dest_type != COPY_DEST)
goto cleanup;
itemizing = 0;
code = FNONE;
- } else if (j >= 0)
+ } else if (j >= 0) {
statret = 1;
+ fnamecmp = fnamecmpbuf;
+ }
}
if (DEBUG_GTE(GENR, 1)) {
rprintf(FINFO, "mknod(%s, 0%o, [%ld,%ld])\n",
fname, (int)file->mode,
(long)major(rdev), (long)minor(rdev));
}
- if (atomic_create(file, fname, NULL, rdev, &sx, del_for_flag)) {
+ if (atomic_create(file, fname, NULL, NULL, rdev, &sx, del_for_flag)) {
set_file_attrs(fname, file, NULL, NULL, 0);
if (itemizing) {
- itemize(fname, file, ndx, statret, &sx,
+ itemize(fnamecmp, file, ndx, statret, &sx,
ITEM_LOCAL_CHANGE|ITEM_REPORT_CHANGE, 0, NULL);
}
if (code != FNONE && INFO_GTE(NAME, 1))
goto cleanup;
}
- if (!S_ISREG(file->mode)) {
- if (solo_file)
- fname = f_name(file, NULL);
- rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
+ if (ftype != FT_REG) {
+ if (INFO_GTE(NONREG, 1)) {
+ if (solo_file)
+ fname = f_name(file, NULL);
+ rprintf(FINFO, "skipping non-regular file \"%s\"\n", fname);
+ }
goto cleanup;
}
- if (max_size > 0 && F_LENGTH(file) > max_size) {
+ if (max_size >= 0 && F_LENGTH(file) > max_size) {
if (INFO_GTE(SKIP, 1)) {
if (solo_file)
fname = f_name(file, NULL);
}
goto cleanup;
}
- if (min_size > 0 && F_LENGTH(file) < min_size) {
+ if (min_size >= 0 && F_LENGTH(file) < min_size) {
if (INFO_GTE(SKIP, 1)) {
if (solo_file)
fname = f_name(file, NULL);
goto cleanup;
}
- if (update_only > 0 && statret == 0
- && cmp_time(sx.st.st_mtime, file->modtime) > 0) {
+ if (update_only > 0 && statret == 0 && file->modtime - sx.st.st_mtime < modify_window) {
if (INFO_GTE(SKIP, 1))
rprintf(FINFO, "%s is newer\n", fname);
#ifdef SUPPORT_HARD_LINKS
goto cleanup;
}
- fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
- if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
+ if (statret == 0 && !(stype == FT_REG || (write_devices && stype == FT_DEVICE))) {
if (delete_item(fname, sx.st.st_mode, del_opts | DEL_FOR_FILE) != 0)
goto cleanup;
statret = -1;
stat_errno = ENOENT;
}
- if (statret != 0 && basis_dir[0] != NULL) {
- int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx,
- itemizing, code);
+ if (basis_dir[0] != NULL && (statret != 0 || alt_dest_type != COPY_DEST)) {
+ int j = try_dests_reg(file, fname, ndx, fnamecmpbuf, &sx, statret == 0, itemizing, code);
if (j == -2) {
if (remove_source_files == 1)
goto return_with_success;
}
}
+ init_stat_x(&real_sx);
+ real_sx.st = sx.st; /* Don't copy xattr/acl pointers, as they would free wrong. */
real_ret = statret;
- real_sx = sx;
if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
- && link_stat(partialptr, &partial_st, 0) == 0
- && S_ISREG(partial_st.st_mode)) {
+ && link_stat(partialptr, &partial_st, 0) == 0
+ && S_ISREG(partial_st.st_mode)) {
if (statret != 0)
goto prepare_to_open;
} else
partialptr = NULL;
- if (statret != 0 && fuzzy_dirlist) {
- int j = find_fuzzy(file, fuzzy_dirlist);
- if (j >= 0) {
- fuzzy_file = fuzzy_dirlist->files[j];
+ if (statret != 0 && fuzzy_basis) {
+ if (need_fuzzy_dirlist) {
+ const char *dn = file->dirname ? file->dirname : ".";
+ int i;
+ strlcpy(fnamecmpbuf, dn, sizeof fnamecmpbuf);
+ for (i = 0; i < fuzzy_basis; i++) {
+ if (i && pathjoin(fnamecmpbuf, MAXPATHLEN, basis_dir[i-1], dn) >= MAXPATHLEN)
+ continue;
+ fuzzy_dirlist[i] = get_dirlist(fnamecmpbuf, -1, GDL_IGNORE_FILTER_RULES | GDL_PERHAPS_DIR);
+ if (fuzzy_dirlist[i] && fuzzy_dirlist[i]->used == 0) {
+ flist_free(fuzzy_dirlist[i]);
+ fuzzy_dirlist[i] = NULL;
+ }
+ }
+ need_fuzzy_dirlist = 0;
+ }
+
+ /* Sets fnamecmp_type to FNAMECMP_FUZZY or above. */
+ fuzzy_file = find_fuzzy(file, fuzzy_dirlist, &fnamecmp_type);
+ if (fuzzy_file) {
f_name(fuzzy_file, fnamecmpbuf);
if (DEBUG_GTE(FUZZY, 1)) {
rprintf(FINFO, "fuzzy basis selected for %s: %s\n",
sx.st.st_size = F_LENGTH(fuzzy_file);
statret = 0;
fnamecmp = fnamecmpbuf;
- fnamecmp_type = FNAMECMP_FUZZY;
}
}
goto cleanup;
}
+ if (write_devices && IS_DEVICE(sx.st.st_mode) && sx.st.st_size == 0) {
+ /* This early open into fd skips the regular open below. */
+ if ((fd = do_open(fnamecmp, O_RDONLY, 0)) >= 0)
+ real_sx.st.st_size = sx.st.st_size = get_device_size(fd, fnamecmp);
+ }
+
if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
;
- else if (fnamecmp_type == FNAMECMP_FUZZY)
+ else if (fnamecmp_type >= FNAMECMP_FUZZY)
;
- else if (unchanged_file(fnamecmp, file, &sx.st)) {
+ else if (quick_check_ok(FT_REG, fnamecmp, file, &sx.st)) {
if (partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
}
- set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT);
+ set_file_attrs(fname, file, &sx, NULL, maybe_ATTRS_REPORT | maybe_ATTRS_ACCURATE_TIME);
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
goto cleanup;
return_with_success:
if (!dry_run)
- send_msg_int(MSG_SUCCESS, ndx);
+ send_msg_success(fname, ndx);
goto cleanup;
}
goto notify_others;
}
- if (fuzzy_dirlist) {
- int j = flist_find(fuzzy_dirlist, file);
+ if (fuzzy_dirlist[0]) {
+ int j = flist_find(fuzzy_dirlist[0], file);
if (j >= 0) /* don't use changing file as future fuzzy basis */
- fuzzy_dirlist->files[j]->flags |= FLAG_FILE_SENT;
+ fuzzy_dirlist[0]->files[j]->flags |= FLAG_FILE_SENT;
}
/* open the file */
- if ((fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) {
+ if (fd < 0 && (fd = do_open(fnamecmp, O_RDONLY, 0)) < 0) {
rsyserr(FERROR, errno, "failed to open %s, continuing",
full_fname(fnamecmp));
pretend_missing:
if (inplace && make_backups > 0 && fnamecmp_type == FNAMECMP_FNAME) {
if (!(backupptr = get_backup_name(fname))) {
- close(fd);
goto cleanup;
}
if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) {
- close(fd);
goto pretend_missing;
}
if (robust_unlink(backupptr) && errno != ENOENT) {
full_fname(backupptr));
unmake_file(back_file);
back_file = NULL;
- close(fd);
goto cleanup;
}
if ((f_copy = do_open(backupptr, O_WRONLY | O_CREAT | O_TRUNC | O_EXCL, 0600)) < 0) {
rsyserr(FERROR_XFER, errno, "open %s", full_fname(backupptr));
unmake_file(back_file);
back_file = NULL;
- close(fd);
goto cleanup;
}
fnamecmp_type = FNAMECMP_BACKUP;
notify_others:
if (remove_source_files && !delay_updates && !phase && !dry_run)
increment_active_files(ndx, itemizing, code);
- if (inc_recurse && !dry_run)
+ if (inc_recurse && (!dry_run || write_batch < 0))
cur_flist->in_progress++;
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && F_IS_HLINKED(file))
iflags |= ITEM_REPORT_CHANGE;
if (fnamecmp_type != FNAMECMP_FNAME)
iflags |= ITEM_BASIS_TYPE_FOLLOWS;
- if (fnamecmp_type == FNAMECMP_FUZZY)
+ if (fnamecmp_type >= FNAMECMP_FUZZY)
iflags |= ITEM_XNAME_FOLLOWS;
itemize(fnamecmp, file, -1, real_ret, &real_sx, iflags, fnamecmp_type,
fuzzy_file ? fuzzy_file->basename : NULL);
-#ifdef SUPPORT_ACLS
- if (preserve_acls)
- free_acl(&real_sx);
-#endif
-#ifdef SUPPORT_XATTRS
- if (preserve_xattrs)
- free_xattr(&real_sx);
-#endif
+ free_stat_x(&real_sx);
}
if (!do_xfers) {
write_sum_head(f_out, NULL);
else if (sx.st.st_size <= 0) {
write_sum_head(f_out, NULL);
- close(fd);
} else {
if (generate_and_send_sums(fd, sx.st.st_size, f_out, f_copy) < 0) {
rprintf(FWARNING,
- "WARNING: file is too large for checksum sending: %s\n",
- fnamecmp);
+ "WARNING: file is too large for checksum sending: %s\n",
+ fnamecmp);
write_sum_head(f_out, NULL);
}
- close(fd);
}
cleanup:
+ if (fd >= 0)
+ close(fd);
if (back_file) {
int save_preserve_xattrs = preserve_xattrs;
if (f_copy >= 0)
unmake_file(back_file);
}
-#ifdef SUPPORT_ACLS
- if (preserve_acls)
- free_acl(&sx);
-#endif
-#ifdef SUPPORT_XATTRS
- if (preserve_xattrs)
- free_xattr(&sx);
-#endif
- return;
+ free_stat_x(&sx);
}
/* If we are replacing an existing hard link, symlink, device, or special file,
- * create a temp-name item and rename it into place. Only a symlink or hard
- * link puts a non-NULL value into the lnk arg. Only a device puts a non-0
- * value into the rdev arg. Specify 0 for the del_for_flag if there is not a
- * file to replace. This returns 1 on success and 0 on failure. */
-int atomic_create(struct file_struct *file, char *fname, const char *lnk,
+ * create a temp-name item and rename it into place. A symlimk specifies slnk,
+ * a hard link specifies hlnk, otherwise we create a device based on rdev.
+ * Specify 0 for the del_for_flag if there is not a file to replace. This
+ * returns 1 on success and 0 on failure. */
+int atomic_create(struct file_struct *file, char *fname, const char *slnk, const char *hlnk,
dev_t rdev, stat_x *sxp, int del_for_flag)
{
char tmpname[MAXPATHLEN];
create_name = skip_atomic ? fname : tmpname;
- if (lnk) {
+ if (slnk) {
#ifdef SUPPORT_LINKS
- if (S_ISLNK(file->mode)
-#ifdef SUPPORT_HARD_LINKS /* The first symlink in a hard-linked cluster is always created. */
- && (!F_IS_HLINKED(file) || file->flags & FLAG_HLINK_FIRST)
-#endif
- ) {
- if (do_symlink(lnk, create_name) < 0) {
- rsyserr(FERROR_XFER, errno, "symlink %s -> \"%s\" failed",
- full_fname(create_name), lnk);
- return 0;
- }
- } else
+ if (do_symlink(slnk, create_name) < 0) {
+ rsyserr(FERROR_XFER, errno, "symlink %s -> \"%s\" failed",
+ full_fname(create_name), slnk);
+ return 0;
+ }
+#else
+ return 0;
#endif
+ } else if (hlnk) {
#ifdef SUPPORT_HARD_LINKS
- if (!hard_link_one(file, create_name, lnk, 0))
+ if (!hard_link_one(file, create_name, hlnk, 0))
return 0;
+#else
+ return 0;
#endif
} else {
if (do_mknod(create_name, file->mode, rdev) < 0) {
static int counter = 0;
struct file_struct *file;
char *fname;
+ BOOL fix_dir_perms;
int i, start, end;
if (ndx < 0) {
* transfer and/or re-set any tweaked modified-time values. */
for (i = start; i <= end; i++, counter++) {
file = flist->files[i];
+ if (!F_IS_ACTIVE(file))
+ continue;
if (!S_ISDIR(file->mode)
|| (!implied_dirs && file->flags & FLAG_IMPLIED_DIR))
continue;
rprintf(FINFO, "touch_up_dirs: %s (%d)\n",
NS(fname), i);
}
- if (!F_IS_ACTIVE(file) || file->flags & FLAG_MISSING_DIR
- || (!need_retouch_dir_times && file->mode & S_IWUSR))
+ /* Be sure not to retouch permissions with --fake-super. */
+ fix_dir_perms = !am_root && !(file->mode & S_IWUSR);
+ if (file->flags & FLAG_MISSING_DIR || !(need_retouch_dir_times || fix_dir_perms))
continue;
fname = f_name(file, NULL);
- if (!(file->mode & S_IWUSR))
+ if (fix_dir_perms)
do_chmod(fname, file->mode);
if (need_retouch_dir_times) {
STRUCT_STAT st;
- if (link_stat(fname, &st, 0) == 0
- && cmp_time(st.st_mtime, file->modtime) != 0)
- set_modtime(fname, file->modtime, file->mode);
+ if (link_stat(fname, &st, 0) == 0 && mtime_differs(&st, file)) {
+ st.st_mtime = file->modtime;
+#ifdef ST_MTIME_NSEC
+ st.ST_MTIME_NSEC = F_MOD_NSEC_or_0(file);
+#endif
+ set_times(fname, &st);
+ }
}
if (counter >= loopchk_limit) {
if (allowed_lull)
- maybe_send_keepalive();
+ maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
else
maybe_flush_socket(0);
counter = 0;
while (1) {
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links && (ndx = get_hlink_num()) != -1) {
+ int send_failed = (ndx == -2);
+ if (send_failed)
+ ndx = get_hlink_num();
flist = flist_for_ndx(ndx, "check_for_finished_files.1");
file = flist->files[ndx - flist->ndx_start];
assert(file->flags & FLAG_HLINKED);
- finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1);
+ if (send_failed)
+ handle_skipped_hlink(file, itemizing, code, sock_f_out);
+ else
+ finish_hard_link(file, f_name(file, fbuf), ndx, NULL, itemizing, code, -1);
flist->in_progress--;
continue;
}
#endif
if (check_redo && (ndx = get_redo_num()) != -1) {
+ OFF_T save_max_size = max_size;
+ OFF_T save_min_size = min_size;
csum_length = SUM_LENGTH;
- max_size = -max_size;
- min_size = -min_size;
+ max_size = -1;
+ min_size = -1;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
cur_flist = flist;
csum_length = SHORT_SUM_LENGTH;
- max_size = -max_size;
- min_size = -min_size;
+ max_size = save_max_size;
+ min_size = save_min_size;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
}
solo_file = local_name;
dir_tweaking = !(list_only || solo_file || dry_run);
- need_retouch_dir_times = preserve_times > 1;
+ need_retouch_dir_times = preserve_mtimes && !omit_dir_times;
loopchk_limit = allowed_lull ? allowed_lull * 5 : 200;
symlink_timeset_failed_flags = ITEM_REPORT_TIME
| (protocol_version >= 30 || !am_server ? ITEM_REPORT_TIMEFAIL : 0);
implied_dirs_are_missing = relative_paths && !implied_dirs && protocol_version < 30;
if (DEBUG_GTE(GENR, 1))
- rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
+ rprintf(FINFO, "generator starting pid=%d\n", (int)getpid());
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
deldelay_size = BIGPATHBUFLEN * 4;
deldelay_buf = new_array(char, deldelay_size);
- if (!deldelay_buf)
- out_of_memory("delete-delay");
}
info_levels[INFO_FLIST] = info_levels[INFO_PROGRESS] = 0;
: "enabled");
}
- /* Since we often fill up the outgoing socket and then just sit around
- * waiting for the other 2 processes to do their thing, we don't want
- * to exit on a timeout. If the data stops flowing, the receiver will
- * notice that and let us know via the redo pipe (or its closing). */
- ignore_timeout = 1;
-
dflt_perms = (ACCESSPERMS & ~orig_umask);
do {
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
- delete_in_dir(fbuf, fp, &dirdev);
+ delete_in_dir(fbuf, fp, dirdev);
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
if (i + cur_flist->ndx_start >= next_loopchk) {
if (allowed_lull)
- maybe_send_keepalive();
+ maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
else
maybe_flush_socket(0);
next_loopchk += loopchk_limit;
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
- delete_in_dir(NULL, NULL, &dev_zero);
+ delete_in_dir(NULL, NULL, dev_zero);
phase++;
if (DEBUG_GTE(GENR, 1))
rprintf(FINFO, "generate_files phase=%d\n", phase);
git.samba.org / rsync.git / blobdiff