extern int am_generator;
extern int am_daemon;
extern int blocking_io;
-extern int delete_before;
extern int remove_sent_files;
extern int daemon_over_rsh;
extern int need_messages_from_generator;
+extern int kludge_around_eof;
extern int do_stats;
extern int log_got_error;
extern int module_id;
extern int fuzzy_basis;
extern int relative_paths;
extern int rsync_port;
+extern int inplace;
+extern int make_backups;
extern int whole_file;
extern int read_batch;
extern int write_batch;
}
+static void read_final_goodbye(int f_in, int f_out, int flist_count)
+{
+ if (protocol_version < 29) {
+ read_int(f_in);
+ return;
+ }
+
+ /* Handle any keep-alive messages from --delete-after processing. */
+ while (read_int(f_in) == flist_count) {
+ if (read_shortint(f_in) != ITEM_IS_NEW)
+ return; /* Complain? */
+ write_int(f_out, flist_count);
+ write_shortint(f_out, ITEM_IS_NEW);
+ }
+}
+
+
static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
{
int i;
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
report(f_out);
- if (protocol_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
+ if (protocol_version >= 24)
+ read_final_goodbye(f_in, f_out, flist->count);
io_flush(FULL_FLUSH);
exit_cleanup(0);
}
int pid;
int status = 0;
int error_pipe[2], name_pipe[2];
- BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis)
- && !dry_run;
+ BOOL need_name_pipe = (basis_dir[0] || partial_dir || fuzzy_basis
+ || (inplace && make_backups)) && !dry_run;
/* The receiving side mustn't obey this, or an existing symlink that
* points to an identical file won't be replaced by the referent. */
if (preserve_hard_links)
init_hard_links(flist);
- if (delete_before && !local_name && flist->count > 0) {
- /* Moved here from recv_files() to prevent a race condition */
- delete_files(flist);
- }
-
if (fd_pair(error_pipe) < 0
|| (need_name_pipe && fd_pair(name_pipe) < 0)) {
rsyserr(FERROR, errno, "pipe failed in do_recv");
send_msg(MSG_DONE, "", 0);
io_flush(FULL_FLUSH);
- /* finally we go to sleep until our parent kills us
- * with a USR2 signal. We sleep for a short time as on
- * some OSes a signal won't interrupt a sleep! */
+
+ /* Finally, we hang around until our parent kills us with a
+ * USR2 signal. If --delete-after was specified, we might get
+ * a keep-alive message over the socket, so handle that too. */
+ if (protocol_version >= 29) {
+ kludge_around_eof = 1;
+ while (read_int(f_in) == flist->count) {
+ if (read_shortint(f_in) != ITEM_IS_NEW)
+ break; /* Complain? */
+ }
+ }
+
while (1)
msleep(20);
}
io_flush(NORMAL_FLUSH);
send_files(flist,f_out,f_in);
io_flush(FULL_FLUSH);
- if (protocol_version >= 24) {
- /* final goodbye message */
- read_int(f_in);
- }
+ if (protocol_version >= 24)
+ read_final_goodbye(f_in, f_out, flist->count);
if (pid != -1) {
if (verbose > 3)
rprintf(FINFO,"client_run waiting on %d\n", (int) pid);