X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4dde3347fb614270f6aa6812598185aa0ccca3ef..82b2a31a46d7c94f951b96f61c9935198f0f53f1:/sender.c diff --git a/sender.c b/sender.c index 98612965..bf6e7b46 100644 --- a/sender.c +++ b/sender.c @@ -42,6 +42,7 @@ extern int make_backups; extern int inplace; extern int batch_fd; extern int write_batch; +extern int file_old_total; extern struct stats stats; extern struct file_list *cur_flist, *first_flist, *dir_flist; @@ -197,8 +198,11 @@ void send_files(int f_in, int f_out) end_progress(0); } if (inc_recurse && first_flist) { + file_old_total -= first_flist->used; flist_free(first_flist); if (first_flist) { + if (first_flist == cur_flist) + file_old_total = cur_flist->used; write_ndx(f_out, NDX_DONE); continue; } @@ -333,7 +337,7 @@ void send_files(int f_in, int f_out) rsyserr(FERROR_XFER, errno, "fstat failed"); free_sums(s); close(fd); - exit_cleanup(RERR_PROTOCOL); + exit_cleanup(RERR_FILEIO); } if (st.st_size) {