X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/ea238f1cf5038ad498b55223edca4b981b3067a8..efd0f7d14cffebffe0e9a1a689a284c0516bc331:/date-only.diff diff --git a/date-only.diff b/date-only.diff index e6c531d..18d5ed8 100644 --- a/date-only.diff +++ b/date-only.diff @@ -15,79 +15,81 @@ Jeremy Bornstein [Patched update to have context and apply to latest CVS source.] ---- generator.c 5 May 2004 17:15:03 -0000 1.81 -+++ generator.c 8 May 2004 18:36:12 -0000 -@@ -51,11 +51,14 @@ extern int list_only; - extern int only_existing; - extern int orig_umask; - extern int safe_symlinks; +--- orig/generator.c 2005-02-13 05:50:28 ++++ generator.c 2004-11-11 22:15:27 +@@ -43,6 +43,7 @@ extern int inplace; + extern int make_backups; + extern int csum_length; + extern int ignore_times; +extern int date_only; - - - /* 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 int io_timeout; +@@ -81,6 +82,8 @@ static int unchanged_attrs(struct file_s + /* Perform our quick-check heuristic for determining if a file is unchanged. */ + static 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_modtime(st->st_mtime, file->modtime) == 0; + if (st->st_size != file->length) return 0; - } ---- options.c 6 May 2004 21:08:01 -0000 1.148 -+++ options.c 8 May 2004 18:36:13 -0000 -@@ -82,6 +82,7 @@ int keep_partial = 0; + +--- orig/options.c 2005-02-13 05:50:28 ++++ options.c 2005-01-28 19:14:15 +@@ -87,6 +87,7 @@ int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 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) + size_t bwlimit_writemax = 0; +@@ -300,6 +301,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," -I, --ignore-times don't skip files that match in size and mod-time\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"); -@@ -316,6 +318,7 @@ static struct poptOption long_options[] +@@ -354,6 +356,7 @@ static struct poptOption long_options[] {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 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 - + {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, +@@ -1306,6 +1309,9 @@ void server_options(char **args,int *arg 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 8 May 2004 18:36:13 -0000 -@@ -320,6 +320,7 @@ verb( + goto oom; +--- orig/rsync.yo 2005-02-13 21:51:10 ++++ rsync.yo 2005-02-11 22:49:10 +@@ -349,6 +349,7 @@ to the detailed description below for a --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 + -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 --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 +@@ -434,6 +435,12 @@ regardless of timestamp. This is useful 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