[SCM] The rsync repository. - branch master updated
Rsync CVS commit messages
rsync-cvs at lists.samba.org
Thu Apr 23 20:26:59 UTC 2020
The branch, master has been updated
via b9367410 Added --atimes and --set-noatime options.
via 2b2a3c87 Mention more changes in the NEWS.
from 6e962ac5 Eliminate .in for rsync-ssl.
https://git.samba.org/?p=rsync.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b936741032fbfcd41b74ae4ca76ea718df25c64b
Author: Wayne Davison <wayne at opencoder.net>
Date: Thu Apr 23 13:17:41 2020 -0700
Added --atimes and --set-noatime options.
commit 2b2a3c87b6390ffef87311eb6551117a312d4f61
Author: Wayne Davison <wayne at opencoder.net>
Date: Thu Apr 23 13:13:35 2020 -0700
Mention more changes in the NEWS.
-----------------------------------------------------------------------
Summary of changes:
NEWS | 59 +++++++++++++++++++++++++++++++++++++--
compat.c | 16 ++++++++---
flist.c | 27 ++++++++++++++++--
generator.c | 53 ++++++++++++++++++++++-------------
log.c | 3 +-
options.c | 22 +++++++++++++++
rsync.c | 53 ++++++++++++++++++++++++++++-------
rsync.h | 43 +++++++++++++++++++++++++++--
rsync.yo | 26 +++++++++++++++++-
syscall.c | 66 ++++++++++++++++++++++++++++++++------------
t_stub.c | 1 +
testsuite/atimes.test | 17 ++++++++++++
testsuite/daemon.test | 11 +++++++-
testsuite/rsync.fns | 17 +++++++++++-
tls.c | 76 +++++++++++++++++++++++++++++++--------------------
trimslash.c | 1 +
util.c | 35 +++++++++++-------------
17 files changed, 416 insertions(+), 110 deletions(-)
create mode 100644 testsuite/atimes.test
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index de493a05..e3323c61 100644
--- a/NEWS
+++ b/NEWS
@@ -7,12 +7,67 @@ Changes since 3.1.3:
- Avoid a potential out-of-bounds read in daemon mode if argc can be made
to become 0.
+ - Fix the default list of skip-compress files for non-daemon transfers.
+
- Fix xattr filter rules losing an 'x' attribute in a non-local transfer.
- - Fix a compiler error/warning about shifting a negative value (in the zlib
- code).
+ - Avoid an error when a check for a potential fuzzy file happens to
+ reference a directory.
+
+ - Make the atomic-rsync helper script have a more consistent error-exit.
+
+ - Make sure that a signal handler calls _exit() instead of exit().
+
+ - Various zlib fixes, including security fixes for CVE-2016-9843,
+ CVE-2016-9842, CVE-2016-9841, and CVE-2016-9840.
+
+ - Fixed an issue with --remove-source-files not removing a source symlink
+ when combined with --copy-links.
+
+ - Fixed the block-size validation logic when dealing with older protocols.
+
+ - Some rrsync fixes and enhancements to handle the latest options.
ENHANCEMENTS:
+ - Improved the --atimes patch and promoted it to be in the release.
+
+ - Added --set-noatime option to open files using O_NOATIME.
+
+ - Improved the --write-devices patch and promoted it to be in the release.
+
+ - Added openssl support to the rsync-ssl script via its renamed helper
+ script, rsync-ssl-rsh. Install both bash scripts by default now
+ (removing the install-ssl-client make target). Rsync was also enhanced
+ to set the RSYNC_PORT environment variable when running a daemon-over-rsh
+ script. Its value is the user-specified port number (set via --port or an
+ rsync:// URL) or 0 if the user didn't override the port.
+
+ - Added a status output based on a signal (via both SIGINFO & SIGVTALRM).
+
+ - Added a --copy-as=USER option to give some extra security to root-run
+ rsync commands into/from untrusted directories (such as backups and
+ restores).
+
- Added support for RSYNC_SHELL & RSYNC_NO_XFER_EXEC environment variables
that affect the pre-xfer exec and post-xfer exec rsync daemon options.
+
+ - Fixed a crash in the --iconv code.
+
+ - Fixed a problem with the --link-dest|--copy-dest code when --xattrs was
+ specified along with multiple alternate-destination directories (it could
+ possibly choose a bad file match while trying to find a better xattr
+ match).
+
+ - Various manpage improvements.
+
+ DEVELOPER RELATED:
+
+ - Silenced some annoying warnings about major()|minor() due to the autoconf
+ include-file check not being smart enough.
+
+ - Improved some configure checks to work better with strict C99 compilers.
+
+ - Some perl scripts were recoded into awk and python3.
+
+ - Some code typos were fixed (as pointed out by a Fossies run).
diff --git a/compat.c b/compat.c
index 17113ae4..6298b904 100644
--- a/compat.c
+++ b/compat.c
@@ -48,6 +48,7 @@ extern int protocol_version;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
+extern int preserve_atimes;
extern int preserve_acls;
extern int preserve_xattrs;
extern int need_messages_from_generator;
@@ -65,7 +66,7 @@ extern char *iconv_opt;
#endif
/* These index values are for the file-list's extra-attribute array. */
-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+int pathname_ndx, depth_ndx, atimes_ndx, uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
int sender_symlink_iconv = 0; /* sender should convert symlink content */
@@ -136,10 +137,17 @@ void set_allow_inc_recurse(void)
void setup_protocol(int f_out,int f_in)
{
- if (am_sender)
- file_extra_cnt += PTR_EXTRA_CNT;
+ assert(file_extra_cnt == 0);
+ assert(EXTRA64_CNT == 2 || EXTRA64_CNT == 1);
+
+ /* All int64 values must be set first so that they are guaranteed to be
+ * aligned for direct int64-pointer memory access. */
+ if (preserve_atimes)
+ atimes_ndx = (file_extra_cnt += EXTRA64_CNT);
+ if (am_sender) /* This is most likely in the in64 union as well. */
+ pathname_ndx = (file_extra_cnt += PTR_EXTRA_CNT);
else
- file_extra_cnt++;
+ depth_ndx = ++file_extra_cnt;
if (preserve_uid)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
diff --git a/flist.c b/flist.c
index a67e3653..a756fb67 100644
--- a/flist.c
+++ b/flist.c
@@ -55,6 +55,7 @@ extern int preserve_specials;
extern int delete_during;
extern int missing_args;
extern int eol_nulls;
+extern int atimes_ndx;
extern int relative_paths;
extern int implied_dirs;
extern int ignore_perishable;
@@ -379,7 +380,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
#endif
int ndx, int first_ndx)
{
- static time_t modtime;
+ static time_t modtime, atime;
static mode_t mode;
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
@@ -479,6 +480,12 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
modtime = file->modtime;
if (NSEC_BUMP(file) && protocol_version >= 31)
xflags |= XMIT_MOD_NSEC;
+ if (atimes_ndx && !S_ISDIR(mode)) {
+ if (F_ATIME(file) == atime)
+ xflags |= XMIT_SAME_ATIME;
+ else
+ atime = F_ATIME(file);
+ }
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != -1) {
@@ -565,6 +572,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
write_varint(f, F_MOD_NSEC(file));
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
+ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
+ write_varlong(f, atime, 4);
if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
if (protocol_version < 30)
write_int(f, uid);
@@ -652,7 +661,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
{
- static int64 modtime;
+ static int64 modtime, atime;
static mode_t mode;
#ifdef SUPPORT_HARD_LINKS
static int64 dev;
@@ -799,6 +808,16 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
modtime_nsec = 0;
if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
+ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {
+ atime = read_varlong(f, 4);
+#if SIZEOF_TIME_T < SIZEOF_INT64
+ if (!am_generator && (int64)(time_t)atime != atime) {
+ rprintf(FERROR_XFER,
+ "Access time value of %s truncated on receiver.\n",
+ lastname);
+ }
+#endif
+ }
if (chmod_modes && !S_ISLNK(mode) && mode)
mode = tweak_mode(mode, chmod_modes);
@@ -966,6 +985,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
+ if (atimes_ndx)
+ F_ATIME(file) = atime;
if (unsort_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
@@ -1363,6 +1384,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
F_GROUP(file) = st.st_gid;
if (am_generator && st.st_uid == our_uid)
file->flags |= FLAG_OWNED_BY_US;
+ if (atimes_ndx)
+ F_ATIME(file) = st.st_atime;
if (basename != thisname)
file->dirname = lastdir;
diff --git a/generator.c b/generator.c
index 7ec924cf..3c50f63f 100644
--- a/generator.c
+++ b/generator.c
@@ -506,6 +506,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
: iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
iflags |= ITEM_REPORT_TIME;
+ if (atimes_ndx && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
+ && cmp_time(F_ATIME(file), 0, sxp->st.st_atime, 0) != 0)
+ iflags |= ITEM_REPORT_ATIME;
#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
if (S_ISLNK(file->mode)) {
;
@@ -916,6 +919,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
if (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)) {
@@ -1120,35 +1125,40 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
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;
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, human_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, "*missing",
f_name(f, NULL));
} else {
- rprintf(FINFO, "%s %*s %s %s\n",
- permbuf, colwidth, human_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 *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\n",
+ permbuf, size_width, human_num(F_LENGTH(f)),
+ timestring(f->modtime), atime_width, atime_str,
+ f_name(f, NULL), arrow, lnk);
}
}
@@ -2064,8 +2074,13 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
do_chmod(fname, file->mode);
if (need_retouch_dir_times) {
STRUCT_STAT st;
- if (link_stat(fname, &st, 0) == 0 && time_diff(&st, file))
- set_modtime(fname, file->modtime, F_MOD_NSEC_or_0(file), file->mode);
+ if (link_stat(fname, &st, 0) == 0 && time_diff(&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)
diff --git a/log.c b/log.c
index 3c6b1b9b..ae6214da 100644
--- a/log.c
+++ b/log.c
@@ -716,7 +716,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
- c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
+ c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
+ : S_ISLNK(file->mode) ? 'U' : 'u';
c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
c[11] = '\0';
diff --git a/options.c b/options.c
index d567d649..95ec6da0 100644
--- a/options.c
+++ b/options.c
@@ -63,7 +63,9 @@ int preserve_specials = 0;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
+int preserve_atimes = 0;
int update_only = 0;
+int set_noatime = 0;
int cvs_exclude = 0;
int dry_run = 0;
int do_xfers = 1;
@@ -711,6 +713,8 @@ void usage(enum logcode F)
rprintf(F," --specials preserve special files\n");
rprintf(F," -D same as --devices --specials\n");
rprintf(F," -t, --times preserve modification times\n");
+ rprintf(F," -U, --atimes preserve access (last-used) times\n");
+ rprintf(F," --set-noatime avoid changing the atime on accessed files\n");
rprintf(F," -O, --omit-dir-times omit directories from --times\n");
rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
rprintf(F," --super receiver attempts super-user activities\n");
@@ -872,6 +876,11 @@ static struct poptOption long_options[] = {
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"atimes", 'U', POPT_ARG_NONE, 0, 'U', 0, 0 },
+ {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
+ {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
+ {"set-noatime", 0, POPT_ARG_VAL, &set_noatime, 1, 0, 0 },
+ {"no-set-noatime", 0, POPT_ARG_VAL, &set_noatime, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
{"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
@@ -1543,6 +1552,11 @@ int parse_arguments(int *argc_p, const char ***argv_p)
itemize_changes++;
break;
+ case 'U':
+ if (++preserve_atimes > 1)
+ set_noatime = 1;
+ break;
+
case 'v':
verbose++;
break;
@@ -2493,6 +2507,11 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
+ if (preserve_atimes) {
+ argstr[x++] = 'U';
+ if (preserve_atimes > 1)
+ argstr[x++] = 'U';
+ }
if (preserve_perms)
argstr[x++] = 'p';
else if (preserve_executability && am_sender)
@@ -2831,6 +2850,9 @@ void server_options(char **args, int *argc_p)
if (preallocate_files && am_sender)
args[ac++] = "--preallocate";
+ if (set_noatime && preserve_atimes <= 1)
+ args[ac++] = "--set-noatime";
+
if (ac > MAX_SERVER_ARGS) { /* Not possible... */
rprintf(FERROR, "argc overflow in server_options().\n");
exit_cleanup(RERR_MALLOC);
diff --git a/rsync.c b/rsync.c
index 9479f24c..19f09c35 100644
--- a/rsync.c
+++ b/rsync.c
@@ -63,6 +63,15 @@ iconv_t ic_chck = (iconv_t)-1;
iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1;
# endif
+#define UPDATED_OWNER (1<<0)
+#define UPDATED_GROUP (1<<1)
+#define UPDATED_MTIME (1<<2)
+#define UPDATED_ATIME (1<<3)
+#define UPDATED_ACLS (1<<4)
+#define UPDATED_MODE (1<<5)
+
+#define UPDATED_TIMES (UPDATED_MTIME|UPDATED_ATIME)
+
static const char *default_charset(void)
{
# if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
@@ -540,7 +549,10 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
keep_dirlinks && S_ISDIR(sxp->st.st_mode));
}
}
- updated = 1;
+ if (change_uid)
+ updated |= UPDATED_OWNER;
+ if (change_gid)
+ updated |= UPDATED_GROUP;
}
#ifdef SUPPORT_XATTRS
@@ -553,23 +565,44 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
if (!preserve_times
|| (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
|| (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
- flags |= ATTRS_SKIP_MTIME;
+ flags |= ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME;
+ else if (sxp != &sx2)
+ memcpy(&sx2.st, &sxp->st, sizeof (sx2.st));
+ if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
+ flags |= ATTRS_SKIP_ATIME;
if (!(flags & ATTRS_SKIP_MTIME)
&& (sxp->st.st_mtime != file->modtime
#ifdef ST_MTIME_NSEC
|| (flags & ATTRS_SET_NANO && NSEC_BUMP(file) && (uint32)sxp->st.ST_MTIME_NSEC != F_MOD_NSEC(file))
#endif
)) {
- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC_or_0(file), sxp->st.st_mode);
+ sx2.st.st_mtime = file->modtime;
+#ifdef ST_MTIME_NSEC
+ sx2.st.ST_MTIME_NSEC = F_MOD_NSEC_or_0(file);
+#endif
+ updated |= UPDATED_MTIME;
+ }
+ if (!(flags & ATTRS_SKIP_ATIME)) {
+ time_t file_atime = F_ATIME(file);
+ if (cmp_time(sxp->st.st_atime, 0, file_atime, 0) != 0) {
+ sx2.st.st_atime = file_atime;
+#ifdef ST_ATIME_NSEC
+ sx2.st.ST_ATIME_NSEC = 0;
+#endif
+ updated |= UPDATED_ATIME;
+ }
+ }
+ if (updated & UPDATED_TIMES) {
+ int ret = set_times(fname, &sx2.st);
if (ret < 0) {
rsyserr(FERROR_XFER, errno, "failed to set times on %s",
full_fname(fname));
goto cleanup;
}
- if (ret == 0) /* ret == 1 if symlink could not be set */
- updated = 1;
- else
+ if (ret > 0) { /* ret == 1 if symlink could not be set */
+ updated &= ~UPDATED_TIMES;
file->flags |= FLAG_TIME_FAILED;
+ }
}
#ifdef SUPPORT_ACLS
@@ -581,7 +614,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
* need to chmod(). */
if (preserve_acls && !S_ISLNK(new_mode)) {
if (set_acl(fname, file, sxp, new_mode) > 0)
- updated = 1;
+ updated |= UPDATED_ACLS;
}
#endif
@@ -595,7 +628,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
goto cleanup;
}
if (ret == 0) /* ret == 1 if symlink could not be set */
- updated = 1;
+ updated |= UPDATED_MODE;
}
#endif
@@ -676,7 +709,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
/* Change permissions before putting the file into place. */
set_file_attrs(fnametmp, file, NULL, fnamecmp,
- ok_to_set_time ? ATTRS_SET_NANO : ATTRS_SKIP_MTIME);
+ ok_to_set_time ? ATTRS_SET_NANO : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
/* move tmp file over real file */
if (DEBUG_GTE(RECV, 1))
@@ -701,7 +734,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
do_set_file_attrs:
set_file_attrs(fnametmp, file, NULL, fnamecmp,
- ok_to_set_time ? ATTRS_SET_NANO : ATTRS_SKIP_MTIME);
+ ok_to_set_time ? ATTRS_SET_NANO : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
if (temp_copy_name) {
--
The rsync repository.
More information about the rsync-cvs
mailing list