X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ac23c3343de86c3e85e1f6a604dc5cec76f3c4f2..42e25077abb656c002841469c5badd4a4926ff33:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 2b01e9f..5b575fa 100644 --- a/atimes.diff +++ b/atimes.diff @@ -4,9 +4,9 @@ command before "make": make proto ---- orig/batch.c 2004-08-02 05:02:24 +--- orig/batch.c 2005-02-07 20:41:56 +++ batch.c 2004-07-03 20:15:41 -@@ -184,6 +184,8 @@ void show_flist(int index, struct file_s +@@ -206,6 +206,8 @@ void show_flist(int index, struct file_s rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags); rprintf(FINFO, "flist->modtime=%#lx\n", (long unsigned) fptr[i]->modtime); @@ -15,17 +15,17 @@ 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-01-25 00:53:58 -+++ flist.c 2004-07-03 20:15:41 -@@ -63,6 +63,7 @@ extern int make_backups; +--- orig/flist.c 2005-02-12 19:54:27 ++++ flist.c 2005-02-07 21:06:04 +@@ -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; -@@ -147,17 +148,17 @@ 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 if (preserve_links && S_ISLNK(f->mode)) { @@ -33,8 +33,8 @@ command before "make": + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n", perms, (double)f->length, timestring(f->modtime), -- f_name(f), f->u.link); -+ timestring(f->atime), f_name(f), f->u.link); ++ timestring(f->atime), + safe_fname(f_name(f)), safe_fname(f->u.link)); } else #endif { @@ -42,12 +42,11 @@ command before "make": + rprintf(FINFO, "%s %11.0f %s %s %s\n", perms, (double)f->length, timestring(f->modtime), -- f_name(f)); -+ timestring(f->atime), f_name(f)); ++ timestring(f->atime), + safe_fname(f_name(f))); } } - -@@ -333,6 +334,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; @@ -55,7 +54,7 @@ command before "make": static mode_t mode; static int64 dev; static dev_t rdev; -@@ -348,7 +350,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); @@ -64,7 +63,7 @@ command before "make": dev = 0, rdev = makedev(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -397,6 +399,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; @@ -77,7 +76,7 @@ command before "make": #if SUPPORT_HARD_LINKS if (file->link_u.idev) { -@@ -452,6 +460,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)); @@ -86,24 +85,24 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -525,6 +535,7 @@ void receive_file_entry(struct file_stru - struct file_list *flist, int f) +@@ -512,6 +524,7 @@ static void receive_file_entry(struct fi + unsigned short flags, int f) { static time_t modtime; + static time_t atime; static mode_t mode; static int64 dev; static dev_t rdev; -@@ -543,7 +554,7 @@ void receive_file_entry(struct file_stru +@@ -530,7 +543,7 @@ static void receive_file_entry(struct fi struct file_struct *file; - if (!fptr) { + if (!flist) { - modtime = 0, mode = 0; + modtime = 0, atime = 0, mode = 0; dev = 0, rdev = makedev(0, 0); rdev_major = 0; uid = 0, gid = 0; -@@ -599,6 +610,8 @@ void receive_file_entry(struct file_stru +@@ -586,6 +599,8 @@ static void receive_file_entry(struct fi modtime = (time_t)read_int(f); if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -112,7 +111,7 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -649,6 +662,7 @@ void receive_file_entry(struct file_stru +@@ -636,6 +651,7 @@ static void receive_file_entry(struct fi file->flags = 0; file->modtime = modtime; @@ -120,7 +119,7 @@ command before "make": file->length = file_length; file->mode = mode; file->uid = uid; -@@ -889,6 +903,7 @@ skip_excludes: +@@ -883,6 +899,7 @@ skip_filters: file->flags = flags; file->modtime = st.st_mtime; @@ -128,7 +127,7 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- orig/generator.c 2005-01-24 06:20:37 +--- orig/generator.c 2005-02-13 05:50:28 +++ generator.c 2004-11-03 23:02:12 @@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru if (ignore_times) @@ -139,7 +138,7 @@ command before "make": } -@@ -499,7 +499,7 @@ static void recv_generator(char *fname, +@@ -512,7 +512,7 @@ static void recv_generator(char *fname, } if (update_only && fnamecmp_type == FNAMECMP_FNAME @@ -148,9 +147,9 @@ command before "make": if (verbose > 1) rprintf(FINFO, "%s is newer\n", safe_fname(fname)); return; ---- orig/options.c 2005-01-25 03:26:51 +--- orig/options.c 2005-02-13 05:50:28 +++ options.c 2005-01-24 01:51:48 -@@ -49,6 +49,7 @@ int preserve_uid = 0; +@@ -50,6 +50,7 @@ int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; int omit_dir_times = 0; @@ -158,7 +157,7 @@ command before "make": int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -266,6 +267,7 @@ void usage(enum logcode F) +@@ -272,6 +273,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"); @@ -166,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"); -@@ -382,6 +384,7 @@ static struct poptOption long_options[] +@@ -392,6 +394,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 }, @@ -174,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 }, -@@ -1128,6 +1131,8 @@ void server_options(char **args,int *arg +@@ -1211,6 +1214,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -183,7 +182,7 @@ command before "make": if (omit_dir_times && am_sender) argstr[x++] = 'O'; if (preserve_perms) ---- orig/rsync.c 2005-01-24 00:57:24 +--- orig/rsync.c 2005-02-07 20:41:57 +++ rsync.c 2005-01-24 01:59:12 @@ -26,6 +26,7 @@ extern int verbose; extern int dry_run; @@ -191,9 +190,9 @@ command before "make": extern int omit_dir_times; +extern int copy_atimes; extern int am_root; + extern int am_server; extern int am_sender; - extern int am_generator; -@@ -153,6 +154,7 @@ int set_perms(char *fname,struct file_st +@@ -156,6 +157,7 @@ int set_perms(char *fname,struct file_st int updated = 0; STRUCT_STAT st2; int change_uid, change_gid; @@ -201,7 +200,7 @@ command before "make": if (!st) { if (dry_run) -@@ -165,18 +167,28 @@ int set_perms(char *fname,struct file_st +@@ -168,18 +170,28 @@ int set_perms(char *fname,struct file_st st = &st2; } @@ -236,7 +235,7 @@ command before "make": } change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- orig/rsync.h 2005-01-25 00:53:58 +--- orig/rsync.h 2005-02-12 19:54:27 +++ rsync.h 2004-07-03 20:15:41 @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) @@ -246,7 +245,7 @@ command before "make": /* These flags are used in the live flist data. */ -@@ -117,6 +118,7 @@ +@@ -114,6 +115,7 @@ #define PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -254,7 +253,7 @@ command before "make": #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -435,6 +437,7 @@ struct file_struct { +@@ -481,6 +483,7 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -262,19 +261,19 @@ command before "make": uid_t uid; gid_t gid; mode_t mode; ---- orig/rsync.yo 2005-01-25 03:26:51 +--- orig/rsync.yo 2005-02-13 05:50:28 +++ rsync.yo 2005-01-24 01:57:18 -@@ -332,6 +332,7 @@ verb( +@@ -322,6 +322,7 @@ to the detailed description below for a -D, --devices preserve devices (root only) -t, --times preserve times -O, --omit-dir-times omit directories when preserving times + -A, --copy-atimes copy access times -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred - -W, --whole-file copy whole files, no incremental checks -@@ -648,6 +649,11 @@ dit(bf(-O, --omit-dir-times)) This tells - it is preserving modification times (see --times). If NFS is sharing - the directories on the receiving side, it is a good idea to use -O. + -W, --whole-file copy files whole +@@ -642,6 +643,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). +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 @@ -306,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() { @@ -326,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 @@ -489,9 +485,9 @@ command before "make": return 0; } ---- orig/util.c 2005-01-20 23:05:34 -+++ util.c 2005-01-21 18:56:05 -@@ -128,12 +128,20 @@ void overflow(char *str) +--- orig/util.c 2005-02-11 10:53:15 ++++ util.c 2005-02-07 21:09:12 +@@ -128,12 +128,17 @@ void overflow(char *str) @@ -501,29 +497,26 @@ command before "make": if (verbose > 2) { - rprintf(FINFO, "set modtime of %s to (%ld) %s", + char mtimebuf[200]; -+ char atimebuf[200]; + + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf); -+ strlcpy(atimebuf, timestring(atime), sizeof atimebuf); -+ + rprintf(FINFO, + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n", - fname, (long)modtime, + safe_fname(fname), (long)modtime, - asctime(localtime(&modtime))); + mtimebuf, -+ (long)atime, atimebuf); ++ (long)atime, timestring(atime)); } if (dry_run) -@@ -142,17 +150,17 @@ int set_modtime(char *fname, time_t modt +@@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt { - #ifdef HAVE_UTIMBUF + #if HAVE_UTIMBUF struct utimbuf tbuf; - tbuf.actime = time(NULL); + tbuf.actime = atime; tbuf.modtime = modtime; return utime(fname,&tbuf); - #elif defined(HAVE_UTIME) + #elif HAVE_UTIME time_t t[2]; - t[0] = time(NULL); + t[0] = atime; @@ -536,7 +529,7 @@ command before "make": t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -1138,8 +1146,8 @@ int msleep(int t) +@@ -1149,8 +1154,8 @@ int msleep(int t) /** @@ -547,7 +540,7 @@ command before "make": * --modify-window). * * @retval 0 if the times should be treated as the same -@@ -1148,7 +1156,7 @@ int msleep(int t) +@@ -1159,7 +1164,7 @@ int msleep(int t) * * @retval -1 if the 2nd is later **/