X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/2ae38ef57caa0762065a10f844607465320b688a..efd0f7d14cffebffe0e9a1a689a284c0516bc331:/atimes.diff diff --git a/atimes.diff b/atimes.diff index acb5dbb..9a8a292 100644 --- a/atimes.diff +++ b/atimes.diff @@ -15,19 +15,19 @@ command before "make": rprintf(FINFO, "flist->length=%.0f\n", (double) fptr[i]->length); rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode); ---- orig/flist.c 2005-02-07 20:41:56 +--- orig/flist.c 2005-02-14 02:45:10 +++ flist.c 2005-02-07 21:06:04 -@@ -63,6 +63,7 @@ extern int make_backups; +@@ -62,6 +62,7 @@ extern int make_backups; extern int backup_suffix_len; extern int copy_links; extern int copy_unsafe_links; +extern int copy_atimes; extern int protocol_version; extern int sanitize_paths; - extern int delete_excluded; -@@ -150,16 +151,18 @@ static void list_file_entry(struct file_ + extern int max_delete; +@@ -147,16 +148,18 @@ static void list_file_entry(struct file_ - #if SUPPORT_LINKS + #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { - rprintf(FINFO, "%s %11.0f %s %s -> %s\n", + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n", @@ -46,7 +46,7 @@ command before "make": safe_fname(f_name(f))); } } -@@ -323,6 +326,7 @@ void send_file_entry(struct file_struct +@@ -320,6 +323,7 @@ void send_file_entry(struct file_struct { unsigned short flags; static time_t modtime; @@ -54,7 +54,7 @@ command before "make": static mode_t mode; static int64 dev; static dev_t rdev; -@@ -338,7 +342,7 @@ void send_file_entry(struct file_struct +@@ -335,7 +339,7 @@ void send_file_entry(struct file_struct if (!file) { write_byte(f, 0); @@ -63,7 +63,7 @@ command before "make": dev = 0, rdev = makedev(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -387,6 +391,12 @@ void send_file_entry(struct file_struct +@@ -384,6 +388,12 @@ void send_file_entry(struct file_struct flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -74,9 +74,9 @@ command before "make": + atime = file->atime; + } - #if SUPPORT_HARD_LINKS + #ifdef SUPPORT_HARD_LINKS if (file->link_u.idev) { -@@ -442,6 +452,8 @@ void send_file_entry(struct file_struct +@@ -439,6 +449,8 @@ void send_file_entry(struct file_struct write_int(f, modtime); if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -85,15 +85,15 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -515,6 +527,7 @@ static void receive_file_entry(struct fi - unsigned short flags, int f) +@@ -512,6 +524,7 @@ static struct file_struct *receive_file_ + unsigned short flags, int f) { static time_t modtime; + static time_t atime; static mode_t mode; static int64 dev; static dev_t rdev; -@@ -533,7 +546,7 @@ static void receive_file_entry(struct fi +@@ -530,7 +543,7 @@ static struct file_struct *receive_file_ struct file_struct *file; if (!flist) { @@ -102,7 +102,7 @@ command before "make": dev = 0, rdev = makedev(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -589,6 +602,8 @@ static void receive_file_entry(struct fi +@@ -586,6 +599,8 @@ static struct file_struct *receive_file_ modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -111,7 +111,7 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -639,6 +654,7 @@ static void receive_file_entry(struct fi +@@ -636,6 +651,7 @@ static struct file_struct *receive_file_ file->flags = 0; file->modtime = modtime; @@ -119,7 +119,7 @@ command before "make": file->length = file_length; file->mode = mode; file->uid = uid; -@@ -886,6 +902,7 @@ skip_filters: +@@ -885,6 +901,7 @@ skip_filters: file->flags = flags; file->modtime = st.st_mtime; @@ -127,9 +127,9 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- orig/generator.c 2005-02-07 20:41:56 +--- orig/generator.c 2005-02-14 02:45:10 +++ generator.c 2004-11-03 23:02:12 -@@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru +@@ -100,7 +100,7 @@ static int unchanged_file(char *fn, stru if (ignore_times) return 0; @@ -138,7 +138,7 @@ command before "make": } -@@ -503,7 +503,7 @@ static void recv_generator(char *fname, +@@ -612,7 +612,7 @@ static void recv_generator(char *fname, } if (update_only && fnamecmp_type == FNAMECMP_FNAME @@ -147,7 +147,7 @@ command before "make": if (verbose > 1) rprintf(FINFO, "%s is newer\n", safe_fname(fname)); return; ---- orig/options.c 2005-02-07 20:41:56 +--- orig/options.c 2005-02-14 02:45:10 +++ options.c 2005-01-24 01:51:48 @@ -50,6 +50,7 @@ int preserve_uid = 0; int preserve_gid = 0; @@ -157,7 +157,7 @@ command before "make": int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -269,6 +270,7 @@ void usage(enum logcode F) +@@ -273,6 +274,7 @@ void usage(enum logcode F) rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); rprintf(F," -t, --times preserve times\n"); @@ -165,7 +165,7 @@ command before "make": rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); rprintf(F," -S, --sparse handle sparse files efficiently\n"); rprintf(F," -n, --dry-run show what would have been transferred\n"); -@@ -388,6 +390,7 @@ static struct poptOption long_options[] +@@ -394,6 +396,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_NONE, &omit_dir_times, 0, 0, 0 }, @@ -173,7 +173,7 @@ command before "make": {"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 }, -@@ -1151,6 +1154,8 @@ void server_options(char **args,int *arg +@@ -1214,6 +1217,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -182,7 +182,7 @@ command before "make": if (omit_dir_times && am_sender) argstr[x++] = 'O'; if (preserve_perms) ---- orig/rsync.c 2005-02-07 20:41:57 +--- orig/rsync.c 2005-02-14 02:45:10 +++ rsync.c 2005-01-24 01:59:12 @@ -26,6 +26,7 @@ extern int verbose; extern int dry_run; @@ -235,7 +235,7 @@ command before "make": } change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- orig/rsync.h 2005-02-07 20:41:57 +--- orig/rsync.h 2005-02-14 02:45:10 +++ rsync.h 2004-07-03 20:15:41 @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) @@ -245,7 +245,7 @@ command before "make": /* These flags are used in the live flist data. */ -@@ -114,6 +115,7 @@ +@@ -115,6 +116,7 @@ #define PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -253,7 +253,7 @@ command before "make": #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -481,6 +483,7 @@ struct file_struct { +@@ -483,6 +485,7 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -261,7 +261,7 @@ command before "make": uid_t uid; gid_t gid; mode_t mode; ---- orig/rsync.yo 2005-02-06 07:24:23 +--- orig/rsync.yo 2005-02-14 02:45:11 +++ rsync.yo 2005-01-24 01:57:18 @@ -322,6 +322,7 @@ to the detailed description below for a -D, --devices preserve devices (root only) @@ -271,7 +271,7 @@ command before "make": -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred -W, --whole-file copy files whole -@@ -641,6 +642,11 @@ dit(bf(-O, --omit-dir-times)) This tells +@@ -643,6 +644,11 @@ dit(bf(-O, --omit-dir-times)) This tells it is preserving modification times (see bf(--times)). If NFS is sharing the directories on the receiving side, it is a good idea to use bf(-O). @@ -305,14 +305,14 @@ command before "make": + +# The script would have aborted on error, so getting here means we've won. +exit 0 ---- orig/testsuite/rsync.fns 2004-09-18 01:49:34 -+++ testsuite/rsync.fns 2004-07-03 20:15:41 +--- orig/testsuite/rsync.fns 2005-02-13 05:50:28 ++++ testsuite/rsync.fns 2005-02-13 06:47:50 @@ -50,7 +50,7 @@ printmsg() { rsync_ls_lR() { -- find "$@" -print | sort | xargs "$TOOLDIR/tls" -+ find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS +- find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" ++ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS } rsync_getgroups() { @@ -325,29 +325,26 @@ command before "make": echo "Running: \"$1\"" eval "$1" status=$? -@@ -166,6 +168,12 @@ checkit() { +@@ -166,16 +168,16 @@ checkit() { fi echo "-------------" -+ echo "check how the directory listings compare with diff:" -+ echo "" -+ ( 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 ` -@@ -173,12 +181,6 @@ checkit() { - diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES - done - -- echo "-------------" -- echo "check how the directory listings compare with diff:" +- echo "check how the files compare with diff:" - echo "" +- diff -r $diffopt "$2" "$3" || failed=YES +- +- echo "-------------" + echo "check how the directory listings compare with diff:" + echo "" - ( 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 + ( 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 "" ++ diff -r $diffopt "$2" "$3" || failed=YES ++ if [ -z "$failed" ] ; then return 0 else @@ -488,7 +485,7 @@ command before "make": return 0; } ---- orig/util.c 2005-02-07 20:41:57 +--- orig/util.c 2005-02-14 02:45:11 +++ util.c 2005-02-07 21:09:12 @@ -128,12 +128,17 @@ void overflow(char *str) @@ -513,13 +510,13 @@ command before "make": if (dry_run) @@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt { - #if HAVE_UTIMBUF + #ifdef HAVE_UTIMBUF struct utimbuf tbuf; - tbuf.actime = time(NULL); + tbuf.actime = atime; tbuf.modtime = modtime; return utime(fname,&tbuf); - #elif HAVE_UTIME + #elif defined HAVE_UTIME time_t t[2]; - t[0] = time(NULL); + t[0] = atime; @@ -532,7 +529,7 @@ command before "make": t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -1141,8 +1146,8 @@ int msleep(int t) +@@ -1149,8 +1154,8 @@ int msleep(int t) /** @@ -543,7 +540,7 @@ command before "make": * --modify-window). * * @retval 0 if the times should be treated as the same -@@ -1151,7 +1156,7 @@ int msleep(int t) +@@ -1159,7 +1164,7 @@ int msleep(int t) * * @retval -1 if the 2nd is later **/