Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix checker compile warning.
[rsync/rsync.git]
/
sender.c
diff --git
a/sender.c
b/sender.c
index
9861296
..
bf6e7b4
100644
(file)
--- 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 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;
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) {
end_progress(0);
}
if (inc_recurse && first_flist) {
+ file_old_total -= first_flist->used;
flist_free(first_flist);
if (first_flist) {
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;
}
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);
rsyserr(FERROR_XFER, errno, "fstat failed");
free_sums(s);
close(fd);
- exit_cleanup(RERR_
PROTOCOL
);
+ exit_cleanup(RERR_
FILEIO
);
}
if (st.st_size) {
}
if (st.st_size) {