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 | ||
d5753a22 | 7 | --- orig/io.c 2004-08-02 02:44:26 |
13bed3dd | 8 | +++ io.c 2004-07-03 20:17:10 |
dc8e6f70 | 9 | @@ -240,6 +240,14 @@ static void read_msg_fd(void) |
c57f4101 WD |
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: | |
dc8e6f70 | 24 | @@ -673,6 +681,16 @@ static int readfd_unbuffered(int fd, cha |
9cd8d7aa WD |
25 | read_loop(fd, iobuf_in, remaining); |
26 | iobuf_in_ndx = 0; | |
7b675ff5 | 27 | break; |
c57f4101 WD |
28 | + case MSG_SUCCESS: |
29 | + if (remaining != 4) { | |
30 | + rprintf(FERROR, "invalid multi-message %d:%ld\n", | |
31 | + tag, (long)remaining); | |
32 | + exit_cleanup(RERR_STREAMIO); | |
33 | + } | |
34 | + read_loop(fd, line, remaining); | |
35 | + successful_send(IVAL(line, 0)); | |
36 | + remaining = 0; | |
7b675ff5 | 37 | + break; |
c57f4101 WD |
38 | case MSG_INFO: |
39 | case MSG_ERROR: | |
7b675ff5 | 40 | if (remaining >= sizeof line) { |
8b88ca4c | 41 | --- orig/main.c 2004-10-08 20:16:26 |
580f70f0 | 42 | +++ main.c 2004-08-13 08:24:23 |
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; | |
d5753a22 | 49 | extern int copy_links; |
7628f156 | 50 | extern int keep_dirlinks; |
f635ed27 | 51 | @@ -621,6 +622,8 @@ void start_server(int f_in, int f_out, i |
c57f4101 WD |
52 | |
53 | if (am_sender) { | |
7628f156 | 54 | keep_dirlinks = 0; /* Must be disabled on the sender. */ |
c57f4101 | 55 | + if (need_messages_from_generator) |
580f70f0 | 56 | + io_start_multiplex_in(); |
9be39c35 WD |
57 | |
58 | recv_exclude_list(f_in); | |
59 | if (cvs_exclude) | |
a60267ab | 60 | @@ -702,6 +705,9 @@ int client_run(int f_in, int f_out, pid_ |
c57f4101 WD |
61 | exit_cleanup(status); |
62 | } | |
7b675ff5 | 63 | |
dc8e6f70 | 64 | + if (need_messages_from_generator && !read_batch) |
580f70f0 | 65 | + io_start_multiplex_out(); |
7b675ff5 | 66 | + |
fe6407b5 | 67 | if (argc == 0) |
c57f4101 | 68 | list_only = 1; |
7b675ff5 | 69 | |
8b88ca4c WD |
70 | --- orig/options.c 2004-10-14 17:11:40 |
71 | +++ options.c 2004-10-14 17:17:53 | |
f635ed27 | 72 | @@ -87,8 +87,10 @@ int size_only = 0; |
c57f4101 | 73 | int bwlimit = 0; |
78114162 | 74 | size_t bwlimit_writemax = 0; |
c57f4101 WD |
75 | int delete_after = 0; |
76 | +int delete_sent_files = 0; | |
77 | int only_existing = 0; | |
78 | int opt_ignore_existing = 0; | |
f6c3b300 | 79 | +int need_messages_from_generator = 0; |
c57f4101 | 80 | int max_delete = 0; |
f6c3b300 | 81 | int ignore_errors = 0; |
c57f4101 | 82 | int modify_window = 0; |
f635ed27 | 83 | @@ -266,6 +268,7 @@ void usage(enum logcode F) |
c57f4101 WD |
84 | rprintf(F," --delete delete files that don't exist on the sending side\n"); |
85 | rprintf(F," --delete-excluded also delete excluded files on the receiving side\n"); | |
86 | rprintf(F," --delete-after receiver deletes after transferring, not before\n"); | |
87 | + rprintf(F," --delete-sent-files updated/sent files are removed from sending side\n"); | |
88 | rprintf(F," --ignore-errors delete even if there are I/O errors\n"); | |
89 | rprintf(F," --max-delete=NUM don't delete more than NUM files\n"); | |
90 | rprintf(F," --partial keep partially transferred files\n"); | |
8b88ca4c | 91 | @@ -310,8 +313,8 @@ void usage(enum logcode F) |
c57f4101 WD |
92 | } |
93 | ||
8b88ca4c | 94 | enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM, |
c57f4101 WD |
95 | - OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST, |
96 | - OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, | |
97 | + OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_DELETE_SENT_FILES, | |
98 | + OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_LINK_DEST, OPT_MODIFY_WINDOW, | |
125d7fca | 99 | OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT, |
c57f4101 WD |
100 | OPT_REFUSED_BASE = 9000}; |
101 | ||
8b88ca4c | 102 | @@ -330,6 +333,7 @@ static struct poptOption long_options[] |
c57f4101 | 103 | {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 }, |
8b88ca4c WD |
104 | {"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 }, |
105 | {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 }, | |
106 | + {"delete-sent-files",0, POPT_ARG_NONE, 0, OPT_DELETE_SENT_FILES, 0, 0 }, | |
c57f4101 WD |
107 | {"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 }, |
108 | {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 }, | |
8b88ca4c WD |
109 | {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 }, |
110 | @@ -606,6 +610,11 @@ int parse_arguments(int *argc, const cha | |
c57f4101 WD |
111 | delete_mode = 1; |
112 | break; | |
113 | ||
114 | + case OPT_DELETE_SENT_FILES: | |
115 | + delete_sent_files = 1; | |
116 | + need_messages_from_generator = 1; | |
117 | + break; | |
118 | + | |
119 | case OPT_EXCLUDE: | |
a6587818 WD |
120 | add_exclude(&exclude_list, poptGetOptArg(pc), 0); |
121 | break; | |
8b88ca4c | 122 | @@ -1156,6 +1165,9 @@ void server_options(char **args,int *arg |
c57f4101 WD |
123 | } |
124 | } | |
7b675ff5 | 125 | |
c57f4101 WD |
126 | + if (delete_sent_files) |
127 | + args[ac++] = "--delete-sent-files"; | |
7b675ff5 | 128 | + |
c57f4101 WD |
129 | *argc = ac; |
130 | return; | |
7b675ff5 | 131 | |
a6587818 | 132 | --- orig/receiver.c 2004-09-21 09:40:27 |
580f70f0 | 133 | +++ receiver.c 2004-08-13 08:38:51 |
d5753a22 | 134 | @@ -45,6 +45,7 @@ extern char *backup_dir; |
f6c3b300 WD |
135 | extern char *backup_suffix; |
136 | extern int backup_suffix_len; | |
137 | extern int cleanup_got_literal; | |
c57f4101 | 138 | +extern int delete_sent_files; |
f6c3b300 WD |
139 | extern int module_id; |
140 | extern int ignore_errors; | |
141 | extern int orig_umask; | |
a6587818 | 142 | @@ -337,7 +338,7 @@ int recv_files(int f_in, struct file_lis |
c57f4101 WD |
143 | char *fname, fbuf[MAXPATHLEN]; |
144 | char template[MAXPATHLEN]; | |
145 | char fnametmp[MAXPATHLEN]; | |
afbebe13 WD |
146 | - char *fnamecmp, *partialptr; |
147 | + char *fnamecmp, *partialptr, numbuf[4]; | |
c57f4101 | 148 | char fnamecmpbuf[MAXPATHLEN]; |
7628f156 | 149 | struct file_struct *file; |
dc3ae351 | 150 | struct stats initial_stats; |
a6587818 | 151 | @@ -572,7 +573,12 @@ int recv_files(int f_in, struct file_lis |
c57f4101 WD |
152 | |
153 | cleanup_disable(); | |
154 | ||
155 | - if (!recv_ok) { | |
156 | + if (recv_ok) { | |
157 | + if (delete_sent_files) { | |
158 | + SIVAL(numbuf, 0, i); | |
159 | + send_msg(MSG_SUCCESS, numbuf, 4); | |
160 | + } | |
161 | + } else { | |
8075fb75 WD |
162 | int msgtype = csum_length == SUM_LENGTH || read_batch ? |
163 | FERROR : FINFO; | |
164 | if (msgtype == FERROR || verbose) { | |
a6587818 | 165 | @@ -596,9 +602,8 @@ int recv_files(int f_in, struct file_lis |
982426b8 | 166 | keptstr, redostr); |
8075fb75 WD |
167 | } |
168 | if (csum_length != SUM_LENGTH) { | |
c57f4101 | 169 | - char buf[4]; |
c57f4101 WD |
170 | - SIVAL(buf, 0, i); |
171 | - send_msg(MSG_REDO, buf, 4); | |
172 | + SIVAL(numbuf, 0, i); | |
173 | + send_msg(MSG_REDO, numbuf, 4); | |
174 | } | |
175 | } | |
176 | } | |
8b88ca4c | 177 | --- orig/rsync.h 2004-10-09 03:21:56 |
13bed3dd | 178 | +++ rsync.h 2004-07-03 20:17:10 |
54691942 | 179 | @@ -60,6 +60,7 @@ |
c57f4101 WD |
180 | #define FLAG_TOP_DIR (1<<0) |
181 | #define FLAG_HLINK_EOL (1<<1) /* generator only */ | |
182 | #define FLAG_MOUNT_POINT (1<<2) /* sender only */ | |
183 | +#define FLAG_SENT (1<<7) /* sender only */ | |
184 | ||
185 | /* update this if you make incompatible changes */ | |
186 | #define PROTOCOL_VERSION 28 | |
a60267ab | 187 | @@ -127,6 +128,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3 |
ea238f1c WD |
188 | /* Messages types that are sent over the message channel. The logcode |
189 | * values must all be present here with identical numbers. */ | |
190 | enum msgcode { | |
c57f4101 | 191 | + MSG_SUCCESS=6, /* successfully updated indicated flist index */ |
ea238f1c WD |
192 | MSG_DONE=5, /* current phase is done */ |
193 | MSG_REDO=4, /* reprocess indicated flist index */ | |
194 | MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */ | |
8b88ca4c | 195 | --- orig/rsync.yo 2004-10-06 00:12:16 |
13bed3dd | 196 | +++ rsync.yo 2004-07-03 20:17:10 |
580f70f0 | 197 | @@ -343,6 +343,7 @@ verb( |
c57f4101 WD |
198 | --delete delete files that don't exist on sender |
199 | --delete-excluded also delete excluded files on receiver | |
200 | --delete-after receiver deletes after transfer, not before | |
201 | + --delete-sent-files updated/sent files are removed from sender | |
202 | --ignore-errors delete even if there are I/O errors | |
203 | --max-delete=NUM don't delete more than NUM files | |
204 | --partial keep partially transferred files | |
a60267ab | 205 | @@ -661,6 +662,11 @@ receiving side before transferring files |
c57f4101 WD |
206 | sufficient space on the receiving filesystem. If you want to delete |
207 | after transferring, use the --delete-after switch. Implies --delete. | |
7b675ff5 | 208 | |
c57f4101 WD |
209 | +dit(bf(--delete-sent-files)) This tells rsync to remove the source files |
210 | +on the sending side that are successfully transferred to the receiving | |
211 | +side. Directories are not removed, nor are files that are identical on | |
212 | +both systems. | |
7b675ff5 | 213 | + |
c57f4101 WD |
214 | dit(bf(--ignore-errors)) Tells --delete to go ahead and delete files |
215 | even when there are I/O errors. | |
7b675ff5 | 216 | |
a6587818 | 217 | --- orig/sender.c 2004-09-20 05:10:48 |
982426b8 | 218 | +++ sender.c 2004-07-26 16:49:19 |
f6c3b300 WD |
219 | @@ -26,6 +26,7 @@ extern int io_error; |
220 | extern int dry_run; | |
c57f4101 WD |
221 | extern int am_server; |
222 | extern int am_daemon; | |
c57f4101 | 223 | +extern int delete_sent_files; |
f6c3b300 | 224 | extern int protocol_version; |
a6587818 | 225 | extern int make_backups; |
f6c3b300 | 226 | extern struct stats stats; |
a6587818 | 227 | @@ -108,7 +109,29 @@ static struct sum_struct *receive_sums(i |
c57f4101 WD |
228 | return s; |
229 | } | |
230 | ||
231 | +static struct file_list *the_flist; | |
232 | ||
233 | +void successful_send(int i) | |
234 | +{ | |
235 | + char fname[MAXPATHLEN]; | |
236 | + struct file_struct *file; | |
237 | + unsigned int offset; | |
238 | + | |
239 | + if (!the_flist) | |
240 | + return; | |
241 | + | |
242 | + file = the_flist->files[i]; | |
243 | + if (!(file->flags & FLAG_SENT)) | |
244 | + return; /* We didn't send it -- impossible! */ | |
245 | + if (file->basedir) { | |
246 | + offset = stringjoin(fname, sizeof fname, | |
247 | + file->basedir, "/", NULL); | |
248 | + } else | |
249 | + offset = 0; | |
250 | + f_name_to(file, fname + offset); | |
251 | + if (delete_sent_files && do_unlink(fname) == 0 && verbose > 0) | |
252 | + rprintf(FINFO, "sender removed %s\n", fname + offset); | |
253 | +} | |
254 | ||
255 | void send_files(struct file_list *flist, int f_out, int f_in) | |
256 | { | |
a6587818 | 257 | @@ -127,6 +150,8 @@ void send_files(struct file_list *flist, |
c57f4101 WD |
258 | if (verbose > 2) |
259 | rprintf(FINFO, "send_files starting\n"); | |
260 | ||
261 | + the_flist = flist; | |
262 | + | |
263 | while (1) { | |
264 | unsigned int offset; | |
265 | ||
a6587818 | 266 | @@ -257,6 +282,9 @@ void send_files(struct file_list *flist, |
982426b8 WD |
267 | rprintf(FINFO, "sender finished %s\n", |
268 | safe_fname(fname)); | |
269 | } | |
c57f4101 WD |
270 | + |
271 | + /* Flag that we actually sent this entry. */ | |
272 | + file->flags |= FLAG_SENT; | |
273 | } | |
a6587818 | 274 | make_backups = save_make_backups; |
c57f4101 | 275 |