make
---- orig/flist.c 2006-01-31 02:30:18
-+++ flist.c 2006-01-27 00:33:39
+--- old/flist.c
++++ new/flist.c
@@ -51,6 +51,7 @@ extern int preserve_devices;
extern int preserve_specials;
extern int preserve_uid;
}
}
---- orig/generator.c 2006-02-05 06:40:40
-+++ generator.c 2006-02-01 19:37:52
-@@ -44,6 +44,7 @@ extern int preserve_perms;
+--- old/generator.c
++++ new/generator.c
+@@ -45,6 +45,7 @@ extern int preserve_perms;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_times;
rprintf(FINFO, "deleting in %s\n", fbuf);
if (link_stat(fbuf, &st, keep_dirlinks) < 0
-@@ -347,8 +349,11 @@ void itemize(struct file_struct *file, i
- iflags |= ITEM_REPORT_SIZE;
- if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
+@@ -349,6 +351,9 @@ void itemize(struct file_struct *file, i
&& (!(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))
+ || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
iflags |= ITEM_REPORT_TIME;
+ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
+ && cmp_time(file->atime, st->st_atime) != 0)
if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
if (preserve_uid && am_root && file->uid != st->st_uid)
-@@ -396,7 +401,7 @@ int unchanged_file(char *fn, struct file
- if (ignore_times)
- return 0;
-
-- return cmp_modtime(st->st_mtime, file->modtime) == 0;
-+ return cmp_time(st->st_mtime, file->modtime) == 0;
- }
-
-
-@@ -550,13 +555,13 @@ static int find_fuzzy(struct file_struct
+@@ -550,7 +555,7 @@ static int find_fuzzy(struct file_struct
uint32 dist;
if (!S_ISREG(fp->mode) || !fp->length
continue;
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",
-@@ -632,7 +637,7 @@ static int try_dests_reg(struct file_str
- 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;
@@ -659,6 +664,8 @@ static int try_dests_reg(struct file_str
itemizing && verbose > 1,
code) < 0)
if (preserve_hard_links && file->link_u.links)
hard_link_cluster(file, ndx, itemizing, code);
} else if (itemizing)
-@@ -894,7 +901,7 @@ static void recv_generator(char *fname,
+@@ -906,7 +913,7 @@ static void recv_generator(char *fname,
&& verbose && code && f_out != -1)
rprintf(code, "%s/\n", fname);
if (delete_during && f_out != -1 && !phase && dry_run < 2
delete_in_dir(the_file_list, fname, file, &st);
return;
}
-@@ -1073,7 +1080,7 @@ static void recv_generator(char *fname,
- }
-
- 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;
-@@ -1176,7 +1183,7 @@ static void recv_generator(char *fname,
- if (fuzzy_basis) {
+@@ -1188,7 +1195,7 @@ static void recv_generator(char *fname,
+ 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;
}
/* open the file */
---- orig/hlink.c 2006-01-14 20:27:09
-+++ hlink.c 2006-01-24 19:17:58
+--- old/hlink.c
++++ new/hlink.c
@@ -26,6 +26,7 @@ extern int link_dest;
extern int make_backups;
extern int log_format_has_i;
+ } while (!(FFLAGS(file) & FLAG_HLINK_EOL));
#endif
}
---- orig/log.c 2006-02-05 04:53:34
-+++ log.c 2006-01-24 22:50:01
-@@ -41,6 +41,7 @@ extern int module_id;
- extern int msg_fd_out;
+--- old/log.c
++++ new/log.c
+@@ -42,6 +42,7 @@ extern int msg_fd_out;
+ extern int allow_8bit_chars;
extern int protocol_version;
extern int preserve_times;
+extern int preserve_atimes;
extern int log_format_has_i;
extern int log_format_has_o_or_i;
extern int daemon_log_format_has_o_or_i;
-@@ -607,10 +608,12 @@ static void log_formatted(enum logcode c
- n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
- n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
- : !preserve_times || 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] = '\0';
-+ n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.'
+@@ -608,7 +609,8 @@ static void log_formatted(enum logcode c
+ n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+ n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+ n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+- n[8] = '.';
++ n[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
+ : S_ISLNK(file->mode) ? 'U' : 'u';
-+ n[6] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
-+ n[7] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
-+ n[8] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
-+ n[9] = '\0';
+ n[9] = '\0';
if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
- char ch = iflags & ITEM_IS_NEW ? '+' : '?';
---- orig/options.c 2006-02-03 23:51:57
-+++ options.c 2006-01-31 03:08:39
+--- old/options.c
++++ new/options.c
@@ -52,6 +52,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
rprintf(F," --super receiver attempts super-user activities\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
-@@ -412,6 +414,9 @@ static struct poptOption long_options[]
+@@ -411,6 +413,9 @@ 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 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
{"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
{"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
-@@ -1505,6 +1510,8 @@ void server_options(char **args,int *arg
+@@ -1510,6 +1515,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
if (preserve_perms)
argstr[x++] = 'p';
else if (preserve_executability && am_sender)
---- orig/rsync.c 2006-02-05 15:31:49
-+++ rsync.c 2006-01-31 03:00:22
-@@ -37,6 +37,7 @@ extern int preserve_perms;
+--- old/rsync.c
++++ new/rsync.c
+@@ -35,6 +35,7 @@ extern int dry_run;
+ extern int daemon_log_format_has_i;
+ extern int preserve_perms;
extern int preserve_executability;
++extern int preserve_atimes;
extern int preserve_times;
extern int omit_dir_times;
-+extern int preserve_atimes;
- extern int orig_umask;
extern int am_root;
- extern int am_server;
-@@ -116,6 +117,7 @@ int set_file_attrs(char *fname, struct f
+@@ -128,6 +129,7 @@ int set_file_attrs(char *fname, struct f
int updated = 0;
STRUCT_STAT st2;
int change_uid, change_gid;
if (!st) {
if (dry_run)
-@@ -134,18 +136,33 @@ int set_file_attrs(char *fname, struct f
+@@ -146,18 +148,33 @@ int set_file_attrs(char *fname, struct f
}
}
+ if (!preserve_atimes || S_ISDIR(st->st_mode))
+ flags |= ATTRS_SKIP_ATIME;
if (!(flags & ATTRS_SKIP_MTIME)
-- && cmp_modtime(st->st_mtime, file->modtime) != 0) {
+ && cmp_time(st->st_mtime, file->modtime) != 0) {
- int ret = set_modtime(fname, file->modtime, st->st_mode);
-+ && cmp_time(st->st_mtime, file->modtime) != 0) {
+ mtime = file->modtime;
+ updated = 1;
+ } else
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2006-02-03 20:00:36
-+++ rsync.h 2006-01-24 22:38:08
+--- old/rsync.h
++++ new/rsync.h
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
#define XMIT_SAME_DEV (1<<10)
/*
* Start the flist array at FLIST_START entries and grow it
* by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
---- orig/rsync.yo 2006-02-05 15:31:49
-+++ rsync.yo 2006-01-31 03:06:45
-@@ -323,8 +323,9 @@ to the detailed description below for a
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -325,8 +325,9 @@ to the detailed description below for a
--devices preserve device files (super-user only)
--specials preserve special files
-D same as --devices --specials
--super receiver attempts super-user activities
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-@@ -800,6 +801,12 @@ it is preserving modification times (see
+@@ -814,6 +815,12 @@ it is preserving modification times (see
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(--super)) This tells the receiving side to attempt super-user
activities even if the receiving rsync wasn't run by the super-user. These
activities include: preserving users via the bf(--owner) option, preserving
-@@ -1307,8 +1314,8 @@ if the receiving rsync is at least versi
- with older versions of rsync, but that also turns on the output of other
+@@ -1322,7 +1329,7 @@ with older versions of rsync, but that a
verbose messages).
--The "%i" escape has a cryptic output that is 8 letters long. The general
--format is like the string bf(YXcstpog), where bf(Y) is replaced by the
-+The "%i" escape has a cryptic output that is 9 letters long. The general
-+format is like the string bf(YXcstupog), where bf(Y) is replaced by the
- kind of update being done, bf(X) is replaced by the file-type, and the
+ The "%i" escape has a cryptic output that is 9 letters long. The general
+-format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
++format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
+ type 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.
-@@ -1348,9 +1355,13 @@ quote(itemize(
+@@ -1362,7 +1369,7 @@ 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 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(p) means the permissions are different and are being updated to
+@@ -1371,7 +1378,10 @@ quote(itemize(
+ sender's value (requires bf(--owner) and super-user 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(z) slot is reserved for future use.
+ it() A bf(u) means the access (use) time is different and is being updated to
+ the sender's value (requires bf(--atimes)). An alternate value of bf(U)
+ means that the access time will be set to the transfer time, which happens
-+ anytime a symlink is transferred.
- 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
---- orig/sender.c 2006-01-14 20:27:10
-+++ sender.c 2006-01-24 18:10:23
++ when a symlink or directory is updated.
+ ))
+
+ One other output is possible: when deleting files, the "%i" will output
+--- old/sender.c
++++ new/sender.c
@@ -38,6 +38,7 @@ extern int do_progress;
extern int inplace;
extern int batch_fd;
}
make_backups = save_make_backups;
---- orig/testsuite/atimes.test 2006-01-24 22:54:53
-+++ testsuite/atimes.test 2006-01-24 22:54:53
+--- old/testsuite/atimes.test
++++ new/testsuite/atimes.test
@@ -0,0 +1,19 @@
+#! /bin/sh
+
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
---- orig/testsuite/devices.test 2006-01-30 08:12:44
-+++ testsuite/devices.test 2006-01-26 10:53:43
-@@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
- $RSYNC -ai "$fromdir/block" "$todir/block2" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--cD++++++ block
-+cD+++++++ block
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
-
- $RSYNC -ai "$fromdir/block2" "$todir/block" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--cD++++++ block2
-+cD+++++++ block2
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
-
-@@ -58,7 +58,7 @@ sleep 1
- $RSYNC -Di "$fromdir/block3" "$todir/block" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--cD..T... block3
-+cD..T.... block3
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
-
-@@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
- | tee "$outfile"
- filter_outfile
- cat <<EOT >"$chkfile"
--.d..t... ./
--cD..t... block
--cD...... block2
--cD++++++ block3
--hD++++++ block2.5 => block3
--cD++++++ char
--cD++++++ char2
--cD++++++ char3
--cS++++++ fifo
-+.d..t.... ./
-+cD..t.... block
-+cD....... block2
-+cD+++++++ block3
-+hD+++++++ block2.5 => block3
-+cD+++++++ char
-+cD+++++++ char2
-+cD+++++++ char3
-+cS+++++++ fifo
- EOT
- if test ! -b "$fromdir/block2.5"; then
- sed -e '/block2\.5/d' \
---- orig/testsuite/itemize.test 2006-02-04 19:52:05
-+++ testsuite/itemize.test 2006-01-24 22:32:03
-@@ -29,14 +29,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"
-
-@@ -48,10 +48,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..T.... bar/baz/rsync
-+>f..T.... foo/config1
-+>f.sT.p.. foo/config2
-+hf..T.... foo/extra => foo/config1
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
-
-@@ -68,11 +68,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..T.... foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
-
-@@ -97,15 +97,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"
-
-@@ -124,8 +124,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"
-
-@@ -134,15 +134,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..T... 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..T.... foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
-
-@@ -150,11 +150,11 @@ rm -rf "$todir"
- $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--.d..t... ./
--cd++++++ bar/
--cd++++++ bar/baz/
--cd++++++ foo/
--hf foo/extra => foo/config1
-+.d..t.... ./
-+cd+++++++ bar/
-+cd+++++++ bar/baz/
-+cd+++++++ foo/
-+hf foo/extra => foo/config1
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
-
-@@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
- | tee "$outfile"
- filter_outfile
- cat <<EOT >"$chkfile"
--.d..t... ./
--cd++++++ bar/
--cd++++++ bar/baz/
--hf bar/baz/rsync
--cd++++++ foo/
--hf foo/config1
--hf foo/config2
--hf foo/extra => foo/config1
--hL foo/sym -> ../bar/baz/rsync
-+.d..t.... ./
-+cd+++++++ bar/
-+cd+++++++ bar/baz/
-+hf bar/baz/rsync
-+cd+++++++ foo/
-+hf foo/config1
-+hf foo/config2
-+hf foo/extra => foo/config1
-+hL foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
-
-@@ -197,10 +197,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--.d..t... ./
--cd++++++ bar/
--cd++++++ bar/baz/
--cd++++++ foo/
-+.d..t.... ./
-+cd+++++++ bar/
-+cd+++++++ bar/baz/
-+cd+++++++ foo/
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
-
-@@ -228,14 +228,14 @@ filter_outfile
- # TODO fix really-old problem when combining -H with --compare-dest:
- # missing output for foo/extra hard-link (and it might not be updated)!
- cat <<EOT >"$chkfile"
--.d..t... ./
--cd++++++ bar/
--cd++++++ bar/baz/
--.f bar/baz/rsync
--cd++++++ foo/
--.f foo/config1
--.f foo/config2
--.L foo/sym -> ../bar/baz/rsync
-+.d..t.... ./
-+cd+++++++ bar/
-+cd+++++++ bar/baz/
-+.f bar/baz/rsync
-+cd+++++++ foo/
-+.f foo/config1
-+.f foo/config2
-+.L foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
-
-@@ -243,10 +243,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
- | tee "$outfile"
- cat <<EOT >"$chkfile"
--.d..t... ./
--cd++++++ bar/
--cd++++++ bar/baz/
--cd++++++ foo/
-+.d..t.... ./
-+cd+++++++ bar/
-+cd+++++++ bar/baz/
-+cd+++++++ foo/
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
-
---- orig/testsuite/rsync.fns 2006-02-04 19:52:05
-+++ testsuite/rsync.fns 2005-07-28 00:41:20
+--- old/testsuite/rsync.fns
++++ new/testsuite/rsync.fns
@@ -66,7 +66,7 @@ printmsg() {
}
( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
---- orig/tls.c 2005-09-24 17:40:31
-+++ tls.c 2005-03-23 17:49:48
+--- old/tls.c
++++ new/tls.c
@@ -39,6 +39,7 @@
return 0;
}
---- orig/util.c 2006-02-03 20:00:36
-+++ util.c 2006-01-14 08:20:29
-@@ -130,7 +130,7 @@ void overflow_exit(char *str)
-
-
+--- old/util.c
++++ new/util.c
+@@ -126,7 +126,7 @@ void overflow_exit(char *str)
+ exit_cleanup(RERR_MALLOC);
+ }
-int set_modtime(char *fname, time_t modtime, mode_t mode)
+int set_times(char *fname, time_t modtime, time_t atime, mode_t mode)
{
#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
if (S_ISLNK(mode))
-@@ -138,9 +138,13 @@ int set_modtime(char *fname, time_t modt
+@@ -134,9 +134,13 @@ int set_modtime(char *fname, time_t modt
#endif
if (verbose > 2) {
}
if (dry_run)
-@@ -149,7 +153,7 @@ int set_modtime(char *fname, time_t modt
+@@ -145,7 +149,7 @@ int set_modtime(char *fname, time_t modt
{
#ifdef HAVE_UTIMES
struct timeval t[2];
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -160,12 +164,12 @@ int set_modtime(char *fname, time_t modt
+@@ -156,12 +160,12 @@ int set_modtime(char *fname, time_t modt
return utimes(fname, t);
#elif defined HAVE_UTIMBUF
struct utimbuf tbuf;
t[1] = modtime;
return utime(fname,t);
#else
-@@ -1183,8 +1187,8 @@ int msleep(int t)
-
-
- /**
-- * Determine if two file modification times are equivalent (either
-- * exact or in the modification timestamp window established by
-+ * Determine if two file times are equivalent (either
-+ * exact or in the timestamp window established by
- * --modify-window).
- *
- * @retval 0 if the times should be treated as the same
-@@ -1193,7 +1197,7 @@ int msleep(int t)
- *
- * @retval -1 if the 2nd is later
- **/
--int cmp_modtime(time_t file1, time_t file2)
-+int cmp_time(time_t file1, time_t file2)
- {
- if (file2 > file1) {
- if (file2 - file1 <= modify_window)