X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9be39c35eb557af44b58ff152b16a9831fa2baf7..6e93e60a173cded58e2645eedba5e0ca039be642:/atimes.diff diff --git a/atimes.diff b/atimes.diff index ca71b8a..9a8a292 100644 --- a/atimes.diff +++ b/atimes.diff @@ -4,9 +4,9 @@ command before "make": make proto ---- orig/batch.c 2004-07-15 16:51:50 +--- orig/batch.c 2005-02-07 20:41:56 +++ batch.c 2004-07-03 20:15:41 -@@ -63,6 +63,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,26 +15,26 @@ 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 2004-07-15 02:21:10 -+++ flist.c 2004-07-03 20:15:41 -@@ -58,6 +58,7 @@ extern int relative_paths; - extern int implied_dirs; +--- orig/flist.c 2005-02-14 02:45:10 ++++ 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; -@@ -141,17 +142,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 + #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", 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,20 +42,19 @@ 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))); } } - -@@ -332,6 +333,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; + static time_t atime; static mode_t mode; - static uint64 dev; + static int64 dev; static dev_t rdev; -@@ -347,7 +349,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; -@@ -396,6 +398,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; @@ -75,9 +74,9 @@ command before "make": + atime = file->atime; + } - #if SUPPORT_HARD_LINKS + #ifdef SUPPORT_HARD_LINKS if (file->link_u.idev) { -@@ -451,6 +459,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); -@@ -524,6 +534,7 @@ void receive_file_entry(struct file_stru - struct file_list *flist, 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 uint64 dev; + static int64 dev; static dev_t rdev; -@@ -540,7 +551,7 @@ void receive_file_entry(struct file_stru +@@ -530,7 +543,7 @@ static struct file_struct *receive_file_ 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; -@@ -595,6 +606,8 @@ void receive_file_entry(struct file_stru +@@ -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)); @@ -112,15 +111,15 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -645,6 +658,7 @@ void receive_file_entry(struct file_stru +@@ -636,6 +651,7 @@ static struct file_struct *receive_file_ - file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0; + file->flags = 0; file->modtime = modtime; + file->atime = atime; file->length = file_length; file->mode = mode; file->uid = uid; -@@ -864,6 +878,7 @@ skip_excludes: +@@ -885,6 +901,7 @@ skip_filters: file->flags = flags; file->modtime = st.st_mtime; @@ -128,9 +127,9 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- orig/generator.c 2004-07-15 02:21:10 -+++ generator.c 2004-07-03 20:15:41 -@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct +--- orig/generator.c 2005-02-14 02:45:10 ++++ generator.c 2004-11-03 23:02:12 +@@ -100,7 +100,7 @@ static int unchanged_file(char *fn, stru if (ignore_times) return 0; @@ -139,97 +138,104 @@ command before "make": } -@@ -468,7 +468,7 @@ static void recv_generator(char *fname, +@@ -612,7 +612,7 @@ static void recv_generator(char *fname, } - if (update_only && fnamecmp == fname + if (update_only && fnamecmp_type == FNAMECMP_FNAME - && 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); + rprintf(FINFO, "%s is newer\n", safe_fname(fname)); return; ---- orig/options.c 2004-07-15 16:51:50 -+++ options.c 2004-07-03 20:15:41 -@@ -48,6 +48,7 @@ int preserve_devices = 0; - int preserve_uid = 0; +--- 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; int preserve_times = 0; + int omit_dir_times = 0; +int copy_atimes = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -244,6 +245,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"); + rprintf(F," -A, --copy-atimes copy access times\n"); + 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"); - rprintf(F," -W, --whole-file copy whole files, no incremental checks\n"); -@@ -351,6 +353,7 @@ static struct poptOption long_options[] - {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 }, +@@ -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 }, + {"copy-atimes", 'A', POPT_ARG_NONE, ©_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 }, -@@ -840,6 +843,8 @@ void server_options(char **args,int *arg + {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, + {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, +@@ -1214,6 +1217,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; + if (copy_atimes) + argstr[x++] = 'A'; + if (omit_dir_times && am_sender) + argstr[x++] = 'O'; if (preserve_perms) - argstr[x++] = 'p'; - if (recurse) ---- orig/rsync.c 2004-07-02 18:06:32 -+++ rsync.c 2004-07-03 20:15:41 -@@ -25,6 +25,7 @@ - extern int verbose; +--- 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; extern int preserve_times; + 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; -@@ -143,17 +144,31 @@ 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; ++ time_t atime, mtime; + + if (!st) { + if (dry_run) +@@ -168,18 +170,28 @@ int set_perms(char *fname,struct file_st + st = &st2; + } + ++ if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode)) ++ flags |= PERMS_SKIP_ATIME; if (!preserve_times || S_ISLNK(st->st_mode) - || (make_backups && !backup_dir && S_ISDIR(st->st_mode))) + || (S_ISDIR(st->st_mode) + && (omit_dir_times || (make_backups && !backup_dir)))) flags |= PERMS_SKIP_MTIME; -- if (!(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 (!(flags & PERMS_SKIP_MTIME) - && cmp_modtime(st->st_mtime, file->modtime) != 0) { -+ if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode)) -+ flags |= PERMS_SKIP_ATIME; -+ if (!(flags & (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME))) { -+ time_t atime, 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 (!(flags & PERMS_SKIP_MTIME) -+ && cmp_time(st->st_mtime, file->modtime) != 0) { -+ mtime = file->modtime; -+ updated = 1; -+ } else -+ mtime = st->st_mtime; - /* don't complain about not setting times on directories - * because some filesystems can't do it */ -- if (set_modtime(fname,file->modtime) != 0 && -+ if (updated && set_times(fname, mtime, atime) != 0 && - !S_ISDIR(st->st_mode)) { - rsyserr(FERROR, errno, "failed to set times on %s", - full_fname(fname)); - return 0; - } -- updated = 1; +- if (set_modtime(fname,file->modtime) != 0) { +- rsyserr(FERROR, errno, "failed to set times on %s", +- full_fname(fname)); +- return 0; +- } ++ && cmp_time(st->st_mtime, file->modtime) != 0) { ++ mtime = file->modtime; + updated = 1; ++ } else ++ mtime = st->st_mtime; ++ if (updated && set_times(fname, mtime, atime) != 0) { ++ rsyserr(FERROR, errno, "failed to set times on %s", ++ full_fname(fname)); ++ return 0; } change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- orig/rsync.h 2004-07-07 08:27:00 +--- 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) @@ -239,7 +245,7 @@ command before "make": /* These flags are used in the live flist data. */ -@@ -111,6 +112,7 @@ +@@ -115,6 +116,7 @@ #define PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -247,7 +253,7 @@ command before "make": #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -422,6 +424,7 @@ struct file_struct { +@@ -483,6 +485,7 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -255,19 +261,19 @@ command before "make": uid_t uid; gid_t gid; mode_t mode; ---- orig/rsync.yo 2004-07-15 02:21:11 -+++ rsync.yo 2004-07-03 20:15:41 -@@ -300,6 +300,7 @@ verb( - -g, --group preserve group +--- 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) -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 -@@ -552,6 +553,11 @@ cause the next transfer to behave as if - their checksums compared and show up in log messages even if they haven't - changed. + -W, --whole-file copy files whole +@@ -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). +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 @@ -299,18 +305,18 @@ command before "make": + +# The script would have aborted on error, so getting here means we've won. +exit 0 ---- orig/testsuite/rsync.fns 2004-06-28 21:08:14 -+++ 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() { -@@ -150,6 +150,8 @@ checkit() { +@@ -158,6 +158,8 @@ checkit() { # We can just write everything to stdout/stderr, because the # wrapper hides it unless there is a problem. @@ -319,33 +325,30 @@ command before "make": echo "Running: \"$1\"" eval "$1" status=$? -@@ -158,6 +160,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 ` -@@ -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 "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 ---- orig/tls.c 2004-05-15 20:10:13 +--- orig/tls.c 2005-01-19 20:11:10 +++ tls.c 2004-07-03 20:15:41 @@ -39,6 +39,7 @@ @@ -394,7 +397,7 @@ command before "make": + char atimebuf[50]; char linkbuf[4096]; - if (do_lstat(fname, &buf) == -1) + if (do_lstat(fname, &buf) < 0) @@ -96,19 +113,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -482,34 +485,30 @@ command before "make": return 0; } ---- orig/util.c 2004-06-09 21:54:47 -+++ util.c 2004-07-03 20:15:41 -@@ -127,31 +127,39 @@ void overflow(char *str) +--- 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) -int set_modtime(char *fname, time_t modtime) +int set_times(char *fname, time_t modtime, time_t atime) { - if (dry_run) - return 0; - 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 +147,17 @@ int set_modtime(char *fname, time_t modt { #ifdef HAVE_UTIMBUF struct utimbuf tbuf; @@ -517,7 +516,7 @@ command before "make": + tbuf.actime = atime; tbuf.modtime = modtime; return utime(fname,&tbuf); - #elif defined(HAVE_UTIME) + #elif defined HAVE_UTIME time_t t[2]; - t[0] = time(NULL); + t[0] = atime; @@ -530,7 +529,7 @@ command before "make": t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -1078,8 +1086,8 @@ int msleep(int t) +@@ -1149,8 +1154,8 @@ int msleep(int t) /** @@ -541,7 +540,7 @@ command before "make": * --modify-window). * * @retval 0 if the times should be treated as the same -@@ -1088,7 +1096,7 @@ int msleep(int t) +@@ -1159,7 +1164,7 @@ int msleep(int t) * * @retval -1 if the 2nd is later **/