- if (is_last) {
- snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n",
- stats.num_transferred_files,
- stats.num_files - stats.current_file_index - 1,
- stats.num_files);
- } else
- strlcpy(eol, "\r", sizeof eol);
- rprintf(FCLIENT, "%12s %3d%% %7.2f%s %4d:%02d:%02d%s",
- human_num(ofs), pct, rate, units,
- remain_h, remain_m, remain_s, eol);
+ output_needs_newline = 0;
+ pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
+ rprintf(FCLIENT, "\r%12s %3d%% %7.2f%s %s%s",
+ big_num(ofs, human_readable), pct, rate, units, rembuf, eol);
+ if (!is_last) {
+ output_needs_newline = 1;
+ rflush(FCLIENT);
+ }
+}
+
+void set_current_file_index(struct file_struct *file, int ndx)
+{
+ if (!file)
+ current_file_index = cur_flist->used + cur_flist->ndx_start - 1;
+ else if (need_unsorted_flist)
+ current_file_index = flist_find(cur_flist, file) + cur_flist->ndx_start;
+ else
+ current_file_index = ndx;
+ current_file_index -= cur_flist->flist_num;