[Patched update to have context and apply to latest CVS source.]
---- generator.c 18 May 2004 08:50:17 -0000 1.85
-+++ generator.c 4 Jun 2004 05:20:27 -0000
-@@ -51,6 +51,7 @@ extern int list_only;
- extern int only_existing;
- extern int orig_umask;
- extern int safe_symlinks;
+--- orig/generator.c 2005-02-03 02:04:20
++++ 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;
-
- extern struct exclude_list_struct server_exclude_list;
-
-@@ -58,6 +59,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 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 27 May 2004 21:51:53 -0000 1.153
-+++ options.c 4 Jun 2004 05:20:27 -0000
-@@ -82,6 +82,7 @@ int keep_partial = 0;
+
+--- orig/options.c 2005-02-01 10:39:22
++++ options.c 2005-01-28 19:14:15
+@@ -88,6 +88,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;
-@@ -263,6 +264,7 @@ void usage(enum logcode F)
+@@ -298,6 +299,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");
-@@ -318,6 +320,7 @@ static struct poptOption long_options[]
+@@ -352,6 +354,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 },
-@@ -918,6 +921,9 @@ void server_options(char **args,int *arg
+ {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 },
+@@ -1247,6 +1250,9 @@ void server_options(char **args,int *arg
if (size_only)
args[ac++] = "--size-only";
if (modify_window_set) {
if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
goto oom;
---- rsync.yo 21 May 2004 09:44:32 -0000 1.170
-+++ rsync.yo 4 Jun 2004 05:20:28 -0000
-@@ -320,6 +320,7 @@ verb(
+--- orig/rsync.yo 2005-02-01 10:39:23
++++ rsync.yo 2005-01-28 19:14:37
+@@ -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
+ -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
-@@ -394,6 +395,12 @@ regardless of timestamp. This is useful
+@@ -434,6 +435,12 @@ regardless of timestamp. This is useful
after using another mirroring system which may not preserve timestamps
exactly.
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff