-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).
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 <patches/date-only.diff
+ ./configure (optional if already run)
+ make
-[Patched update to have context and apply to latest CVS source.]
-
---- orig/generator.c 2004-07-16 19:35:29
-+++ generator.c 2004-07-03 20:16:51
-@@ -39,6 +39,7 @@ extern int opt_ignore_existing;
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -64,6 +64,7 @@ extern int append_mode;
+ extern int make_backups;
extern int csum_length;
extern int ignore_times;
- extern int size_only;
+extern int date_only;
- extern int io_timeout;
- extern int protocol_version;
- extern int always_checksum;
-@@ -60,6 +61,8 @@ extern struct exclude_list_struct server
- /* choose whether to skip a particular file */
- static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st)
+ extern int size_only;
+ extern OFF_T max_size;
+ extern OFF_T min_size;
+@@ -523,6 +524,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ /* Perform our quick-check heuristic for determining if a file is unchanged. */
+ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
+ if (date_only)
-+ return cmp_modtime(st->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;
- if (link_dest) {
---- orig/options.c 2004-07-16 20:07:22
-+++ options.c 2004-07-03 20:16:51
-@@ -84,6 +84,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;
- size_t bwlimit_writemax = 0;
- int delete_after = 0;
-@@ -272,6 +273,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");
+ 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," --compare-dest=DIR also compare destination files relative to DIR\n");
-@@ -327,6 +329,7 @@ static struct poptOption long_options[]
- {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
+ 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 },
-@@ -951,6 +954,9 @@ void server_options(char **args,int *arg
- if (size_only)
- args[ac++] = "--size-only";
+ {"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 (date_only)
+ args[ac++] = "--date-only";
if (modify_window_set) {
if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
goto oom;
---- orig/rsync.yo 2004-07-16 20:07:23
-+++ rsync.yo 2004-07-03 20:16:51
-@@ -322,6 +322,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
-@@ -396,6 +397,12 @@ regardless of timestamp. This is useful
- after using another mirroring system which may not preserve timestamps
- exactly.
+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
+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
- modify_window. This is normally zero, but you may find it useful to
+ 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
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff