X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/3ec54554b3ba5bfaba75f25c9f60b040ba30135c..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/date-only.diff diff --git a/date-only.diff b/date-only.diff index 496a248..c58d21d 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,62 +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 -diff rsync-2.5.4/README rsync-2.5.4-patched/README -70a71 -> --date-only only use modification date when determining if a file should be transferred -Common subdirectories: rsync-2.5.4/doc and rsync-2.5.4-patched/doc -diff rsync-2.5.4/generator.c rsync-2.5.4-patched/generator.c -39a40 -> extern int date_only; -50a52,56 -> if (date_only) { -> return (cmp_modtime(st->st_mtime,file->modtime) == 0); -> } -> -> -Common subdirectories: rsync-2.5.4/lib and rsync-2.5.4-patched/lib -diff rsync-2.5.4/options.c rsync-2.5.4-patched/options.c -64a65 -> int date_only=0; -223a225 -> rprintf(F," --date-only only use modification date when determining if a file should be transferred\n"); -265c267 -< OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, ---- -> OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_DATE_ONLY, OPT_ADDRESS, -278a281 -> {"date-only", 0, POPT_ARG_NONE, &date_only}, -704a708,710 -> -> if (date_only) -> args[ac++] = "--date-only"; -Common subdirectories: rsync-2.5.4/packaging and rsync-2.5.4-patched/packaging -Common subdirectories: rsync-2.5.4/popt and rsync-2.5.4-patched/popt -diff rsync-2.5.4/rsync.1 rsync-2.5.4-patched/rsync.1 -289a290 -> --date-only only use modification date when determining if a file should be transferred -363a365,371 -> .IP -> .IP "\fB--date-only\fP" -> Normally rsync will skip any files that are -> already the same length and have the same 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\&. -diff rsync-2.5.4/rsync.yo rsync-2.5.4-patched/rsync.yo -260a261 -> --date-only only use modification date when determining if a file should be transferred -326a328,333 -> -> dit(bf(--date-only)) Normally rsync will skip any files that are -> already the same length and have the same 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. -Common subdirectories: rsync-2.5.4/testhelp and rsync-2.5.4-patched/testhelp -Common subdirectories: rsync-2.5.4/testsuite and rsync-2.5.4-patched/testsuite -Common subdirectories: rsync-2.5.4/zlib and rsync-2.5.4-patched/zlib + patch -p1 st_mtime, file->modtime) == 0; ++ + if (st->st_size != F_LENGTH(file)) + return 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 fuzzy_basis = 0; +@@ -739,6 +740,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"); +@@ -887,6 +889,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 }, + {"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 }, +@@ -2510,6 +2513,9 @@ void server_options(char **args, int *argc_p) + else if (missing_args == 1 && !am_sender) + args[ac++] = "--ignore-missing-args"; + ++ if (date_only) ++ args[ac++] = "--date-only"; ++ + if (modify_window_set) { + if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) + 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 differ by no more than the modify-window + value. This is normally 0 (for an exact match), but you may find it useful