1 After applying this patch and running configure, you MUST run this
7 --- orig/io.c 2005-02-03 02:04:20
8 +++ io.c 2005-01-10 10:49:17
9 @@ -244,6 +244,14 @@ static void read_msg_fd(void)
10 read_loop(fd, buf, 4);
11 redo_list_add(IVAL(buf,0));
15 + rprintf(FERROR, "invalid message %d:%d\n", tag, len);
16 + exit_cleanup(RERR_STREAMIO);
18 + read_loop(fd, buf, len);
19 + io_multiplex_write(MSG_SUCCESS, buf, len);
24 @@ -677,6 +685,16 @@ static int readfd_unbuffered(int fd, cha
25 read_loop(fd, iobuf_in, remaining);
29 + if (remaining != 4) {
30 + rprintf(FERROR, "invalid multi-message %d:%ld\n",
31 + tag, (long)remaining);
32 + exit_cleanup(RERR_STREAMIO);
34 + read_loop(fd, line, remaining);
35 + successful_send(IVAL(line, 0));
40 if (remaining >= sizeof line) {
41 --- orig/main.c 2005-02-04 22:28:09
42 +++ main.c 2005-02-05 01:24:16
43 @@ -32,12 +32,14 @@ extern int am_daemon;
45 extern int blocking_io;
46 extern int delete_before;
47 +extern int delete_sent_files;
48 extern int daemon_over_rsh;
52 extern int log_got_error;
54 +extern int need_messages_from_generator;
55 extern int orig_umask;
56 extern int copy_links;
57 extern int keep_dirlinks;
58 @@ -440,6 +442,12 @@ static void do_server_sender(int f_in, i
59 exit_cleanup(RERR_SYNTAX);
62 + if (am_daemon && lp_read_only(module_id) && delete_sent_files) {
64 + "ERROR: --delete-sent-files cannot be used with a read-only module\n");
65 + exit_cleanup(RERR_SYNTAX);
69 if (!relative_paths && !push_dir(dir)) {
70 rsyserr(FERROR, errno, "push_dir#3 %s failed",
71 @@ -670,6 +678,8 @@ void start_server(int f_in, int f_out, i
74 keep_dirlinks = 0; /* Must be disabled on the sender. */
75 + if (need_messages_from_generator)
76 + io_start_multiplex_in();
78 recv_filter_list(f_in);
79 do_server_sender(f_in, f_out, argc, argv);
80 @@ -747,6 +757,9 @@ int client_run(int f_in, int f_out, pid_
84 + if (need_messages_from_generator && !read_batch)
85 + io_start_multiplex_out();
90 --- orig/options.c 2005-02-04 22:28:09
91 +++ options.c 2005-01-23 07:30:51
92 @@ -59,6 +59,7 @@ int delete_during = 0;
93 int delete_before = 0;
95 int delete_excluded = 0;
96 +int delete_sent_files = 0;
97 int one_file_system = 0;
98 int protocol_version = PROTOCOL_VERSION;
100 @@ -92,6 +93,7 @@ int bwlimit = 0;
101 size_t bwlimit_writemax = 0;
102 int only_existing = 0;
103 int opt_ignore_existing = 0;
104 +int need_messages_from_generator = 0;
107 int ignore_errors = 0;
108 @@ -286,6 +288,7 @@ void usage(enum logcode F)
109 rprintf(F," --delete-during receiver deletes during transfer, not before\n");
110 rprintf(F," --delete-after receiver deletes after transfer, not before\n");
111 rprintf(F," --delete-excluded also delete excluded files on the receiving side\n");
112 + rprintf(F," --delete-sent-files updated/sent files are removed from sending side\n");
113 rprintf(F," --ignore-errors delete even if there are I/O errors\n");
114 rprintf(F," --force force deletion of directories even if not empty\n");
115 rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
116 @@ -360,6 +363,7 @@ static struct poptOption long_options[]
117 {"delete-during", 0, POPT_ARG_NONE, &delete_during, 0, 0, 0 },
118 {"delete-after", 0, POPT_ARG_NONE, &delete_after, 0, 0, 0 },
119 {"delete-excluded", 0, POPT_ARG_NONE, &delete_excluded, 0, 0, 0 },
120 + {"delete-sent-files",0, POPT_ARG_NONE, &delete_sent_files, 0, 0, 0 },
121 {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
122 {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
123 {"filter", 'f', POPT_ARG_STRING, 0, OPT_FILTER, 0, 0 },
124 @@ -922,6 +926,9 @@ int parse_arguments(int *argc, const cha
125 else if (delete_mode || delete_excluded)
126 delete_mode = delete_before = 1;
128 + if (delete_sent_files)
129 + need_messages_from_generator = 1;
131 *argv = poptGetArgs(pc);
132 *argc = count_args(*argv);
134 @@ -1318,6 +1325,9 @@ void server_options(char **args,int *arg
135 if (!implied_dirs && !am_sender)
136 args[ac++] = "--no-implied-dirs";
138 + if (delete_sent_files)
139 + args[ac++] = "--delete-sent-files";
144 --- orig/receiver.c 2005-02-03 02:04:20
145 +++ receiver.c 2004-08-13 08:38:51
146 @@ -41,6 +41,7 @@ extern int basis_dir_cnt;
147 extern int make_backups;
148 extern int do_progress;
149 extern int cleanup_got_literal;
150 +extern int delete_sent_files;
151 extern int module_id;
152 extern int ignore_errors;
153 extern int orig_umask;
154 @@ -275,7 +276,7 @@ int recv_files(int f_in, struct file_lis
155 char *fname, fbuf[MAXPATHLEN];
156 char template[MAXPATHLEN];
157 char fnametmp[MAXPATHLEN];
158 - char *fnamecmp, *partialptr;
159 + char *fnamecmp, *partialptr, numbuf[4];
160 char fnamecmpbuf[MAXPATHLEN];
161 uchar *delayed_bits = NULL;
162 struct file_struct *file;
163 @@ -532,7 +533,12 @@ int recv_files(int f_in, struct file_lis
169 + if (delete_sent_files) {
170 + SIVAL(numbuf, 0, i);
171 + send_msg(MSG_SUCCESS, numbuf, 4);
174 int msgtype = csum_length == SUM_LENGTH || read_batch ?
176 if (msgtype == FERROR || verbose) {
177 @@ -556,9 +562,8 @@ int recv_files(int f_in, struct file_lis
180 if (csum_length != SUM_LENGTH) {
183 - send_msg(MSG_REDO, buf, 4);
184 + SIVAL(numbuf, 0, i);
185 + send_msg(MSG_REDO, numbuf, 4);
189 --- orig/rsync.h 2005-02-04 22:28:09
190 +++ rsync.h 2005-02-03 02:04:59
192 #define FLAG_HLINK_EOL (1<<1) /* generator only */
193 #define FLAG_MOUNT_POINT (1<<2) /* sender only */
194 #define FLAG_DEL_HERE (1<<3) /* receiver/generator */
195 +#define FLAG_SENT (1<<7) /* sender only */
197 /* update this if you make incompatible changes */
198 #define PROTOCOL_VERSION 29
199 @@ -142,6 +143,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
200 /* Messages types that are sent over the message channel. The logcode
201 * values must all be present here with identical numbers. */
203 + MSG_SUCCESS=6, /* successfully updated indicated flist index */
204 MSG_DONE=5, /* current phase is done */
205 MSG_REDO=4, /* reprocess indicated flist index */
206 MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
207 --- orig/rsync.yo 2005-02-05 01:23:49
208 +++ rsync.yo 2005-02-03 02:05:29
209 @@ -338,6 +338,7 @@ to the detailed description below for a
210 --delete-during receiver deletes during xfer, not before
211 --delete-after receiver deletes after transfer, not before
212 --delete-excluded also delete excluded files on receiver
213 + --delete-sent-files updated/sent files are removed from sender
214 --ignore-errors delete even if there are I/O errors
215 --force force deletion of dirs even if not empty
216 --max-delete=NUM don't delete more than NUM files
217 @@ -727,6 +728,11 @@ receiving side that are not on the sendi
218 delete any files on the receiving side that are excluded (see bf(--exclude)).
219 See bf(--delete) (which is implied) for more details on file-deletion.
221 +dit(bf(--delete-sent-files)) This tells rsync to remove the source files
222 +on the sending side that are successfully transferred to the receiving
223 +side. Directories are not removed, nor are files that are identical on
226 dit(bf(--ignore-errors)) Tells bf(--delete) to go ahead and delete files
227 even when there are I/O errors.
229 --- orig/sender.c 2005-02-03 02:04:20
230 +++ sender.c 2004-07-26 16:49:19
231 @@ -26,6 +26,7 @@ extern int io_error;
233 extern int am_server;
234 extern int am_daemon;
235 +extern int delete_sent_files;
236 extern int protocol_version;
237 extern int updating_basis_file;
238 extern int make_backups;
239 @@ -94,7 +95,29 @@ static struct sum_struct *receive_sums(i
243 +static struct file_list *the_flist;
245 +void successful_send(int i)
247 + char fname[MAXPATHLEN];
248 + struct file_struct *file;
249 + unsigned int offset;
251 + if (!the_flist || i < 0 || i >= the_flist->count)
254 + file = the_flist->files[i];
255 + if (!(file->flags & FLAG_SENT))
256 + return; /* We didn't send it -- impossible! */
257 + if (file->basedir) {
258 + offset = stringjoin(fname, sizeof fname,
259 + file->basedir, "/", NULL);
262 + f_name_to(file, fname + offset);
263 + if (delete_sent_files && do_unlink(fname) == 0 && verbose > 0)
264 + rprintf(FINFO, "sender removed %s\n", fname + offset);
267 void send_files(struct file_list *flist, int f_out, int f_in)
269 @@ -113,6 +136,8 @@ void send_files(struct file_list *flist,
271 rprintf(FINFO, "send_files starting\n");
278 @@ -254,6 +279,9 @@ void send_files(struct file_list *flist,
279 rprintf(FINFO, "sender finished %s\n",
283 + /* Flag that we actually sent this entry. */
284 + file->flags |= FLAG_SENT;
286 make_backups = save_make_backups;