extern int io_error;
extern int keep_partial;
extern int got_xfer_error;
+extern int progress_is_active;
extern char *partial_dir;
extern char *logfile_name;
exit_code = unmodified_code = code;
+ if (progress_is_active) {
+ fputc('\n', stdout);
+ progress_is_active = 0;
+ }
+
if (verbose > 3) {
rprintf(FINFO,
"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
exit_cleanup(RERR_MESSAGEIO);
}
- if (progress_is_active && !am_server) {
+ if (progress_is_active) {
fputc('\n', f);
progress_is_active = 0;
}
trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
? buf[--len] : 0;
+ if (len && buf[0] == '\r') {
+ fputc('\r', f);
+ buf++;
+ len--;
+ }
+
#ifdef ICONV_CONST
if (ic != (iconv_t)-1) {
xbuf outbuf, inbuf;
double rate, remain;
if (is_last) {
+ snprintf(eol, sizeof eol,
+ " (xfer#%d, to-check=%d/%d)\n",
+ stats.num_transferred_files,
+ stats.num_files - current_file_index - 1,
+ stats.num_files);
/* Compute stats based on the starting info. */
if (!ph_start.time.tv_sec
|| !(diff = msdiff(&ph_start.time, now)))
/* Switch to total time taken for our last update. */
remain = (double) diff / 1000.0;
} else {
+ strlcpy(eol, " ", sizeof eol);
/* Compute stats based on recent progress. */
if (!(diff = msdiff(&ph_list[oldest_hpos].time, now)))
diff = 1;
(int) remain % 60);
}
- if (is_last) {
- snprintf(eol, sizeof eol, " (xfer#%d, to-check=%d/%d)\n",
- stats.num_transferred_files,
- stats.num_files - current_file_index - 1,
- stats.num_files);
- } else
- strlcpy(eol, "\r", sizeof eol);
progress_is_active = 0;
- rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s",
+ rprintf(FCLIENT, "\r%12s %3d%% %7.2f%s %s%s",
human_num(ofs), pct, rate, units, rembuf, eol);
- if (!is_last)
+ if (!is_last) {
progress_is_active = 1;
+ fflush(stdout);
+ }
}
void set_current_file_index(struct file_struct *file, int ndx)