damn.

with the new error handling code it is possible for rsync to get stuck
on the final transaction, leaving it hung.

looks like 2.4.1 will be pretty soon

diff --git a/main.c b/main.c
index 11344eb2b12743f88b246a3e7935bb2bb1622d25..ac5c1d2f0d07ef6bb54c3da3b5446be0439ad5e9 100644 (file)
--- a/main.c
+++ b/main.c
@@ -283,6 +283,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
        extern int delete_after;
        extern int recurse;
        extern int delete_mode;
+       extern int remote_version;
 
        if (preserve_hard_links)
                init_hard_links(flist);
@@ -320,6 +321,7 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
                recv_files(f_in,flist,local_name,recv_pipe[1]);
                report(f_in);
 
+               write_int(recv_pipe[1],-1);
                io_flush();
                _exit(0);
        }
@@ -335,7 +337,13 @@ static int do_recv(int f_in,int f_out,struct file_list *flist,char *local_name)
 
        generate_files(f_out,flist,local_name,recv_pipe[0]);
 
+       read_int(recv_pipe[1]);
+       if (remote_version >= 24) {
+               /* send a final goodbye message */
+               write_int(f_out, -1);
+       }
        io_flush();
+
        wait_process(pid, &status);
        return status;
 }
@@ -452,6 +460,10 @@ int client_run(int f_in, int f_out, int pid, int argc, char *argv[])
                        wait_process(pid, &status);
                }
                report(-1);
+               if (remote_version >= 24) {
+                       /* final goodbye message */             
+                       read_int(f_in);
+               }
                exit_cleanup(status);
        }
 

diff --git a/rsync.h b/rsync.h
index 471449e043e89a8a5d1e4ce70e067d677e386923..a4b7e812479592b31a126179c5170643b9284e1f 100644 (file)
--- a/rsync.h
+++ b/rsync.h
@@ -47,7 +47,7 @@
 #define SAME_TIME (1<<7)
 
 /* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 23
+#define PROTOCOL_VERSION 24
 #define MIN_PROTOCOL_VERSION 15
 #define MAX_PROTOCOL_VERSION 30