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
Support for ": dirconf/per-dir-rules", in progress.
[rsync/rsync.git]
/
progress.c
diff --git
a/progress.c
b/progress.c
index
b09ca11
..
25be374
100644
(file)
--- a/
progress.c
+++ b/
progress.c
@@
-21,11
+21,11
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "inums.h"
extern int am_server;
extern int need_unsorted_flist;
extern int output_needs_newline;
extern int am_server;
extern int need_unsorted_flist;
extern int output_needs_newline;
-extern int human_readable;
extern struct stats stats;
extern struct file_list *cur_flist;
extern struct stats stats;
extern struct file_list *cur_flist;
@@
-72,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,
if (is_last) {
int len = snprintf(eol, sizeof eol,
- " (xf
er#%d, to-chec
k=%d/%d)\n",
- stats.
num_trans
ferred_files,
+ " (xf
r#%d, to-ch
k=%d/%d)\n",
+ stats.
x
ferred_files,
stats.num_files - current_file_index - 1,
stats.num_files);
if (INFO_GTE(PROGRESS, 2)) {
stats.num_files - current_file_index - 1,
stats.num_files);
if (INFO_GTE(PROGRESS, 2)) {
@@
-124,8
+124,8
@@
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);
output_needs_newline = 0;
pct = ofs == size ? 100 : (int) (100.0 * ofs / size);
- rprintf(FCLIENT, "\r%1
2
s %3d%% %7.2f%s %s%s",
-
big_num(ofs, human_readable
), pct, rate, units, rembuf, eol);
+ rprintf(FCLIENT, "\r%1
5
s %3d%% %7.2f%s %s%s",
+
human_num(ofs
), pct, rate, units, rembuf, eol);
if (!is_last) {
output_needs_newline = 1;
rflush(FCLIENT);
if (!is_last) {
output_needs_newline = 1;
rflush(FCLIENT);