- Seems to me that sigusr2_handler() should call close_all() for

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 3cc21b5..5ad21c9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -35,6 +35,7 @@ extern int blocking_io;
 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 log_got_error;
 extern int module_id;
@@ -428,6 +429,23 @@ static char *get_local_name(struct file_list *flist,char *name)
 }
 
 
+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;
@@ -484,10 +502,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);
 }
@@ -543,8 +559,19 @@ 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
+
+               /* Handle any keep-alive packets from the post-processing work
+                * that the generator does. */
+               if (protocol_version >= 29) {
+                       kluge_around_eof = -1;
+                       while (read_int(f_in) == flist->count) {
+                               if (read_shortint(f_in) != ITEM_IS_NEW)
+                                       break; /* Complain? */
+                       }
+               }
+
+               /* Finally, we hang around waiting for our parent to 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);
@@ -740,10 +767,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);
@@ -1021,6 +1046,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);
 }