Fixed the parsing of IPv6 literal addresses with a username

[rsync/rsync.git] / receiver.c

diff --git a/receiver.c b/receiver.c
index c1ea608..4325e30 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -331,7 +331,7 @@ static void handle_delayed_updates(char *local_name)
                struct file_struct *file = cur_flist->files[ndx];
                fname = local_name ? local_name : f_name(file, NULL);
                if ((partialptr = partial_dir_fname(fname)) != NULL) {
-                       if (make_backups > 0 && !make_backup(fname))
+                       if (make_backups > 0 && !make_backup(fname, False))
                                continue;
                        if (DEBUG_GTE(RECV, 1)) {
                                rprintf(FINFO, "renaming %s to %s\n",
@@ -384,18 +384,25 @@ static int we_want_redo(int desired_ndx)
        return 0;
 }
 
-static int gen_wants_ndx(int desired_ndx)
+static int gen_wants_ndx(int desired_ndx, int flist_num)
 {
        static int next_ndx = -1;
-       static BOOL got_eof = 0;
+       static int done_cnt = 0;
+       static BOOL got_eof = False;
 
        if (got_eof)
                return 0;
 
        while (next_ndx < desired_ndx) {
+               if (inc_recurse && flist_num <= done_cnt)
+                       return 0;
                if (next_ndx >= 0)
                        no_batched_update(next_ndx, False);
                if ((next_ndx = read_int(batch_gen_fd)) < 0) {
+                       if (inc_recurse) {
+                               done_cnt++;
+                               continue;
+                       }
                        got_eof = True;
                        return 0;
                }
@@ -453,13 +460,17 @@ int recv_files(int f_in, char *local_name)
                                end_progress(0);
                        }
                        if (inc_recurse && first_flist) {
-                               if (read_batch)
-                                       gen_wants_ndx(first_flist->used + first_flist->ndx_start);
+                               if (read_batch) {
+                                       ndx = first_flist->used + first_flist->ndx_start;
+                                       gen_wants_ndx(ndx, first_flist->flist_num);
+                               }
                                flist_free(first_flist);
                                if (first_flist)
                                        continue;
-                       } else if (read_batch && first_flist)
-                               gen_wants_ndx(first_flist->used);
+                       } else if (read_batch && first_flist) {
+                               ndx = first_flist->used;
+                               gen_wants_ndx(ndx, first_flist->flist_num);
+                       }
                        if (++phase > max_phase)
                                break;
                        if (DEBUG_GTE(RECV, 1))
@@ -565,7 +576,10 @@ int recv_files(int f_in, char *local_name)
                }
 
                if (read_batch) {
-                       if (!(redoing ? we_want_redo(ndx) : gen_wants_ndx(ndx))) {
+                       int wanted = redoing
+                                  ? we_want_redo(ndx)
+                                  : gen_wants_ndx(ndx, cur_flist->flist_num);
+                       if (!wanted) {
                                rprintf(FINFO,
                                        "(Skipping batched update for%s \"%s\")\n",
                                        redoing ? " resend of" : "",
@@ -828,11 +842,6 @@ int recv_files(int f_in, char *local_name)
        if (phase == 2 && delay_updates) /* for protocol_version < 29 */
                handle_delayed_updates(local_name);
 
-       if (read_batch) {
-               read_int(batch_gen_fd); /* Discard -1 */
-               read_del_stats(batch_gen_fd);
-       }
-
        if (DEBUG_GTE(RECV, 1))
                rprintf(FINFO,"recv_files finished\n");