[Patched update to have context and apply to latest CVS source.]
---- orig/generator.c 2004-07-16 19:35:29
+--- orig/generator.c 2004-09-20 19:50:13
+++ generator.c 2004-07-03 20:16:51
-@@ -39,6 +39,7 @@ extern int opt_ignore_existing;
+@@ -41,6 +41,7 @@ extern int make_backups;
extern int csum_length;
extern int ignore_times;
extern int size_only;
extern int io_timeout;
extern int protocol_version;
extern int always_checksum;
-@@ -60,6 +61,8 @@ extern struct exclude_list_struct server
+@@ -62,6 +63,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)
{
if (st->st_size != file->length)
return 0;
if (link_dest) {
---- orig/options.c 2004-07-16 20:07:22
+--- orig/options.c 2004-09-23 17:42:07
+++ options.c 2004-07-03 20:16:51
@@ -84,6 +84,7 @@ int keep_partial = 0;
int safe_symlinks = 0;
int bwlimit = 0;
size_t bwlimit_writemax = 0;
int delete_after = 0;
-@@ -272,6 +273,7 @@ void usage(enum logcode F)
+@@ -275,6 +276,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," --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[]
+@@ -330,6 +332,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 },
{"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
+@@ -1034,6 +1037,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;
---- orig/rsync.yo 2004-07-16 20:07:23
+--- orig/rsync.yo 2004-09-24 16:42:30
+++ rsync.yo 2004-07-03 20:16:51
-@@ -322,6 +322,7 @@ verb(
+@@ -352,6 +352,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)
--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
+@@ -426,6 +427,12 @@ regardless of timestamp. This is useful
after using another mirroring system which may not preserve timestamps
exactly.