[rsync/rsync-patches.git] / append.diff

This patch adds the --append option, which works like a "resume" mode in
an ftp client, appending new data onto the end of the files it updates.

--- orig/generator.c	2005-02-15 19:27:04
+++ generator.c	2005-02-15 19:31:13
@@ -41,6 +41,7 @@ extern int delete_during;
 extern int update_only;
 extern int opt_ignore_existing;
 extern int inplace;
+extern int append_mode;
 extern int make_backups;
 extern int csum_length;
 extern int ignore_times;
@@ -245,35 +246,42 @@ static void generate_and_send_sums(int f
 	OFF_T offset = 0;
 
 	sum_sizes_sqroot(&sum, len);
+	write_sum_head(f_out, &sum);
+
+	if (append_mode > 0 && f_copy < 0)
+		return;
 
 	if (len > 0)
 		mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
 	else
 		mapbuf = NULL;
 
-	write_sum_head(f_out, &sum);
-
 	for (i = 0; i < sum.count; i++) {
 		int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
 		char *map = map_ptr(mapbuf, offset, n1);
-		uint32 sum1 = get_checksum1(map, n1);
 		char sum2[SUM_LENGTH];
+		uint32 sum1;
+
+		len -= n1;
+		offset += n1;
 
-		if (f_copy >= 0)
+		if (f_copy >= 0) {
 			full_write(f_copy, map, n1);
+			if (append_mode > 0)
+				continue;
+		}
 
+		sum1 = get_checksum1(map, n1);
 		get_checksum2(map, n1, sum2);
 
 		if (verbose > 3) {
 			rprintf(FINFO,
 				"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
-				(double)i, (double)offset, (long)n1,
+				(double)i, (double)offset - n1, (long)n1,
 				(unsigned long)sum1);
 		}
 		write_int(f_out, sum1);
 		write_buf(f_out, sum2, sum.s2length);
-		len -= n1;
-		offset += n1;
 	}
 
 	if (mapbuf)
@@ -685,6 +693,9 @@ static void recv_generator(char *fname, 
 		return;
 	}
 
+	if (append_mode && st.st_size > file->length)
+		return;
+
 	if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
 		;
 	else if (fnamecmp_type == FNAMECMP_FUZZY)
@@ -710,7 +721,7 @@ prepare_to_open:
 
 	if (dry_run || read_batch)
 		goto notify_others;
-	if (whole_file > 0) {
+	if (whole_file > 0 && !append_mode) {
 		if (statret == 0)
 			statret = 1;
 		goto notify_others;
@@ -876,6 +887,9 @@ void generate_files(int f_out, struct fi
 	csum_length = SUM_LENGTH;
 	only_existing = max_size = opt_ignore_existing = 0;
 	update_only = always_checksum = size_only = 0;
+	make_backups = 0; /* avoid a duplicate backup in inplace mode */
+	if (append_mode)  /* resend w/o append mode */
+		append_mode = -1; /* ... but only longer files */
 	ignore_times = 1;
 
 	if (verbose > 2)
--- orig/match.c	2005-02-15 19:27:04
+++ match.c	2005-02-11 20:26:31
@@ -23,6 +23,7 @@ extern int verbose;
 extern int am_server;
 extern int do_progress;
 extern int checksum_seed;
+extern int append_mode;
 
 int updating_basis_file;
 
@@ -334,6 +335,21 @@ void match_sums(int f, struct sum_struct
 
 	sum_init(checksum_seed);
 
+	if (append_mode) {
+		OFF_T j = 0;
+		for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
+			sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
+				   CHUNK_SIZE);
+			last_match = j;
+		}
+		if (last_match < s->flength) {
+			int32 len = s->flength - last_match;
+			sum_update(map_ptr(buf, last_match, len), len);
+			last_match = s->flength;
+		}
+		s->count = 0;
+	}
+
 	if (len > 0 && s->count > 0) {
 		build_hash_table(s);
 
@@ -347,7 +363,7 @@ void match_sums(int f, struct sum_struct
 	} else {
 		OFF_T j;
 		/* by doing this in pieces we avoid too many seeks */
-		for (j = CHUNK_SIZE; j < len; j += CHUNK_SIZE)
+		for (j = last_match + CHUNK_SIZE; j < len; j += CHUNK_SIZE)
 			matched(f, s, buf, j, -2);
 		matched(f, s, buf, len, -1);
 	}
--- orig/options.c	2005-02-15 19:27:05
+++ options.c	2005-02-11 20:31:32
@@ -39,6 +39,7 @@ int make_backups = 0;
  **/
 int whole_file = -1;
 
+int append_mode = 0;
 int archive_mode = 0;
 int keep_dirlinks = 0;
 int copy_links = 0;
@@ -152,7 +153,7 @@ static int daemon_opt;   /* sets am_daem
 static int F_option_cnt = 0;
 static int modify_window_set;
 static int refused_verbose, refused_delete, refused_archive_part;
-static int refused_partial, refused_progress;
+static int refused_partial, refused_progress, refused_inplace;
 static char *dest_option = NULL;
 static char *max_size_arg;
 static char partialdir_for_delayupdate[] = ".~tmp~";
@@ -262,6 +263,7 @@ void usage(enum logcode F)
   rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
   rprintf(F," -u, --update                skip files that are newer on the receiver\n");
   rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
+  rprintf(F,"     --append                append data onto shorter files\n");
   rprintf(F," -d, --dirs                  transfer directories without recursing\n");
   rprintf(F," -l, --links                 copy symlinks as symlinks\n");
   rprintf(F," -L, --copy-links            transform symlink into referent file/dir\n");
@@ -387,6 +389,7 @@ static struct poptOption long_options[] 
   {"links",           'l', POPT_ARG_NONE,   &preserve_links, 0, 0, 0 },
   {"copy-links",      'L', POPT_ARG_NONE,   &copy_links, 0, 0, 0 },
   {"keep-dirlinks",   'K', POPT_ARG_NONE,   &keep_dirlinks, 0, 0, 0 },
+  {"append",           0,  POPT_ARG_VAL,    &append_mode, 1, 0, 0 },
   {"whole-file",      'W', POPT_ARG_VAL,    &whole_file, 1, 0, 0 },
   {"no-whole-file",    0,  POPT_ARG_VAL,    &whole_file, 0, 0, 0 },
   {"copy-unsafe-links",0,  POPT_ARG_NONE,   &copy_unsafe_links, 0, 0, 0 },
@@ -561,6 +564,8 @@ static void set_refuse_options(char *bp)
 						refused_partial = op->val;
 					else if (wildmatch("progress", op->longName))
 						refused_progress = op->val;
+					else if (wildmatch("inplace", op->longName))
+						refused_inplace = op->val;
 					break;
 				}
 				if (!is_wild)
@@ -1066,6 +1071,14 @@ int parse_arguments(int *argc, const cha
 			bwlimit_writemax = 512;
 	}
 
+	if (append_mode) {
+		if (refused_inplace) {
+			create_refuse_error(refused_inplace);
+			return 0;
+		}
+		inplace = 1;
+	}
+
 	if (delay_updates && !partial_dir)
 		partial_dir = partialdir_for_delayupdate;
 
@@ -1354,7 +1367,9 @@ void server_options(char **args,int *arg
 	if (opt_ignore_existing && am_sender)
 		args[ac++] = "--ignore-existing";
 
-	if (inplace)
+	if (append_mode)
+		args[ac++] = "--append";
+	else if (inplace)
 		args[ac++] = "--inplace";
 
 	if (tmpdir) {
--- orig/receiver.c	2005-02-15 19:27:05
+++ receiver.c	2005-02-11 20:26:32
@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
 extern int module_id;
 extern int ignore_errors;
 extern int orig_umask;
+extern int append_mode;
 extern int keep_partial;
 extern int checksum_seed;
 extern int inplace;
@@ -165,6 +166,28 @@ static int receive_data(int f_in, char *
 
 	sum_init(checksum_seed);
 
+	if (append_mode) {
+		OFF_T j;
+		sum.flength = (OFF_T)sum.count * sum.blength;
+		if (sum.remainder)
+			sum.flength -= sum.blength - sum.remainder;
+		for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
+			sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
+				   CHUNK_SIZE);
+			offset = j;
+		}
+		if (offset < sum.flength) {
+			int32 len = sum.flength - offset;
+			sum_update(map_ptr(mapbuf, offset, len), len);
+			offset = sum.flength;
+		}
+		if (fd != -1 && do_lseek(fd, offset, SEEK_SET) != offset) {
+			rsyserr(FERROR, errno, "lseek failed on %s",
+				full_fname(fname));
+			exit_cleanup(RERR_FILEIO);
+		}
+	}
+
 	while ((i = recv_token(f_in, &data)) != 0) {
 		if (do_progress)
 			show_progress(offset, total_size);
@@ -356,6 +379,7 @@ int recv_files(int f_in, struct file_lis
 			send_msg(MSG_DONE, "", 0);
 			if (keep_partial && !partial_dir)
 				make_backups = 0; /* prevents double backup */
+			append_mode = 0;
 			continue;
 		}
 
--- orig/rsync.yo	2005-02-15 19:27:05
+++ rsync.yo	2005-02-11 20:36:38
@@ -309,6 +309,7 @@ to the detailed description below for a 
      --suffix=SUFFIX         backup suffix (default ~ w/o --backup-dir)
  -u, --update                skip files that are newer on the receiver
      --inplace               update destination files in-place
+     --append                append data onto shorter files
  -d, --dirs                  transfer directories without recursing
  -l, --links                 copy symlinks as symlinks
  -L, --copy-links            transform symlink into referent file/dir
@@ -555,6 +556,14 @@ should not use this option to update fil
 rsync will be unable to update a file in-place that is not writable by the
 receiving user.
 
+dit(bf(--append)) This causes rsync to update a file by appending data onto
+the end of the file, which presumes that the data that already exists on
+the receiving side is identical with the start of the file on the sending
+side.  If that is not true, the file will fail the checksum check, and a
+normal bf(--inplace) update will correct the mismatch.  Any file on the
+receiving side that is longer than a file on the sending side is skipped.
+Implies bf(--inplace).
+
 dit(bf(-d, --dirs)) Tell the sending side to include any directories that
 are encountered.  Unlike bf(--recursive), a directory's contents are not copied
 unless the directory was specified on the command-line as either "." or a
--- orig/sender.c	2005-02-15 19:27:05
+++ sender.c	2005-02-11 20:26:32
@@ -31,6 +31,7 @@ extern int protocol_version;
 extern int updating_basis_file;
 extern int make_backups;
 extern int inplace;
+extern int append_mode;
 extern struct stats stats;
 
 
@@ -63,6 +64,13 @@ static struct sum_struct *receive_sums(i
 			(double)s->count, (long)s->blength, (long)s->remainder);
 	}
 
+	if (append_mode) {
+		s->flength = (OFF_T)s->count * s->blength;
+		if (s->remainder)
+			s->flength -= s->blength - s->remainder;
+		return s;
+	}
+
 	if (s->count == 0)
 		return(s);
 
@@ -128,6 +136,7 @@ void send_files(struct file_list *flist,
 				/* For inplace: redo phase turns off the backup
 				 * flag so that we do a regular inplace send. */
 				make_backups = 0;
+				append_mode = 0;
 				continue;
 			}
 			break;
Commit	Line	Data
2c0d3742 WD	1	This patch adds the --append option, which works like a "resume" mode in
	2	an ftp client, appending new data onto the end of the files it updates.
	3
45f1b149 WD	4	--- orig/generator.c 2005-02-15 19:27:04
	5	+++ generator.c 2005-02-15 19:31:13
	6	@@ -41,6 +41,7 @@ extern int delete_during;
2c0d3742 WD	7	extern int update_only;
	8	extern int opt_ignore_existing;
	9	extern int inplace;
	10	+extern int append_mode;
	11	extern int make_backups;
	12	extern int csum_length;
	13	extern int ignore_times;
45f1b149	14	@@ -245,35 +246,42 @@ static void generate_and_send_sums(int f
2c0d3742 WD	15	OFF_T offset = 0;
	16
	17	sum_sizes_sqroot(&sum, len);
	18	+ write_sum_head(f_out, &sum);
	19	+
	20	+ if (append_mode > 0 && f_copy < 0)
	21	+ return;
	22
	23	if (len > 0)
	24	mapbuf = map_file(fd, len, MAX_MAP_SIZE, sum.blength);
	25	else
	26	mapbuf = NULL;
	27
	28	- write_sum_head(f_out, &sum);
	29	-
	30	for (i = 0; i < sum.count; i++) {
	31	int32 n1 = (int32)MIN(len, (OFF_T)sum.blength);
	32	char *map = map_ptr(mapbuf, offset, n1);
	33	- uint32 sum1 = get_checksum1(map, n1);
	34	char sum2[SUM_LENGTH];
	35	+ uint32 sum1;
	36	+
	37	+ len -= n1;
	38	+ offset += n1;
	39
	40	- if (f_copy >= 0)
	41	+ if (f_copy >= 0) {
	42	full_write(f_copy, map, n1);
	43	+ if (append_mode > 0)
	44	+ continue;
	45	+ }
	46
	47	+ sum1 = get_checksum1(map, n1);
	48	get_checksum2(map, n1, sum2);
	49
	50	if (verbose > 3) {
	51	rprintf(FINFO,
	52	"chunk[%.0f] offset=%.0f len=%ld sum1=%08lx\n",
	53	- (double)i, (double)offset, (long)n1,
	54	+ (double)i, (double)offset - n1, (long)n1,
	55	(unsigned long)sum1);
	56	}
	57	write_int(f_out, sum1);
	58	write_buf(f_out, sum2, sum.s2length);
	59	- len -= n1;
	60	- offset += n1;
	61	}
	62
	63	if (mapbuf)
45f1b149	64	@@ -685,6 +693,9 @@ static void recv_generator(char *fname,
2c0d3742 WD	65	return;
	66	}
	67
	68	+ if (append_mode && st.st_size > file->length)
	69	+ return;
	70	+
	71	if (!compare_dest && fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
	72	;
45f1b149 WD	73	else if (fnamecmp_type == FNAMECMP_FUZZY)
45f1b149 WD	74	@@ -710,7 +721,7 @@ prepare_to_open:
2c0d3742 WD	75
	76	if (dry_run \|\| read_batch)
	77	goto notify_others;
	78	- if (whole_file > 0) {
	79	+ if (whole_file > 0 && !append_mode) {
45f1b149 WD	80	if (statret == 0)
45f1b149 WD	81	statret = 1;
2c0d3742	82	goto notify_others;
45f1b149	83	@@ -876,6 +887,9 @@ void generate_files(int f_out, struct fi
2c0d3742 WD	84	csum_length = SUM_LENGTH;
	85	only_existing = max_size = opt_ignore_existing = 0;
	86	update_only = always_checksum = size_only = 0;
	87	+ make_backups = 0; /* avoid a duplicate backup in inplace mode */
	88	+ if (append_mode) /* resend w/o append mode */
	89	+ append_mode = -1; /* ... but only longer files */
	90	ignore_times = 1;
	91
	92	if (verbose > 2)
45f1b149	93	--- orig/match.c 2005-02-15 19:27:04
2c0d3742 WD	94	+++ match.c 2005-02-11 20:26:31
	95	@@ -23,6 +23,7 @@ extern int verbose;
	96	extern int am_server;
	97	extern int do_progress;
	98	extern int checksum_seed;
	99	+extern int append_mode;
	100
	101	int updating_basis_file;
	102
45f1b149	103	@@ -334,6 +335,21 @@ void match_sums(int f, struct sum_struct
2c0d3742 WD	104
	105	sum_init(checksum_seed);
	106
	107	+ if (append_mode) {
	108	+ OFF_T j = 0;
	109	+ for (j = CHUNK_SIZE; j < s->flength; j += CHUNK_SIZE) {
	110	+ sum_update(map_ptr(buf, last_match, CHUNK_SIZE),
	111	+ CHUNK_SIZE);
	112	+ last_match = j;
	113	+ }
	114	+ if (last_match < s->flength) {
	115	+ int32 len = s->flength - last_match;
	116	+ sum_update(map_ptr(buf, last_match, len), len);
	117	+ last_match = s->flength;
	118	+ }
	119	+ s->count = 0;
	120	+ }
	121	+
	122	if (len > 0 && s->count > 0) {
	123	build_hash_table(s);
	124
45f1b149	125	@@ -347,7 +363,7 @@ void match_sums(int f, struct sum_struct
2c0d3742 WD	126	} else {
	127	OFF_T j;
	128	/* by doing this in pieces we avoid too many seeks */
	129	- for (j = CHUNK_SIZE; j < len; j += CHUNK_SIZE)
	130	+ for (j = last_match + CHUNK_SIZE; j < len; j += CHUNK_SIZE)
	131	matched(f, s, buf, j, -2);
	132	matched(f, s, buf, len, -1);
	133	}
45f1b149	134	--- orig/options.c 2005-02-15 19:27:05
2c0d3742 WD	135	+++ options.c 2005-02-11 20:31:32
	136	@@ -39,6 +39,7 @@ int make_backups = 0;
	137	**/
	138	int whole_file = -1;
	139
	140	+int append_mode = 0;
	141	int archive_mode = 0;
	142	int keep_dirlinks = 0;
	143	int copy_links = 0;
45f1b149	144	@@ -152,7 +153,7 @@ static int daemon_opt; /* sets am_daem
2c0d3742 WD	145	static int F_option_cnt = 0;
	146	static int modify_window_set;
	147	static int refused_verbose, refused_delete, refused_archive_part;
	148	-static int refused_partial, refused_progress;
	149	+static int refused_partial, refused_progress, refused_inplace;
	150	static char *dest_option = NULL;
	151	static char *max_size_arg;
	152	static char partialdir_for_delayupdate[] = ".~tmp~";
45f1b149	153	@@ -262,6 +263,7 @@ void usage(enum logcode F)
2c0d3742 WD	154	rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
	155	rprintf(F," -u, --update skip files that are newer on the receiver\n");
	156	rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
	157	+ rprintf(F," --append append data onto shorter files\n");
	158	rprintf(F," -d, --dirs transfer directories without recursing\n");
	159	rprintf(F," -l, --links copy symlinks as symlinks\n");
	160	rprintf(F," -L, --copy-links transform symlink into referent file/dir\n");
45f1b149	161	@@ -387,6 +389,7 @@ static struct poptOption long_options[]
2c0d3742 WD	162	{"links", 'l', POPT_ARG_NONE, &preserve_links, 0, 0, 0 },
	163	{"copy-links", 'L', POPT_ARG_NONE, &copy_links, 0, 0, 0 },
	164	{"keep-dirlinks", 'K', POPT_ARG_NONE, &keep_dirlinks, 0, 0, 0 },
	165	+ {"append", 0, POPT_ARG_VAL, &append_mode, 1, 0, 0 },
	166	{"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 },
	167	{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
45f1b149 WD	168	{"copy-unsafe-links",0, POPT_ARG_NONE, &copy_unsafe_links, 0, 0, 0 },
45f1b149 WD	169	@@ -561,6 +564,8 @@ static void set_refuse_options(char *bp)
2c0d3742 WD	170	refused_partial = op->val;
	171	else if (wildmatch("progress", op->longName))
	172	refused_progress = op->val;
	173	+ else if (wildmatch("inplace", op->longName))
	174	+ refused_inplace = op->val;
	175	break;
	176	}
	177	if (!is_wild)
45f1b149	178	@@ -1066,6 +1071,14 @@ int parse_arguments(int *argc, const cha
2c0d3742 WD	179	bwlimit_writemax = 512;
	180	}
	181
	182	+ if (append_mode) {
	183	+ if (refused_inplace) {
	184	+ create_refuse_error(refused_inplace);
	185	+ return 0;
	186	+ }
	187	+ inplace = 1;
	188	+ }
	189	+
	190	if (delay_updates && !partial_dir)
	191	partial_dir = partialdir_for_delayupdate;
	192
45f1b149	193	@@ -1354,7 +1367,9 @@ void server_options(char *args,int arg
2c0d3742 WD	194	if (opt_ignore_existing && am_sender)
	195	args[ac++] = "--ignore-existing";
	196
	197	- if (inplace)
	198	+ if (append_mode)
	199	+ args[ac++] = "--append";
	200	+ else if (inplace)
	201	args[ac++] = "--inplace";
	202
	203	if (tmpdir) {
45f1b149	204	--- orig/receiver.c 2005-02-15 19:27:05
2c0d3742	205	+++ receiver.c 2005-02-11 20:26:32
45f1b149	206	@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
2c0d3742 WD	207	extern int module_id;
	208	extern int ignore_errors;
	209	extern int orig_umask;
	210	+extern int append_mode;
	211	extern int keep_partial;
	212	extern int checksum_seed;
	213	extern int inplace;
45f1b149	214	@@ -165,6 +166,28 @@ static int receive_data(int f_in, char *
2c0d3742 WD	215
	216	sum_init(checksum_seed);
	217
	218	+ if (append_mode) {
	219	+ OFF_T j;
	220	+ sum.flength = (OFF_T)sum.count * sum.blength;
	221	+ if (sum.remainder)
	222	+ sum.flength -= sum.blength - sum.remainder;
	223	+ for (j = CHUNK_SIZE; j < sum.flength; j += CHUNK_SIZE) {
	224	+ sum_update(map_ptr(mapbuf, offset, CHUNK_SIZE),
	225	+ CHUNK_SIZE);
	226	+ offset = j;
	227	+ }
	228	+ if (offset < sum.flength) {
	229	+ int32 len = sum.flength - offset;
	230	+ sum_update(map_ptr(mapbuf, offset, len), len);
	231	+ offset = sum.flength;
	232	+ }
	233	+ if (fd != -1 && do_lseek(fd, offset, SEEK_SET) != offset) {
	234	+ rsyserr(FERROR, errno, "lseek failed on %s",
	235	+ full_fname(fname));
	236	+ exit_cleanup(RERR_FILEIO);
	237	+ }
	238	+ }
	239	+
	240	while ((i = recv_token(f_in, &data)) != 0) {
	241	if (do_progress)
	242	show_progress(offset, total_size);
45f1b149	243	@@ -356,6 +379,7 @@ int recv_files(int f_in, struct file_lis
2c0d3742 WD	244	send_msg(MSG_DONE, "", 0);
	245	if (keep_partial && !partial_dir)
	246	make_backups = 0; /* prevents double backup */
	247	+ append_mode = 0;
	248	continue;
	249	}
	250
45f1b149	251	--- orig/rsync.yo 2005-02-15 19:27:05
2c0d3742 WD	252	+++ rsync.yo 2005-02-11 20:36:38
	253	@@ -309,6 +309,7 @@ to the detailed description below for a
	254	--suffix=SUFFIX backup suffix (default ~ w/o --backup-dir)
	255	-u, --update skip files that are newer on the receiver
	256	--inplace update destination files in-place
	257	+ --append append data onto shorter files
	258	-d, --dirs transfer directories without recursing
	259	-l, --links copy symlinks as symlinks
	260	-L, --copy-links transform symlink into referent file/dir
45f1b149	261	@@ -555,6 +556,14 @@ should not use this option to update fil
2c0d3742 WD	262	rsync will be unable to update a file in-place that is not writable by the
	263	receiving user.
	264
	265	+dit(bf(--append)) This causes rsync to update a file by appending data onto
	266	+the end of the file, which presumes that the data that already exists on
	267	+the receiving side is identical with the start of the file on the sending
	268	+side. If that is not true, the file will fail the checksum check, and a
	269	+normal bf(--inplace) update will correct the mismatch. Any file on the
	270	+receiving side that is longer than a file on the sending side is skipped.
	271	+Implies bf(--inplace).
	272	+
	273	dit(bf(-d, --dirs)) Tell the sending side to include any directories that
	274	are encountered. Unlike bf(--recursive), a directory's contents are not copied
	275	unless the directory was specified on the command-line as either "." or a
45f1b149	276	--- orig/sender.c 2005-02-15 19:27:05
2c0d3742	277	+++ sender.c 2005-02-11 20:26:32
45f1b149	278	@@ -31,6 +31,7 @@ extern int protocol_version;
2c0d3742 WD	279	extern int updating_basis_file;
	280	extern int make_backups;
	281	extern int inplace;
	282	+extern int append_mode;
	283	extern struct stats stats;
	284
	285
45f1b149	286	@@ -63,6 +64,13 @@ static struct sum_struct *receive_sums(i
2c0d3742 WD	287	(double)s->count, (long)s->blength, (long)s->remainder);
	288	}
	289
	290	+ if (append_mode) {
	291	+ s->flength = (OFF_T)s->count * s->blength;
	292	+ if (s->remainder)
	293	+ s->flength -= s->blength - s->remainder;
	294	+ return s;
	295	+ }
	296	+
	297	if (s->count == 0)
	298	return(s);
	299
45f1b149	300	@@ -128,6 +136,7 @@ void send_files(struct file_list *flist,
2c0d3742 WD	301	/* For inplace: redo phase turns off the backup
	302	* flag so that we do a regular inplace send. */
	303	make_backups = 0;
	304	+ append_mode = 0;
	305	continue;
	306	}
	307	break;