X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/93c31c1a6d1016924acea01791d6453de75063b6..8ebdc9724efd6a4f3aeaf6287f5dc7c4762969b8:/main.c

diff --git a/main.c b/main.c
index 46d4f69f..3a0a3550 100644
--- a/main.c
+++ b/main.c
@@ -23,20 +23,20 @@
 
 time_t starttime = 0;
 
-extern struct stats stats;
+extern int verbose;
+extern int dry_run;
+extern int list_only;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int am_daemon;
-extern int verbose;
-extern int what_has_changed;
 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 kluge_around_eof;
 extern int do_stats;
-extern int dry_run;
-extern int list_only;
 extern int log_got_error;
 extern int module_id;
 extern int orig_umask;
@@ -48,6 +48,8 @@ extern int recurse;
 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;
@@ -55,6 +57,7 @@ extern int batch_fd;
 extern int batch_gen_fd;
 extern int filesfrom_fd;
 extern pid_t cleanup_child_pid;
+extern struct stats stats;
 extern char *files_from;
 extern char *remote_filesfrom_file;
 extern char *partial_dir;
@@ -426,6 +429,29 @@ static char *get_local_name(struct file_list *flist,char *name)
 }
 
 
+/* This is only called by the sender. */
+static void read_final_goodbye(int f_in, int f_out, int flist_count)
+{
+	int i;
+
+	if (protocol_version < 29)
+		i = read_int(f_in);
+	else {
+		while ((i = read_int(f_in)) == flist_count
+		    && read_shortint(f_in) == ITEM_IS_NEW) {
+			/* Forward the keep-alive (no-op) to the receiver. */
+			write_int(f_out, flist_count);
+			write_shortint(f_out, ITEM_IS_NEW);
+		}
+	}
+
+	if (i != -1) {
+		rprintf(FERROR, "Invalid packet from generator at end of run.\n");
+		exit_cleanup(RERR_PROTOCOL);
+	}
+}
+
+
 static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 {
 	int i;
@@ -442,6 +468,12 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 		exit_cleanup(RERR_SYNTAX);
 		return;
 	}
+	if (am_daemon && lp_read_only(module_id) && remove_sent_files) {
+		rprintf(FERROR,
+		    "ERROR: --remove-sent-files cannot be used with a read-only module\n");
+		exit_cleanup(RERR_SYNTAX);
+		return;
+	}
 
 	if (!relative_paths && !push_dir(dir)) {
 		rsyserr(FERROR, errno, "push_dir#3 %s failed",
@@ -476,10 +508,8 @@ static void do_server_sender(int f_in, int f_out, int argc,char *argv[])
 	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);
 }
@@ -490,8 +520,8 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	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. */
@@ -500,11 +530,6 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 	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");
@@ -540,9 +565,23 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
 		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! */
+
+		/* Handle any keep-alive packets from the post-processing work
+		 * that the generator does. */
+		if (protocol_version >= 29) {
+			kluge_around_eof = -1;
+
+			/* This should only get stopped via a USR2 signal. */
+			while (read_int(f_in) == flist->count
+			    && read_shortint(f_in) == ITEM_IS_NEW) {}
+
+			rprintf(FERROR, "Invalid packet from server at end of run.\n");
+			exit_cleanup(RERR_PROTOCOL);
+		}
+
+		/* 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! */
 		while (1)
 			msleep(20);
 	}
@@ -673,6 +712,8 @@ void start_server(int f_in, int f_out, int argc, char *argv[])
 
 	if (am_sender) {
 		keep_dirlinks = 0; /* Must be disabled on the sender. */
+		if (need_messages_from_generator)
+			io_start_multiplex_in();
 
 		recv_filter_list(f_in);
 		do_server_sender(f_in, f_out, argc, argv);
@@ -735,10 +776,8 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 		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);
@@ -750,6 +789,9 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
 		exit_cleanup(status);
 	}
 
+	if (need_messages_from_generator && !read_batch)
+		io_start_multiplex_out();
+
 	if (argc == 0)
 		list_only |= 1;
 
@@ -1013,6 +1055,7 @@ static RETSIGTYPE sigusr1_handler(UNUSED(int val))
 
 static RETSIGTYPE sigusr2_handler(UNUSED(int val))
 {
+	close_all();
 	if (log_got_error) _exit(RERR_PARTIAL);
 	_exit(0);
 }
@@ -1174,9 +1217,6 @@ int main(int argc,char *argv[])
 		exit_cleanup(RERR_SYNTAX);
 	}
 
-	if (dry_run && !verbose && !what_has_changed)
-		verbose = 1;
-
 	if (am_server) {
 		set_nonblocking(STDIN_FILENO);
 		set_nonblocking(STDOUT_FILENO);