X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7d2d2057e54ebdb612c9c30e8d65e8e5f498942c..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/date-only.diff diff --git a/date-only.diff b/date-only.diff index 6e0c55f..607c1da 100644 --- a/date-only.diff +++ b/date-only.diff @@ -1,4 +1,4 @@ -Greetings, and thanks for all of your work on the wonderful rsync! +Jeremy Bornstein wrote: I recently had the need to transfer files only with different mod dates (and to *not* transfer them based on file size differences). @@ -8,88 +8,92 @@ rsync didn't already have a --date-only flag, so I added one and am enclosing the diffs in case you (as I hope) decide to include this option in future releases. -Again, thanks! +To use this patch, run these commands for a successful build: -Best Regards, -Jeremy Bornstein + patch -p1 st_mtime,file->modtime) == 0; - if (st->st_size != file->length) { ++ return cmp_time(st->st_mtime, file->modtime) == 0; ++ + if (st->st_size != F_LENGTH(file)) return 0; - } ---- options.c 6 May 2004 21:08:01 -0000 1.148 -+++ options.c 18 May 2004 09:31:23 -0000 -@@ -82,6 +82,7 @@ int keep_partial = 0; - int safe_symlinks = 0; + +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -105,6 +105,7 @@ int safe_symlinks = 0; int copy_unsafe_links = 0; + int munge_symlinks = 0; int size_only = 0; +int date_only = 0; + int daemon_bwlimit = 0; int bwlimit = 0; - int delete_after = 0; - int only_existing = 0; -@@ -262,6 +263,7 @@ void usage(enum logcode F) - rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); - rprintf(F," -I, --ignore-times turn off mod time & file size quick check\n"); - rprintf(F," --size-only ignore mod time for quick check (use size)\n"); -+ rprintf(F," --date-only ignore size for quick check (use mod time)\n"); - rprintf(F," --modify-window=NUM compare mod times with reduced accuracy\n"); - rprintf(F," -T --temp-dir=DIR create temporary files in directory DIR\n"); - rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); -@@ -316,6 +318,7 @@ static struct poptOption long_options[] - {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, + int fuzzy_basis = 0; +@@ -740,6 +741,7 @@ void usage(enum logcode F) + rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); + rprintf(F," -M, --remote-option=OPTION send OPTION to the remote side only\n"); + rprintf(F," --size-only skip files that match in size\n"); ++ rprintf(F," --date-only skip files that match in mod-time\n"); + rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); + rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); + rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); +@@ -888,6 +890,7 @@ static struct poptOption long_options[] = { + {"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, + {"date-only", 0, POPT_ARG_NONE, &date_only, 0, 0, 0 }, - {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, - {"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 }, -@@ -905,6 +908,9 @@ void server_options(char **args,int *arg + {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, + {"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, + {"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, +@@ -2545,6 +2548,9 @@ void server_options(char **args, int *argc_p) + else if (missing_args == 1 && !am_sender) + args[ac++] = "--ignore-missing-args"; - if (size_only) - args[ac++] = "--size-only"; -+ + if (date_only) + args[ac++] = "--date-only"; - ++ if (modify_window_set) { if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) ---- rsync.yo 7 May 2004 00:18:37 -0000 1.169 -+++ rsync.yo 18 May 2004 09:31:23 -0000 -@@ -320,6 +320,7 @@ verb( - --timeout=TIME set I/O timeout in seconds - -I, --ignore-times turn off mod time & file size quick check - --size-only ignore mod time for quick check (use size) -+ --date-only ignore size for quick check (use mod time) - --modify-window=NUM compare mod times with reduced accuracy - -T --temp-dir=DIR create temporary files in directory DIR - --compare-dest=DIR also compare received files relative to DIR -@@ -392,6 +393,12 @@ already the same size and have the same - regardless of timestamp. This is useful when starting to use rsync - after using another mirroring system which may not preserve timestamps - exactly. -+ + goto oom; +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -394,6 +394,7 @@ to the detailed description below for a complete description. verb( + --contimeout=SECONDS set daemon connection timeout in seconds + -I, --ignore-times don't skip files that match size and time + --size-only skip files that match in size ++ --date-only skip files that match in mod-time + --modify-window=NUM compare mod-times with reduced accuracy + -T, --temp-dir=DIR create temporary files in directory DIR + -y, --fuzzy find similar file for basis if no dest file +@@ -554,6 +555,12 @@ time to just looking for files that have changed in size. This is useful + when starting to use rsync after using another mirroring system which may + not preserve timestamps exactly. + +dit(bf(--date-only)) Normally rsync will skip any files that are +already the same size and have the same modification time-stamp. With the +--date-only option, files will be skipped if they have the same +timestamp, regardless of size. This may be useful when the remote +files have passed through a size-changing filter, e.g. for encryption. - - dit(bf(--modify-window)) When comparing two timestamps rsync treats - the timestamps as being equal if they are within the value of ++ + dit(bf(--modify-window)) When comparing two timestamps, rsync treats the + timestamps as being equal if they differ by no more than the modify-window + value. This is normally 0 (for an exact match), but you may find it useful