X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/8a5294713f75e62b1648c96124684696b3b43242..2ae38ef57caa0762065a10f844607465320b688a:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 5af4cb7..acb5dbb 100644 --- a/atimes.diff +++ b/atimes.diff @@ -4,9 +4,9 @@ command before "make": make proto ---- batch.c 6 Mar 2004 07:45:52 -0000 1.31 -+++ batch.c 13 May 2004 18:54:03 -0000 -@@ -342,6 +342,8 @@ void show_flist(int index, struct file_s +--- orig/batch.c 2005-02-07 20:41:56 ++++ batch.c 2004-07-03 20:15:41 +@@ -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,46 +15,46 @@ 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 11 May 2004 17:25:16 -0000 1.221 -+++ flist.c 13 May 2004 18:54:03 -0000 -@@ -57,6 +57,7 @@ extern int relative_paths; - extern int implied_dirs; +--- orig/flist.c 2005-02-07 20:41:56 ++++ flist.c 2005-02-07 21:06:04 +@@ -63,6 +63,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; - -@@ -139,16 +140,16 @@ static void list_file_entry(struct file_ + extern int delete_excluded; +@@ -150,16 +151,18 @@ static void list_file_entry(struct file_ #if 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); + (double)f->length, timestring(f->modtime), ++ timestring(f->atime), + safe_fname(f_name(f)), safe_fname(f->u.link)); } else #endif + { - rprintf(FINFO, "%s %11.0f %s %s\n", + 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)); + (double)f->length, timestring(f->modtime), ++ timestring(f->atime), + safe_fname(f_name(f))); + } } - - -@@ -325,6 +326,7 @@ void send_file_entry(struct file_struct +@@ -323,6 +326,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; -@@ -340,7 +342,7 @@ void send_file_entry(struct file_struct +@@ -338,7 +342,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; -@@ -389,6 +391,12 @@ void send_file_entry(struct file_struct +@@ -387,6 +391,12 @@ void send_file_entry(struct file_struct flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -76,7 +76,7 @@ command before "make": #if SUPPORT_HARD_LINKS if (file->link_u.idev) { -@@ -444,6 +452,8 @@ void send_file_entry(struct file_struct +@@ -442,6 +452,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,24 +85,24 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -517,6 +527,7 @@ void receive_file_entry(struct file_stru - struct file_list *flist, int f) +@@ -515,6 +527,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 uint64 dev; + static int64 dev; static dev_t rdev; -@@ -533,7 +544,7 @@ void receive_file_entry(struct file_stru +@@ -533,7 +546,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; -@@ -588,6 +599,8 @@ void receive_file_entry(struct file_stru +@@ -589,6 +602,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)); @@ -111,15 +111,15 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -638,6 +651,7 @@ void receive_file_entry(struct file_stru +@@ -639,6 +654,7 @@ static void receive_file_entry(struct fi - 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; -@@ -852,6 +866,7 @@ skip_excludes: +@@ -886,6 +902,7 @@ skip_filters: file->flags = flags; file->modtime = st.st_mtime; @@ -127,109 +127,116 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- generator.c 13 May 2004 06:55:01 -0000 1.82 -+++ generator.c 13 May 2004 18:54:03 -0000 -@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct +--- orig/generator.c 2005-02-07 20:41:56 ++++ generator.c 2004-11-03 23:02:12 +@@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru + if (ignore_times) return 0; - } -- return (cmp_modtime(st->st_mtime,file->modtime) == 0); -+ return cmp_time(st->st_mtime,file->modtime) == 0; +- return cmp_modtime(st->st_mtime, file->modtime) == 0; ++ return cmp_time(st->st_mtime, file->modtime) == 0; } -@@ -466,7 +466,7 @@ void recv_generator(char *fname, struct - return; +@@ -503,7 +503,7 @@ static void recv_generator(char *fname, } -- if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) { -+ if (update_only && cmp_time(st.st_mtime,file->modtime)>0 && 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; ---- options.c 6 May 2004 21:08:01 -0000 1.148 -+++ options.c 13 May 2004 18:54:04 -0000 -@@ -46,6 +46,7 @@ int preserve_devices = 0; - int preserve_uid = 0; +--- orig/options.c 2005-02-07 20:41:56 ++++ 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; -@@ -241,6 +242,7 @@ void usage(enum logcode F) +@@ -269,6 +270,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"); -@@ -346,6 +348,7 @@ static struct poptOption long_options[] - {"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 }, +@@ -388,6 +390,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 }, -@@ -823,6 +826,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 }, +@@ -1151,6 +1154,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) ---- rsync.c 13 May 2004 18:51:22 -0000 1.138 -+++ rsync.c 13 May 2004 18:54:04 -0000 -@@ -25,6 +25,7 @@ - extern int verbose; +--- 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; 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; -@@ -140,17 +141,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 (!preserve_times || S_ISLNK(st->st_mode)) - flags |= PERMS_SKIP_MTIME; -- 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)) { - rprintf(FERROR, "failed to set times on %s: %s\n", - full_fname(fname), strerror(errno)); - return 0; - } -- updated = 1; + if (!preserve_times || S_ISLNK(st->st_mode) + || (S_ISDIR(st->st_mode) + && (omit_dir_times || (make_backups && !backup_dir)))) + 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 (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; ---- rsync.h 13 May 2004 18:51:22 -0000 1.203 -+++ rsync.h 13 May 2004 18:54:04 -0000 +--- orig/rsync.h 2005-02-07 20:41:57 ++++ rsync.h 2004-07-03 20:15:41 @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) #define XMIT_SAME_DEV (1<<10) @@ -238,7 +245,7 @@ command before "make": /* These flags are used in the live flist data. */ -@@ -111,6 +112,7 @@ +@@ -114,6 +115,7 @@ #define PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -246,7 +253,7 @@ command before "make": #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -422,6 +424,7 @@ struct file_struct { +@@ -481,6 +483,7 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -254,30 +261,98 @@ command before "make": uid_t uid; gid_t gid; mode_t mode; ---- rsync.yo 7 May 2004 00:18:37 -0000 1.169 -+++ rsync.yo 13 May 2004 18:54:05 -0000 -@@ -299,6 +299,7 @@ verb( - -g, --group preserve group +--- orig/rsync.yo 2005-02-06 07:24:23 ++++ 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 -@@ -545,6 +546,11 @@ modified cannot be effective; in other w - cause the next transfer to behave as if it used -I, and all files will have - their checksums compared and show up in log messages even if they haven't - changed. -+ + -W, --whole-file copy files whole +@@ -641,6 +642,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 +reading the source file may update the atime and hence repeated rsync +copies with --copy-atimes may copy files unnecessarily. - ++ 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 9 Apr 2004 20:22:44 -0000 1.19 -+++ tls.c 13 May 2004 18:54:05 -0000 + +--- orig/testsuite/copy-atimes.test 2004-06-30 00:06:23 ++++ testsuite/copy-atimes.test 2004-06-30 00:06:23 +@@ -0,0 +1,19 @@ ++#! /bin/sh ++ ++# Test rsync copying atimes ++ ++. "$suitedir/rsync.fns" ++ ++set -x ++ ++mkdir "$fromdir" ++ ++touch "$fromdir/foo" ++touch -a -t 200102031717.42 "$fromdir/foo" ++ ++TLS_ARGS=--atime ++ ++checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" ++ ++# 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 +@@ -50,7 +50,7 @@ printmsg() { + + + rsync_ls_lR() { +- find "$@" -print | sort | xargs "$TOOLDIR/tls" ++ find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS + } + + rsync_getgroups() { +@@ -158,6 +158,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 . ) > "$tmpdir/ls-from" ++ + echo "Running: \"$1\"" + eval "$1" + status=$? +@@ -166,6 +168,12 @@ 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 "" +- ( 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 +--- orig/tls.c 2005-01-19 20:11:10 ++++ tls.c 2004-07-03 20:15:41 @@ -39,6 +39,7 @@ @@ -292,10 +367,10 @@ command before "make": +static int display_atime = 0; - static void failed (char const *what, - char const *where) -@@ -57,14 +59,29 @@ static void failed (char const *what, - exit (1); + static void failed(char const *what, char const *where) + { +@@ -56,14 +58,29 @@ static void failed(char const *what, cha + exit(1); } +static void storetime(char *dest, time_t t) @@ -315,7 +390,7 @@ command before "make": + } +} - static void list_file (const char *fname) + static void list_file(const char *fname) { STRUCT_STAT buf; char permbuf[PERMSTRING_SIZE]; @@ -325,8 +400,8 @@ command before "make": + char atimebuf[50]; char linkbuf[4096]; - if (do_lstat(fname, &buf) == -1) -@@ -97,19 +114,8 @@ static void list_file (const char *fname + if (do_lstat(fname, &buf) < 0) +@@ -96,19 +113,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -348,7 +423,7 @@ command before "make": /* TODO: Perhaps escape special characters in fname? */ -@@ -120,24 +126,55 @@ static void list_file (const char *fname +@@ -119,24 +125,55 @@ static void list_file(const char *fname) (long)minor(buf.st_rdev)); } else /* NB: use double for size since it might not fit in a long. */ printf("%12.0f", (double)buf.st_size); @@ -378,8 +453,8 @@ command before "make": main(int argc, char *argv[]) { - if (argc < 2) { -- fprintf (stderr, "usage: " PROGRAM " DIR ...\n" -- "Trivial file listing program for portably checking rsync\n"); +- fprintf(stderr, "usage: " PROGRAM " DIR ...\n" +- "Trivial file listing program for portably checking rsync\n"); - return 1; + poptContext pc; + const char **extra_args; @@ -401,7 +476,7 @@ command before "make": } - for (argv++; *argv; argv++) { -- list_file (*argv); +- list_file(*argv); - } + extra_args = poptGetArgs(pc); + if (*extra_args == NULL) @@ -413,43 +488,38 @@ command before "make": return 0; } ---- util.c 8 May 2004 20:03:39 -0000 1.142 -+++ util.c 13 May 2004 18:54:05 -0000 -@@ -124,32 +124,40 @@ void overflow(char *str) +--- orig/util.c 2005-02-07 20:41:57 ++++ 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) { - extern int dry_run; - 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)); + ++ strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf); + 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 + #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; @@ -462,7 +532,7 @@ command before "make": t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -1063,8 +1071,8 @@ int msleep(int t) +@@ -1141,8 +1146,8 @@ int msleep(int t) /** @@ -473,83 +543,12 @@ command before "make": * --modify-window). * * @retval 0 if the times should be treated as the same -@@ -1073,7 +1081,7 @@ int msleep(int t) +@@ -1151,7 +1156,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) { - extern int modify_window; - ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ testsuite/copy-atimes.test 13 May 2004 18:54:05 -0000 -@@ -0,0 +1,22 @@ -+#! /bin/sh -+ -+# Test rsync copying atimes -+ -+. $srcdir/testsuite/rsync.fns -+ -+set -x -+ -+fromdir="$scratchdir/from" -+todir="$scratchdir/to" -+ -+mkdir "$fromdir" -+ -+touch "$fromdir/foo" -+touch -a -t 200102031717.42 "$fromdir/foo" -+ -+TLS_ARGS=--atime -+ -+checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" -+ -+# 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 13 May 2004 18:54:05 -0000 -@@ -51,7 +51,7 @@ printmsg() { - - - rsync_ls_lR() { -- find "$@" -print | sort | xargs "$TOOLDIR/tls" -+ find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS - } - - rsync_getgroups() { -@@ -151,6 +151,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 -+ - echo "Running: \"$1\"" - eval "$1" - status=$? -@@ -159,6 +161,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 -+ -+ echo "-------------" - echo "check how the files compare with diff:" - echo "" - for f in `cd "$2"; find . -type f -print ` -@@ -166,12 +174,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 - return 0 - else + if (file2 > file1) { + if (file2 - file1 <= modify_window)