X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9be39c35eb557af44b58ff152b16a9831fa2baf7..a94141d9fb91e0f615d8c888217e451904c7898e:/date-only.diff diff --git a/date-only.diff b/date-only.diff index d6f3784..42315fd 100644 --- a/date-only.diff +++ b/date-only.diff @@ -15,54 +15,54 @@ Jeremy Bornstein [Patched update to have context and apply to latest CVS source.] ---- orig/generator.c 2004-07-15 02:21:10 -+++ generator.c 2004-07-03 20:16:51 -@@ -39,6 +39,7 @@ extern int opt_ignore_existing; +--- old/generator.c ++++ new/generator.c +@@ -61,6 +61,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; -@@ -59,6 +60,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; +@@ -379,6 +380,8 @@ void itemize(struct file_struct *file, i + /* 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; ++ return cmp_time(st->st_mtime, file->modtime) == 0; if (st->st_size != file->length) return 0; - if (link_dest) { ---- orig/options.c 2004-07-15 16:51:50 -+++ options.c 2004-07-03 20:16:51 -@@ -84,6 +84,7 @@ int keep_partial = 0; + +--- old/options.c ++++ new/options.c +@@ -99,6 +99,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; - size_t bwlimit_writemax = 0; - int delete_after = 0; -@@ -265,6 +266,7 @@ void usage(enum logcode F) + int fuzzy_basis = 0; +@@ -332,6 +333,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"); -@@ -320,6 +322,7 @@ static struct poptOption long_options[] - {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, + 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," -y, --fuzzy find similar file for basis if no dest file\n"); +@@ -443,6 +445,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 }, -@@ -916,6 +919,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 }, + {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, + {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, +@@ -1647,6 +1650,9 @@ void server_options(char **args,int *arg + args[ac++] = "--size-only"; + } + if (date_only) + args[ac++] = "--date-only"; @@ -70,17 +70,17 @@ Jeremy Bornstein if (modify_window_set) { if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) goto oom; ---- orig/rsync.yo 2004-07-15 02:21:11 -+++ rsync.yo 2004-07-03 20:16:51 -@@ -321,6 +321,7 @@ verb( +--- old/rsync.yo ++++ new/rsync.yo +@@ -355,6 +355,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 - --compare-dest=DIR also compare received files relative to DIR -@@ -395,6 +396,12 @@ regardless of timestamp. This is useful + -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 +@@ -460,6 +461,12 @@ regardless of timestamp. This is useful after using another mirroring system which may not preserve timestamps exactly. @@ -90,6 +90,6 @@ Jeremy Bornstein +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