[rsync/rsync-patches.git] / remove-sent-files.diff

After applying this patch and running configure, you MUST run this
command before "make":

    make proto


--- io.c	15 May 2004 19:31:10 -0000	1.121
+++ io.c	15 May 2004 20:15:14 -0000
@@ -222,6 +222,14 @@ static void read_msg_fd(void)
 		read_loop(fd, buf, 4);
 		redo_list_add(IVAL(buf,0));
 		break;
+	case MSG_SUCCESS:
+		if (len != 4) {
+			rprintf(FERROR, "invalid message %d:%d\n", tag, len);
+			exit_cleanup(RERR_STREAMIO);
+		}
+		read_loop(fd, buf, len);
+		io_multiplex_write(MSG_SUCCESS, buf, len);
+		break;
 	case MSG_INFO:
 	case MSG_ERROR:
 	case MSG_LOG:
@@ -635,6 +643,16 @@ static int read_unbuffered(int fd, char 
 			}
 			read_loop(fd, buffer, remaining);
 			bufferIdx = 0;
+			break;
+		case MSG_SUCCESS:
+			if (remaining != 4) {
+				rprintf(FERROR, "invalid multi-message %d:%ld\n",
+					tag, (long)remaining);
+				exit_cleanup(RERR_STREAMIO);
+			}
+			read_loop(fd, line, remaining);
+			successful_send(IVAL(line, 0));
+			remaining = 0;
 			break;
 		case MSG_INFO:
 		case MSG_ERROR:
--- main.c	15 May 2004 19:31:10 -0000	1.194
+++ main.c	15 May 2004 20:15:15 -0000
@@ -42,6 +42,7 @@ extern int list_only;
 extern int local_server;
 extern int log_got_error;
 extern int module_id;
+extern int need_messages_from_generator;
 extern int orig_umask;
 extern int preserve_hard_links;
 extern int protocol_version;
@@ -566,6 +567,8 @@ void start_server(int f_in, int f_out, i
 		io_start_multiplex_out(f_out);
 
 	if (am_sender) {
+		if (need_messages_from_generator)
+			io_start_multiplex_in(f_in);
 		if (!read_batch) {
 			recv_exclude_list(f_in);
 			if (cvs_exclude)
@@ -631,6 +634,9 @@ int client_run(int f_in, int f_out, pid_
 		io_flush(FULL_FLUSH);
 		exit_cleanup(status);
 	}
+
+	if (need_messages_from_generator)
+		io_start_multiplex_out(f_out);
 
 	if (argc == 0)
 		list_only = 1;
--- options.c	6 May 2004 21:08:01 -0000	1.148
+++ options.c	15 May 2004 20:15:15 -0000
@@ -84,6 +84,7 @@ int copy_unsafe_links = 0;
 int size_only = 0;
 int bwlimit = 0;
 int delete_after = 0;
+int delete_sent_files = 0;
 int only_existing = 0;
 int opt_ignore_existing = 0;
 int max_delete = 0;
@@ -91,6 +92,7 @@ int ignore_errors = 0;
 int modify_window = 0;
 int blocking_io = -1;
 int checksum_seed = 0;
+int need_messages_from_generator = 0;
 unsigned int block_size = 0;
 
 
@@ -254,6 +256,7 @@ void usage(enum logcode F)
   rprintf(F,"     --delete                delete files that don't exist on the sending side\n");
   rprintf(F,"     --delete-excluded       also delete excluded files on the receiving side\n");
   rprintf(F,"     --delete-after          receiver deletes after transferring, not before\n");
+  rprintf(F,"     --delete-sent-files     updated/sent files are removed from sending side\n");
   rprintf(F,"     --ignore-errors         delete even if there are I/O errors\n");
   rprintf(F,"     --max-delete=NUM        don't delete more than NUM files\n");
   rprintf(F,"     --partial               keep partially transferred files\n");
@@ -303,8 +306,8 @@ void usage(enum logcode F)
 }
 
 enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
-      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
-      OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
+      OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_DELETE_SENT_FILES,
+      OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_LINK_DEST, OPT_MODIFY_WINDOW,
       OPT_READ_BATCH, OPT_WRITE_BATCH,
       OPT_REFUSED_BASE = 9000};
 
@@ -323,6 +326,7 @@ static struct poptOption long_options[] 
   {"ignore-existing",  0,  POPT_ARG_NONE,   &opt_ignore_existing, 0, 0, 0 },
   {"delete-after",     0,  POPT_ARG_NONE,   0,              OPT_DELETE_AFTER, 0, 0 },
   {"delete-excluded",  0,  POPT_ARG_NONE,   0,              OPT_DELETE_EXCLUDED, 0, 0 },
+  {"delete-sent-files",0,  POPT_ARG_NONE,   0,              OPT_DELETE_SENT_FILES, 0, 0 },
   {"force",            0,  POPT_ARG_NONE,   &force_delete, 0, 0, 0 },
   {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
   {"exclude",          0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE, 0, 0 },
@@ -509,6 +513,11 @@ int parse_arguments(int *argc, const cha
 			delete_mode = 1;
 			break;
 
+		case OPT_DELETE_SENT_FILES:
+			delete_sent_files = 1;
+			need_messages_from_generator = 1;
+			break;
+
 		case OPT_EXCLUDE:
 			add_exclude(&exclude_list, poptGetOptArg(pc), 0);
 			break;
@@ -964,6 +973,9 @@ void server_options(char **args,int *arg
 			args[ac++] = "--from0";
 		}
 	}
+
+	if (delete_sent_files)
+		args[ac++] = "--delete-sent-files";
 
 	*argc = ac;
 	return;
--- receiver.c	15 May 2004 19:31:10 -0000	1.78
+++ receiver.c	15 May 2004 20:15:15 -0000
@@ -46,6 +46,7 @@ extern int module_id;
 extern int ignore_errors;
 extern int orig_umask;
 extern int keep_partial;
+extern int delete_sent_files;
 
 static void delete_one(char *fn, int is_dir)
 {
@@ -294,7 +295,7 @@ int recv_files(int f_in,struct file_list
 	char *fname, fbuf[MAXPATHLEN];
 	char template[MAXPATHLEN];
 	char fnametmp[MAXPATHLEN];
-	char *fnamecmp;
+	char *fnamecmp, numbuf[4];
 	char fnamecmpbuf[MAXPATHLEN];
 	struct map_struct *mapbuf;
 	int i;
@@ -476,16 +477,20 @@ int recv_files(int f_in,struct file_list
 
 		cleanup_disable();
 
-		if (!recv_ok) {
+		if (recv_ok) {
+			if (delete_sent_files) {
+				SIVAL(numbuf, 0, i);
+				send_msg(MSG_SUCCESS, numbuf, 4);
+			}
+		} else {
 			if (csum_length == SUM_LENGTH) {
 				rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
 					full_fname(fname));
 			} else {
-				char buf[4];
 				if (verbose > 1)
 					rprintf(FINFO,"redoing %s(%d)\n",fname,i);
-				SIVAL(buf, 0, i);
-				send_msg(MSG_REDO, buf, 4);
+				SIVAL(numbuf, 0, i);
+				send_msg(MSG_REDO, numbuf, 4);
 			}
 		}
 	}
--- rsync.h	13 May 2004 18:51:22 -0000	1.203
+++ rsync.h	15 May 2004 20:15:15 -0000
@@ -60,6 +60,7 @@
 #define FLAG_TOP_DIR (1<<0)
 #define FLAG_HLINK_EOL (1<<1)	/* generator only */
 #define FLAG_MOUNT_POINT (1<<2)	/* sender only */
+#define FLAG_SENT (1<<7)	/* sender only */
 
 /* update this if you make incompatible changes */
 #define PROTOCOL_VERSION 28
@@ -123,6 +124,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
 /* Messages types that are sent over the message channel.  The logcode
  * values must all be present here with identical numbers. */
 enum msgcode {
+	MSG_SUCCESS=6,	/* successfully updated indicated flist index */
 	MSG_DONE=5,	/* current phase is done */
 	MSG_REDO=4,	/* reprocess indicated flist index */
 	MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
--- rsync.yo	7 May 2004 00:18:37 -0000	1.169
+++ rsync.yo	15 May 2004 20:15:16 -0000
@@ -312,6 +312,7 @@ verb(
      --delete                delete files that don't exist on sender
      --delete-excluded       also delete excluded files on receiver
      --delete-after          receiver deletes after transfer, not before
+     --delete-sent-files     updated/sent files are removed from sender
      --ignore-errors         delete even if there are I/O errors
      --max-delete=NUM        don't delete more than NUM files
      --partial               keep partially transferred files
@@ -596,6 +597,11 @@ dit(bf(--delete-after)) By default rsync
 receiving side before transferring files to try to ensure that there is
 sufficient space on the receiving filesystem. If you want to delete
 after transferring, use the --delete-after switch. Implies --delete.
+
+dit(bf(--delete-sent-files)) This tells rsync to remove the source files
+on the sending side that are successfully transferred to the receiving
+side.  Directories are not removed, nor are files that are identical on
+both systems.
 
 dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
 even when there are I/O errors.
--- sender.c	15 May 2004 19:31:10 -0000	1.40
+++ sender.c	15 May 2004 20:15:16 -0000
@@ -27,6 +27,7 @@ extern int dry_run;
 extern int am_server;
 extern int am_daemon;
 extern int protocol_version;
+extern int delete_sent_files;
 
 
 /**
@@ -104,7 +105,29 @@ static struct sum_struct *receive_sums(i
 	return s;
 }
 
+static struct file_list *the_flist;
 
+void successful_send(int i)
+{
+	char fname[MAXPATHLEN];
+	struct file_struct *file;
+	unsigned int offset;
+
+	if (!the_flist)
+		return;
+
+	file = the_flist->files[i];
+	if (!(file->flags & FLAG_SENT))
+		return; /* We didn't send it -- impossible! */
+	if (file->basedir) {
+		offset = stringjoin(fname, sizeof fname,
+				    file->basedir, "/", NULL);
+	} else
+		offset = 0;
+	f_name_to(file, fname + offset);
+	if (delete_sent_files && do_unlink(fname) == 0 && verbose > 0)
+		rprintf(FINFO, "sender removed %s\n", fname + offset);
+}
 
 void send_files(struct file_list *flist, int f_out, int f_in)
 {
@@ -129,6 +152,8 @@ void send_files(struct file_list *flist,
 	if (verbose > 2)
 		rprintf(FINFO, "send_files starting\n");
 
+	the_flist = flist;
+
 	while (1) {
 		unsigned int offset;
 
@@ -300,6 +325,9 @@ void send_files(struct file_list *flist,
 
 		if (verbose > 2)
 			rprintf(FINFO, "sender finished %s\n", fname);
+
+		/* Flag that we actually sent this entry. */
+		file->flags |= FLAG_SENT;
 	}
 
 	if (verbose > 2)
Commit	Line	Data
8a529471 WD	1	After applying this patch and running configure, you MUST run this
	2	command before "make":
	3
	4	make proto
	5
	6
fe6407b5 WD	7	--- io.c 15 May 2004 19:31:10 -0000 1.121
fe6407b5 WD	8	+++ io.c 15 May 2004 20:15:14 -0000
c57f4101 WD	9	@@ -222,6 +222,14 @@ static void read_msg_fd(void)
	10	read_loop(fd, buf, 4);
	11	redo_list_add(IVAL(buf,0));
	12	break;
	13	+ case MSG_SUCCESS:
	14	+ if (len != 4) {
	15	+ rprintf(FERROR, "invalid message %d:%d\n", tag, len);
	16	+ exit_cleanup(RERR_STREAMIO);
	17	+ }
	18	+ read_loop(fd, buf, len);
	19	+ io_multiplex_write(MSG_SUCCESS, buf, len);
	20	+ break;
	21	case MSG_INFO:
	22	case MSG_ERROR:
	23	case MSG_LOG:
fe6407b5	24	@@ -635,6 +643,16 @@ static int read_unbuffered(int fd, char
c57f4101 WD	25	}
	26	read_loop(fd, buffer, remaining);
	27	bufferIdx = 0;
	28	+ break;
	29	+ case MSG_SUCCESS:
	30	+ if (remaining != 4) {
	31	+ rprintf(FERROR, "invalid multi-message %d:%ld\n",
	32	+ tag, (long)remaining);
	33	+ exit_cleanup(RERR_STREAMIO);
	34	+ }
	35	+ read_loop(fd, line, remaining);
	36	+ successful_send(IVAL(line, 0));
	37	+ remaining = 0;
	38	break;
	39	case MSG_INFO:
	40	case MSG_ERROR:
fe6407b5 WD	41	--- main.c 15 May 2004 19:31:10 -0000 1.194
fe6407b5 WD	42	+++ main.c 15 May 2004 20:15:15 -0000
c57f4101 WD	43	@@ -42,6 +42,7 @@ extern int list_only;
	44	extern int local_server;
	45	extern int log_got_error;
	46	extern int module_id;
	47	+extern int need_messages_from_generator;
	48	extern int orig_umask;
	49	extern int preserve_hard_links;
	50	extern int protocol_version;
fe6407b5	51	@@ -566,6 +567,8 @@ void start_server(int f_in, int f_out, i
c57f4101 WD	52	io_start_multiplex_out(f_out);
	53
	54	if (am_sender) {
	55	+ if (need_messages_from_generator)
	56	+ io_start_multiplex_in(f_in);
	57	if (!read_batch) {
	58	recv_exclude_list(f_in);
	59	if (cvs_exclude)
fe6407b5	60	@@ -631,6 +634,9 @@ int client_run(int f_in, int f_out, pid_
c57f4101 WD	61	io_flush(FULL_FLUSH);
	62	exit_cleanup(status);
	63	}
	64	+
	65	+ if (need_messages_from_generator)
	66	+ io_start_multiplex_out(f_out);
	67
fe6407b5	68	if (argc == 0)
c57f4101	69	list_only = 1;
ea238f1c	70	--- options.c 6 May 2004 21:08:01 -0000 1.148
fe6407b5	71	+++ options.c 15 May 2004 20:15:15 -0000
54691942	72	@@ -84,6 +84,7 @@ int copy_unsafe_links = 0;
c57f4101 WD	73	int size_only = 0;
	74	int bwlimit = 0;
	75	int delete_after = 0;
	76	+int delete_sent_files = 0;
	77	int only_existing = 0;
	78	int opt_ignore_existing = 0;
	79	int max_delete = 0;
54691942	80	@@ -91,6 +92,7 @@ int ignore_errors = 0;
c57f4101 WD	81	int modify_window = 0;
	82	int blocking_io = -1;
	83	int checksum_seed = 0;
	84	+int need_messages_from_generator = 0;
	85	unsigned int block_size = 0;
	86
	87
54691942	88	@@ -254,6 +256,7 @@ void usage(enum logcode F)
c57f4101 WD	89	rprintf(F," --delete delete files that don't exist on the sending side\n");
	90	rprintf(F," --delete-excluded also delete excluded files on the receiving side\n");
	91	rprintf(F," --delete-after receiver deletes after transferring, not before\n");
	92	+ rprintf(F," --delete-sent-files updated/sent files are removed from sending side\n");
	93	rprintf(F," --ignore-errors delete even if there are I/O errors\n");
	94	rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
	95	rprintf(F," --partial keep partially transferred files\n");
54691942	96	@@ -303,8 +306,8 @@ void usage(enum logcode F)
c57f4101 WD	97	}
	98
	99	enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
	100	- OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
	101	- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
	102	+ OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_DELETE_SENT_FILES,
	103	+ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_LINK_DEST, OPT_MODIFY_WINDOW,
	104	OPT_READ_BATCH, OPT_WRITE_BATCH,
	105	OPT_REFUSED_BASE = 9000};
	106
54691942	107	@@ -323,6 +326,7 @@ static struct poptOption long_options[]
c57f4101 WD	108	{"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
	109	{"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 },
	110	{"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 },
	111	+ {"delete-sent-files",0, POPT_ARG_NONE, 0, OPT_DELETE_SENT_FILES, 0, 0 },
	112	{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
	113	{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
	114	{"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
54691942	115	@@ -509,6 +513,11 @@ int parse_arguments(int *argc, const cha
c57f4101 WD	116	delete_mode = 1;
	117	break;
	118
	119	+ case OPT_DELETE_SENT_FILES:
	120	+ delete_sent_files = 1;
	121	+ need_messages_from_generator = 1;
	122	+ break;
	123	+
	124	case OPT_EXCLUDE:
54691942 WD	125	add_exclude(&exclude_list, poptGetOptArg(pc), 0);
	126	break;
	127	@@ -964,6 +973,9 @@ void server_options(char *args,int arg
c57f4101 WD	128	args[ac++] = "--from0";
	129	}
	130	}
	131	+
	132	+ if (delete_sent_files)
	133	+ args[ac++] = "--delete-sent-files";
	134
	135	*argc = ac;
	136	return;
fe6407b5 WD	137	--- receiver.c 15 May 2004 19:31:10 -0000 1.78
fe6407b5 WD	138	+++ receiver.c 15 May 2004 20:15:15 -0000
8a529471	139	@@ -46,6 +46,7 @@ extern int module_id;
54691942 WD	140	extern int ignore_errors;
54691942 WD	141	extern int orig_umask;
8a529471	142	extern int keep_partial;
c57f4101 WD	143	+extern int delete_sent_files;
	144
	145	static void delete_one(char *fn, int is_dir)
	146	{
fe6407b5	147	@@ -294,7 +295,7 @@ int recv_files(int f_in,struct file_list
c57f4101 WD	148	char *fname, fbuf[MAXPATHLEN];
	149	char template[MAXPATHLEN];
	150	char fnametmp[MAXPATHLEN];
	151	- char *fnamecmp;
	152	+ char *fnamecmp, numbuf[4];
	153	char fnamecmpbuf[MAXPATHLEN];
	154	struct map_struct *mapbuf;
	155	int i;
fe6407b5	156	@@ -476,16 +477,20 @@ int recv_files(int f_in,struct file_list
c57f4101 WD	157
	158	cleanup_disable();
	159
	160	- if (!recv_ok) {
	161	+ if (recv_ok) {
	162	+ if (delete_sent_files) {
	163	+ SIVAL(numbuf, 0, i);
	164	+ send_msg(MSG_SUCCESS, numbuf, 4);
	165	+ }
	166	+ } else {
	167	if (csum_length == SUM_LENGTH) {
	168	rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
	169	full_fname(fname));
	170	} else {
	171	- char buf[4];
	172	if (verbose > 1)
	173	rprintf(FINFO,"redoing %s(%d)\n",fname,i);
	174	- SIVAL(buf, 0, i);
	175	- send_msg(MSG_REDO, buf, 4);
	176	+ SIVAL(numbuf, 0, i);
	177	+ send_msg(MSG_REDO, numbuf, 4);
	178	}
	179	}
	180	}
8a529471	181	--- rsync.h 13 May 2004 18:51:22 -0000 1.203
fe6407b5	182	+++ rsync.h 15 May 2004 20:15:15 -0000
54691942	183	@@ -60,6 +60,7 @@
c57f4101 WD	184	#define FLAG_TOP_DIR (1<<0)
	185	#define FLAG_HLINK_EOL (1<<1) /* generator only */
	186	#define FLAG_MOUNT_POINT (1<<2) /* sender only */
	187	+#define FLAG_SENT (1<<7) /* sender only */
	188
	189	/* update this if you make incompatible changes */
	190	#define PROTOCOL_VERSION 28
8a529471	191	@@ -123,6 +124,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
ea238f1c WD	192	/* Messages types that are sent over the message channel. The logcode
	193	* values must all be present here with identical numbers. */
	194	enum msgcode {
c57f4101	195	+ MSG_SUCCESS=6, /* successfully updated indicated flist index */
ea238f1c WD	196	MSG_DONE=5, /* current phase is done */
	197	MSG_REDO=4, /* reprocess indicated flist index */
	198	MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
	199	--- rsync.yo 7 May 2004 00:18:37 -0000 1.169
fe6407b5	200	+++ rsync.yo 15 May 2004 20:15:16 -0000
103bcb1d	201	@@ -312,6 +312,7 @@ verb(
c57f4101 WD	202	--delete delete files that don't exist on sender
	203	--delete-excluded also delete excluded files on receiver
	204	--delete-after receiver deletes after transfer, not before
	205	+ --delete-sent-files updated/sent files are removed from sender
	206	--ignore-errors delete even if there are I/O errors
	207	--max-delete=NUM don't delete more than NUM files
	208	--partial keep partially transferred files
ea238f1c	209	@@ -596,6 +597,11 @@ dit(bf(--delete-after)) By default rsync
c57f4101 WD	210	receiving side before transferring files to try to ensure that there is
	211	sufficient space on the receiving filesystem. If you want to delete
	212	after transferring, use the --delete-after switch. Implies --delete.
	213	+
	214	+dit(bf(--delete-sent-files)) This tells rsync to remove the source files
	215	+on the sending side that are successfully transferred to the receiving
	216	+side. Directories are not removed, nor are files that are identical on
	217	+both systems.
	218
	219	dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files
	220	even when there are I/O errors.
fe6407b5 WD	221	--- sender.c 15 May 2004 19:31:10 -0000 1.40
fe6407b5 WD	222	+++ sender.c 15 May 2004 20:15:16 -0000
c57f4101 WD	223	@@ -27,6 +27,7 @@ extern int dry_run;
	224	extern int am_server;
	225	extern int am_daemon;
	226	extern int protocol_version;
	227	+extern int delete_sent_files;
	228
	229
	230	/**
	231	@@ -104,7 +105,29 @@ static struct sum_struct *receive_sums(i
	232	return s;
	233	}
	234
	235	+static struct file_list *the_flist;
	236
	237	+void successful_send(int i)
	238	+{
	239	+ char fname[MAXPATHLEN];
	240	+ struct file_struct *file;
	241	+ unsigned int offset;
	242	+
	243	+ if (!the_flist)
	244	+ return;
	245	+
	246	+ file = the_flist->files[i];
	247	+ if (!(file->flags & FLAG_SENT))
	248	+ return; /* We didn't send it -- impossible! */
	249	+ if (file->basedir) {
	250	+ offset = stringjoin(fname, sizeof fname,
	251	+ file->basedir, "/", NULL);
	252	+ } else
	253	+ offset = 0;
	254	+ f_name_to(file, fname + offset);
	255	+ if (delete_sent_files && do_unlink(fname) == 0 && verbose > 0)
	256	+ rprintf(FINFO, "sender removed %s\n", fname + offset);
	257	+}
	258
	259	void send_files(struct file_list *flist, int f_out, int f_in)
	260	{
	261	@@ -129,6 +152,8 @@ void send_files(struct file_list *flist,
	262	if (verbose > 2)
	263	rprintf(FINFO, "send_files starting\n");
	264
	265	+ the_flist = flist;
	266	+
	267	while (1) {
	268	unsigned int offset;
	269
fe6407b5	270	@@ -300,6 +325,9 @@ void send_files(struct file_list *flist,
c57f4101 WD	271
	272	if (verbose > 2)
	273	rprintf(FINFO, "sender finished %s\n", fname);
	274	+
	275	+ /* Flag that we actually sent this entry. */
	276	+ file->flags \|= FLAG_SENT;
	277	}
	278
	279	if (verbose > 2)