X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/efda4e563573bf4c01697d2a3576c9045a1125aa..7d2d2057e54ebdb612c9c30e8d65e8e5f498942c:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 18803a8..e69e246 100644 --- a/atimes.diff +++ b/atimes.diff @@ -5,7 +5,7 @@ command before "make": --- batch.c 15 May 2004 19:31:10 -0000 1.32 -+++ batch.c 15 May 2004 20:13:11 -0000 ++++ batch.c 18 May 2004 09:26:41 -0000 @@ -335,6 +335,8 @@ void show_flist(int index, struct file_s rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags); rprintf(FINFO, "flist->modtime=%#lx\n", @@ -15,8 +15,8 @@ command before "make": rprintf(FINFO, "flist->length=%.0f\n", (double) fptr[i]->length); rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode); ---- flist.c 15 May 2004 19:31:10 -0000 1.223 -+++ flist.c 15 May 2004 20:13:11 -0000 +--- flist.c 16 May 2004 23:54:12 -0000 1.224 ++++ flist.c 18 May 2004 09:26:42 -0000 @@ -57,6 +57,7 @@ extern int relative_paths; extern int implied_dirs; extern int copy_links; @@ -127,9 +127,9 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- generator.c 15 May 2004 19:31:10 -0000 1.83 -+++ generator.c 15 May 2004 20:13:11 -0000 -@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct +--- generator.c 18 May 2004 08:50:17 -0000 1.85 ++++ generator.c 18 May 2004 09:26:42 -0000 +@@ -100,7 +100,7 @@ static int skip_file(char *fname, struct return 0; } @@ -138,7 +138,7 @@ command before "make": } -@@ -467,7 +467,7 @@ void recv_generator(char *fname, struct +@@ -480,7 +480,7 @@ void recv_generator(char *fname, struct return; } @@ -148,7 +148,7 @@ command before "make": rprintf(FINFO,"%s is newer\n",fname); return; --- options.c 6 May 2004 21:08:01 -0000 1.148 -+++ options.c 15 May 2004 20:13:11 -0000 ++++ options.c 18 May 2004 09:26:42 -0000 @@ -46,6 +46,7 @@ int preserve_devices = 0; int preserve_uid = 0; int preserve_gid = 0; @@ -183,7 +183,7 @@ command before "make": argstr[x++] = 'p'; if (recurse) --- rsync.c 15 May 2004 19:31:10 -0000 1.139 -+++ rsync.c 15 May 2004 20:13:12 -0000 ++++ rsync.c 18 May 2004 09:26:42 -0000 @@ -25,6 +25,7 @@ extern int verbose; extern int dry_run; @@ -228,8 +228,8 @@ command before "make": } change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- rsync.h 13 May 2004 18:51:22 -0000 1.203 -+++ rsync.h 15 May 2004 20:13:12 -0000 +--- rsync.h 16 May 2004 07:28:24 -0000 1.204 ++++ rsync.h 18 May 2004 09:26:43 -0000 @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) #define XMIT_SAME_DEV (1<<10) @@ -255,7 +255,7 @@ command before "make": gid_t gid; mode_t mode; --- rsync.yo 7 May 2004 00:18:37 -0000 1.169 -+++ rsync.yo 15 May 2004 20:13:12 -0000 ++++ rsync.yo 18 May 2004 09:26:43 -0000 @@ -299,6 +299,7 @@ verb( -g, --group preserve group -D, --devices preserve devices (root only) @@ -277,7 +277,7 @@ command before "make": 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. --- tls.c 15 May 2004 19:09:42 -0000 1.20 -+++ tls.c 15 May 2004 20:13:13 -0000 ++++ tls.c 18 May 2004 09:26:44 -0000 @@ -39,6 +39,7 @@ @@ -414,7 +414,7 @@ command before "make": return 0; } --- util.c 15 May 2004 19:31:10 -0000 1.143 -+++ util.c 15 May 2004 20:13:13 -0000 ++++ util.c 18 May 2004 09:26:44 -0000 @@ -124,32 +124,40 @@ void overflow(char *str) @@ -483,19 +483,16 @@ command before "make": extern int modify_window; --- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ testsuite/copy-atimes.test 15 May 2004 20:13:13 -0000 -@@ -0,0 +1,22 @@ ++++ testsuite/copy-atimes.test 18 May 2004 09:26:44 -0000 +@@ -0,0 +1,19 @@ +#! /bin/sh + +# Test rsync copying atimes + -+. $srcdir/testsuite/rsync.fns ++. "$suitedir/rsync.fns" + +set -x + -+fromdir="$scratchdir/from" -+todir="$scratchdir/to" -+ +mkdir "$fromdir" + +touch "$fromdir/foo" @@ -507,9 +504,9 @@ command before "make": + +# The script would have aborted on error, so getting here means we've won. +exit 0 ---- testsuite/rsync.fns 4 Feb 2004 07:32:48 -0000 1.59 -+++ testsuite/rsync.fns 15 May 2004 20:13:13 -0000 -@@ -51,7 +51,7 @@ printmsg() { +--- testsuite/rsync.fns 18 May 2004 00:41:55 -0000 1.60 ++++ testsuite/rsync.fns 18 May 2004 09:26:44 -0000 +@@ -50,7 +50,7 @@ printmsg() { rsync_ls_lR() { @@ -518,38 +515,38 @@ command before "make": } rsync_getgroups() { -@@ -151,6 +151,8 @@ checkit() { +@@ -150,6 +150,8 @@ checkit() { # We can just write everything to stdout/stderr, because the # wrapper hides it unless there is a problem. -+ ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from ++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" + echo "Running: \"$1\"" eval "$1" status=$? -@@ -159,6 +161,12 @@ checkit() { +@@ -158,6 +160,12 @@ checkit() { fi echo "-------------" + echo "check how the directory listings compare with diff:" + echo "" -+ ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to -+ diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES ++ ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" ++ diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES + + echo "-------------" echo "check how the files compare with diff:" echo "" for f in `cd "$2"; find . -type f -print ` -@@ -166,12 +174,6 @@ checkit() { +@@ -165,12 +173,6 @@ checkit() { diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES done - echo "-------------" - echo "check how the directory listings compare with diff:" - echo "" -- ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from -- ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to -- diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES - if [ -z "${failed}" ] ; then +- ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" +- ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" +- diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES + if [ -z "$failed" ] ; then return 0 else