[Patched update to have context and apply to latest CVS source.]
---- orig/generator.c 2004-08-05 18:24:21
+--- 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-08-12 18:34:38
+--- 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;
{"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 },
-@@ -1025,6 +1028,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-08-13 07:18:59
+--- orig/rsync.yo 2004-09-24 16:42:30
+++ rsync.yo 2004-07-03 20:16:51
@@ -352,6 +352,7 @@ verb(
--timeout=TIME set I/O timeout in seconds