(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
--- orig/flist.c 2005-07-27 23:31:12
-+++ flist.c 2005-02-07 21:06:04
-@@ -54,6 +54,7 @@ extern int relative_paths;
++++ flist.c 2005-07-28 00:16:34
+@@ -50,6 +50,7 @@ extern int preserve_perms;
+ extern int preserve_devices;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_atimes;
+ extern int relative_paths;
extern int implied_dirs;
extern int copy_links;
- extern int copy_unsafe_links;
-+extern int copy_atimes;
- extern int protocol_version;
- extern int sanitize_paths;
- extern int orig_umask;
@@ -141,16 +142,18 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
-+ if (copy_atimes && !S_ISDIR(mode)) {
++ if (preserve_atimes && !S_ISDIR(mode)) {
+ if (file->atime == atime)
+ flags |= XMIT_SAME_ATIME;
+ else
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
-+ if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
++ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
+ write_int(f, atime);
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
-+ if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
++ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
+ atime = (time_t)read_int(f);
if (preserve_uid && !(flags & XMIT_SAME_UID))
file->mode = st.st_mode;
file->uid = st.st_uid;
--- orig/generator.c 2005-07-27 23:31:12
-+++ generator.c 2004-11-03 23:02:12
-@@ -377,7 +377,7 @@ static int unchanged_file(char *fn, stru
++++ generator.c 2005-07-28 00:14:43
+@@ -44,6 +44,7 @@ extern int preserve_uid;
+ extern int preserve_gid;
+ extern int preserve_times;
+ extern int omit_dir_times;
++extern int preserve_atimes;
+ extern int delete_before;
+ extern int delete_during;
+ extern int delete_after;
+@@ -323,9 +324,21 @@ void itemize(struct file_struct *file, i
+ : S_ISDIR(file->mode) ? !omit_dir_times
+ : !S_ISLNK(file->mode);
+
++ if (iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
++ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) {
++ iflags |= ITEM_REPORT_TIME;
++ if (!preserve_atimes && !S_ISDIR(file->mode))
++ iflags |= ITEM_REPORT_ATIME;
++ } else {
++ if (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)
++ iflags |= ITEM_REPORT_TIME;
++ if (preserve_atimes && !S_ISDIR(file->mode)
++ && cmp_time(file->atime, st->st_atime) != 0)
++ iflags |= ITEM_REPORT_ATIME;
++ }
+ 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))
+@@ -377,7 +390,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
return 0;
}
-@@ -851,7 +851,7 @@ static void recv_generator(char *fname,
+@@ -530,7 +543,7 @@ static int find_fuzzy(struct file_struct
+ 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",
+@@ -851,7 +864,7 @@ static void recv_generator(char *fname,
}
if (update_only && statret == 0
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", safe_fname(fname));
return;
+--- orig/log.c 2005-06-10 21:33:28
++++ log.c 2005-07-28 00:22:30
+@@ -38,6 +38,7 @@ extern int module_id;
+ extern int msg_fd_out;
+ extern int protocol_version;
+ extern int preserve_times;
++extern int preserve_atimes;
+ extern int log_format_has_o_or_i;
+ extern int daemon_log_format_has_o_or_i;
+ extern char *auth_user;
+@@ -501,11 +502,14 @@ static void log_formatted(enum logcode c
+ n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
+ : !preserve_times || IS_DEVICE(file->mode)
+ || S_ISLNK(file->mode) ? 'T' : 't';
+- n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+- n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+- n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+- n[8] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a';
+- n[9] = '\0';
++ n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.'
++ : !preserve_atimes || IS_DEVICE(file->mode)
++ || S_ISLNK(file->mode) ? 'A' : 'a';
++ n[6] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
++ n[7] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
++ n[8] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
++ n[9] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a';
++ n[10] = '\0';
+
+ if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
+ char ch = iflags & ITEM_IS_NEW ? '+' : '?';
--- orig/options.c 2005-07-27 23:31:12
-+++ options.c 2005-02-21 10:53:28
++++ options.c 2005-07-28 01:00:24
@@ -49,6 +49,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int omit_dir_times = 0;
-+int copy_atimes = 0;
++int preserve_atimes = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -286,6 +287,7 @@ void usage(enum logcode F)
+@@ -285,8 +286,9 @@ void usage(enum logcode F)
+ rprintf(F," -o, --owner preserve owner (root only)\n");
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
- rprintf(F," -t, --times preserve times\n");
-+ rprintf(F," -A, --copy-atimes copy access times\n");
- rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
+- rprintf(F," -t, --times preserve times\n");
+- rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
++ rprintf(F," -t, --times preserve modify times\n");
++ rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
++ rprintf(F," -A, --atimes preserve access times\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
+ rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\n");
@@ -413,6 +415,7 @@ static struct poptOption long_options[]
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
-+ {"copy-atimes", 'A', POPT_ARG_NONE, ©_atimes, 0, 0, 0 },
++ {"atimes", 'A', POPT_ARG_NONE, &preserve_atimes, 0, 0, 0 },
{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
-+ if (copy_atimes)
++ if (preserve_atimes)
+ argstr[x++] = 'A';
if (omit_dir_times == 2 && am_sender)
argstr[x++] = 'O';
if (preserve_perms)
--- orig/rsync.c 2005-07-27 23:31:12
-+++ rsync.c 2005-07-27 23:35:49
++++ rsync.c 2005-07-28 00:17:37
@@ -27,6 +27,7 @@ extern int dry_run;
extern int daemon_log_format_has_i;
extern int preserve_times;
extern int omit_dir_times;
-+extern int copy_atimes;
++extern int preserve_atimes;
extern int am_root;
extern int am_server;
extern int am_sender;
if (!st) {
if (dry_run)
-@@ -68,18 +70,31 @@ int set_perms(char *fname,struct file_st
- st = &st2;
- }
+@@ -70,16 +72,29 @@ int set_perms(char *fname,struct file_st
-+ if (!copy_atimes || S_ISDIR(st->st_mode))
-+ flags |= PERMS_SKIP_ATIME;
if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
flags |= PERMS_SKIP_MTIME;
-+ if (!(flags & PERMS_SKIP_ATIME)
-+ && cmp_time(st->st_atime, file->atime) != 0) {
-+ atime = file->atime;
-+ updated = 1;
-+ } else
-+ atime = st->st_atime;
++ if (!preserve_atimes || S_ISDIR(st->st_mode))
++ flags |= PERMS_SKIP_ATIME;
if (!(flags & PERMS_SKIP_MTIME)
- && cmp_modtime(st->st_mtime, file->modtime) != 0) {
- int ret = set_modtime(fname, file->modtime, st->st_mode);
+ updated = 1;
+ } else
+ mtime = st->st_mtime;
++ if (!(flags & PERMS_SKIP_ATIME)
++ && cmp_time(st->st_atime, file->atime) != 0) {
++ atime = file->atime;
++ updated = 1;
++ } else
++ atime = st->st_atime;
+ if (updated) {
+ int ret = set_times(fname, mtime, atime, st->st_mode);
if (ret < 0) {
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
--- orig/rsync.h 2005-05-03 17:11:01
-+++ rsync.h 2004-07-03 20:15:41
++++ rsync.h 2005-07-28 00:04:51
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
#define XMIT_SAME_DEV (1<<10)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -509,6 +511,7 @@ struct file_struct {
+@@ -139,6 +141,7 @@
+ #define DEL_TERSE (1<<3)
+
+ /* For use by the itemize_changes code */
++#define ITEM_REPORT_ATIME (1<<0)
+ #define ITEM_REPORT_CHECKSUM (1<<1)
+ #define ITEM_REPORT_SIZE (1<<2)
+ #define ITEM_REPORT_TIME (1<<3)
+@@ -509,6 +512,7 @@ struct file_struct {
struct hlink *links;
} link_u;
time_t modtime;
gid_t gid;
mode_t mode;
--- orig/rsync.yo 2005-07-07 23:11:09
-+++ rsync.yo 2005-01-24 01:57:18
-@@ -311,6 +311,7 @@ to the detailed description below for a
++++ rsync.yo 2005-07-28 01:04:09
+@@ -309,8 +309,9 @@ to the detailed description below for a
+ -o, --owner preserve owner (root only)
+ -g, --group preserve group
-D, --devices preserve devices (root only)
- -t, --times preserve times
+- -t, --times preserve times
++ -t, --times preserve modify times
-O, --omit-dir-times omit directories when preserving times
-+ -A, --copy-atimes copy access times
++ -A, --atimes preserve access times
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy files whole (without rsync algorithm)
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).
-+dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
-+along with the files and update them on the remote system. Note that
-+reading the source file may update the atime, so repeated rsync runs
-+with --copy-atimes may be needed if you want the atime values to be
-+100% identical.
++dit(bf(-A, --atimes)) This tells rsync to set the access times of the
++destination files to the same value as the source files. Note that the
++reading of the source file may update the atime of the source files, so
++repeated rsync runs with --atimes may be needed if you want to force the
++access-time values to be 100% identical on the two systems.
+
dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
instead it will just report the actions it would have taken.
---- orig/testsuite/copy-atimes.test 2004-06-30 00:06:23
-+++ testsuite/copy-atimes.test 2004-06-30 00:06:23
+@@ -1055,7 +1062,7 @@ changes that are being made to each file
+ This is exactly the same as specifying bf(--log-format='%i %n%L').
+
+ The "%i" escape has a cryptic output that is 9 letters long. The general
+-format is like the string bf(UXcstpoga)), where bf(U) is replaced by the
++format is like the string bf(UXcstapogx)), where bf(U) is replaced by the
+ kind of update being done, bf(X) is replaced by the file-type, and the
+ other letters represent attributes that may be output if they are being
+ modified.
+@@ -1094,17 +1101,22 @@ quote(itemize(
+ by the file transfer.
+ it() A bf(t) means the modification time is different and is being updated
+ to the sender's value (requires bf(--times)). An alternate value of bf(T)
+- means that the time will be set to the transfer time, which happens
++ means that the modify time will be set to the transfer time, which happens
+ anytime a symlink is transferred, or when a file or device is transferred
+ without bf(--times).
++ it() A bf(a) means the access time is different and is being updated to
++ the sender's value (requires bf(--atimes)). An alternate value of bf(A)
++ means that the access time will be set to the transfer time, which happens
++ anytime a symlink is transferred, or when a file or device is transferred
++ without bf(--atimes).
+ it() A bf(p) means the permissions are different and are being updated to
+ the sender's value (requires bf(--perms)).
+ it() An bf(o) means the owner is different and is being updated to the
+ sender's value (requires bf(--owner) and root privileges).
+ it() A bf(g) means the group is different and is being updated to the
+ sender's value (requires bf(--group) and the authority to set the group).
+- it() The bf(a) is reserved for a future enhanced version that supports
+- extended file attributes, such as ACLs.
++ it() The bf(x) is reserved for a future enhanced version that supports
++ extended file attributes.
+ ))
+
+ One other output is possible: when deleting files, the "%i" will output
+--- orig/testsuite/atimes.test 2004-06-30 00:06:23
++++ testsuite/atimes.test 2004-06-30 00:06:23
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
+--- orig/testsuite/itemize.test 2005-07-07 20:35:48
++++ testsuite/itemize.test 2005-07-28 00:29:54
+@@ -44,14 +44,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
+ $RSYNC -iplr "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+->f+++++++ bar/baz/rsync
+-cd+++++++ foo/
+->f+++++++ foo/config1
+->f+++++++ foo/config2
+->f+++++++ foo/extra
+-cL+++++++ foo/sym -> ../bar/baz/rsync
++cd++++++++ bar/
++cd++++++++ bar/baz/
++>f++++++++ bar/baz/rsync
++cd++++++++ foo/
++>f++++++++ foo/config1
++>f++++++++ foo/config2
++>f++++++++ foo/extra
++cL++++++++ foo/sym -> ../bar/baz/rsync
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
+
+@@ -63,10 +63,10 @@ chmod 601 "$fromdir/foo/config2"
+ $RSYNC -iplrH "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+->f..T.... bar/baz/rsync
+->f..T.... foo/config1
+->f.sTp... foo/config2
+-hf..T.... foo/extra => foo/config1
++>f..TA.... bar/baz/rsync
++>f..TA.... foo/config1
++>f.sTAp... foo/config2
++hf..TA.... foo/extra => foo/config1
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
+
+@@ -83,11 +83,11 @@ chmod 777 "$todir/bar/baz/rsync"
+ $RSYNC -iplrtc "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-.f..tp... bar/baz/rsync
+-.d..t.... foo/
+-.f..t.... foo/config1
+->fcstp... foo/config2
+-cL..T.... foo/sym -> ../bar/baz/rsync
++.f..t.p... bar/baz/rsync
++.d..t..... foo/
++.f..t..... foo/config1
++>fcst.p... foo/config2
++cL..TA.... foo/sym -> ../bar/baz/rsync
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
+
+@@ -112,15 +112,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ filter_outfile
+ cat <<EOT >"$chkfile"
+-.d ./
+-.d bar/
+-.d bar/baz/
+-.f...p... bar/baz/rsync
+-.d foo/
+-.f foo/config1
+->f..t.... foo/config2
+-hf foo/extra
+-.L foo/sym -> ../bar/baz/rsync
++.d ./
++.d bar/
++.d bar/baz/
++.f....p... bar/baz/rsync
++.d foo/
++.f foo/config1
++>f..t..... foo/config2
++hf foo/extra
++.L foo/sym -> ../bar/baz/rsync
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
+
+@@ -139,8 +139,8 @@ touch "$todir/foo/config2"
+ $RSYNC -iplrtH "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-.f...p... foo/config1
+->f..t.... foo/config2
++.f....p... foo/config1
++>f..t..... foo/config2
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
+
+@@ -149,15 +149,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$
+ | tee "$outfile"
+ filter_outfile
+ cat <<EOT >"$chkfile"
+-.d..t.... ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-cf....... bar/baz/rsync
+-cd+++++++ foo/
+-cf....... foo/config1
+-cf....... foo/config2
+-hf+++++++ foo/extra => foo/config1
+-cL+++++++ foo/sym -> ../bar/baz/rsync
++.d..t..... ./
++cd++++++++ bar/
++cd++++++++ bar/baz/
++cf........ bar/baz/rsync
++cd++++++++ foo/
++cf........ foo/config1
++cf........ foo/config2
++hf++++++++ foo/extra => foo/config1
++cL++++++++ foo/sym -> ../bar/baz/rsync
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
+
+@@ -165,12 +165,12 @@ rm -rf "$todir"
+ $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+ | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-.d..t.... ./
+-cd+++++++ bar/
+-cd+++++++ bar/baz/
+-cd+++++++ foo/
+-hf+++++++ foo/extra => foo/config1
+-cL+++++++ foo/sym -> ../bar/baz/rsync
++.d..t..... ./
++cd++++++++ bar/
++cd++++++++ bar/baz/
++cd++++++++ foo/
++hf++++++++ foo/extra => foo/config1
++cL++++++++ foo/sym -> ../bar/baz/rsync
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
+
--- orig/testsuite/rsync.fns 2005-06-10 21:33:28
-+++ testsuite/rsync.fns 2005-02-21 07:30:11
++++ testsuite/rsync.fns 2005-07-28 00:41:20
@@ -50,7 +50,7 @@ printmsg() {
}
rsync_getgroups() {
-@@ -158,6 +158,8 @@ checkit() {
+@@ -158,6 +158,10 @@ checkit() {
# We can just write everything to stdout/stderr, because the
# wrapper hides it unless there is a problem.
-+ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ if test x$TLS_ARGS = x--atime; then
++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ fi
+
echo "Running: \"$1\""
eval "$1"
status=$?
-@@ -168,7 +170,6 @@ checkit() {
+@@ -165,10 +169,13 @@ checkit() {
+ failed="YES";
+ fi
+
++ if test x$TLS_ARGS != x--atime; then
++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ fi
++
echo "-------------"
echo "check how the directory listings compare with diff:"
echo ""
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff