diff options
author | Wayne Davison <wayned@samba.org> | 2005-03-05 17:51:23 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2005-03-05 17:51:23 +0000 |
commit | 0394e34a69e7051012125dc4e49d8d928ce15290 (patch) | |
tree | e4f2101156337a6bce2b02ae550452cac6eb5940 | |
parent | 56efa5647422b364aa644f557f9d9ebc2b198e97 (diff) | |
download | rsync-0394e34a69e7051012125dc4e49d8d928ce15290.tar.gz rsync-0394e34a69e7051012125dc4e49d8d928ce15290.tar.bz2 rsync-0394e34a69e7051012125dc4e49d8d928ce15290.zip |
Moved the end_progress() call from match.c to sender.c so that we
report progress on 0-length files when pushing files (the receiver
already called it, so we already produced progress on a 0-length
file when pulling).
-rw-r--r-- | match.c | 6 | ||||
-rw-r--r-- | sender.c | 3 |
2 files changed, 4 insertions, 5 deletions
@@ -133,12 +133,8 @@ static void matched(int f, struct sum_struct *s, struct map_struct *buf, else last_match = offset; - if (buf && do_progress) { + if (buf && do_progress) show_progress(last_match, buf->file_size); - - if (i == -1) - end_progress(buf->file_size); - } } @@ -325,6 +325,9 @@ void send_files(struct file_list *flist, int f_out, int f_in) set_compression(fname); match_sums(f_out, s, mbuf, st.st_size); + if (do_progress) + end_progress(st.st_size); + if (!log_before_transfer) log_item(file, &initial_stats, iflags, NULL); |