X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/951e826b75c4a4e6bc066e248d7489fb6eba6fde..89cb47212ef1a994819814332b937cbbd131a75c:/progress.c diff --git a/progress.c b/progress.c index afd8ef63..25be3749 100644 --- a/progress.c +++ b/progress.c @@ -21,6 +21,7 @@ */ #include "rsync.h" +#include "inums.h" extern int am_server; extern int need_unsorted_flist; @@ -71,8 +72,8 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, if (is_last) { int len = snprintf(eol, sizeof eol, - " (xfer#%d, to-check=%d/%d)\n", - stats.num_transferred_files, + " (xfr#%d, to-chk=%d/%d)\n", + stats.xferred_files, stats.num_files - current_file_index - 1, stats.num_files); if (INFO_GTE(PROGRESS, 2)) { @@ -123,7 +124,7 @@ static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now, output_needs_newline = 0; pct = ofs == size ? 100 : (int) (100.0 * ofs / size); - rprintf(FCLIENT, "\r%12s %3d%% %7.2f%s %s%s", + rprintf(FCLIENT, "\r%15s %3d%% %7.2f%s %s%s", human_num(ofs), pct, rate, units, rembuf, eol); if (!is_last) { output_needs_newline = 1;