Say "rsync 2.6.4" instead of "protocol 29".

[rsync/rsync.git] / main.c

diff --git a/main.c b/main.c
index 48895e6..3a0a355 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,19 +429,25 @@ 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)
 {
-       if (protocol_version < 29) {
-               read_int(f_in);
-               return;
+       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);
+               }
        }
 
-       /* 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);
+       if (i != -1) {
+               rprintf(FERROR, "Invalid packet from generator at end of run.\n");
+               exit_cleanup(RERR_PROTOCOL);
        }
 }
 
@@ -559,16 +566,22 @@ 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 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. */
+               /* Handle any keep-alive packets from the post-processing work
+                * that the generator does. */
                if (protocol_version >= 29) {
-                       while (read_int(f_in) == flist->count) {
-                               if (read_shortint(f_in) != ITEM_IS_NEW)
-                                       break; /* Complain? */
-                       }
+                       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);
        }
@@ -1042,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);
 }