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
Mention --debug=hlink's level limits.
[rsync/rsync.git]
/
progress.c
diff --git
a/progress.c
b/progress.c
index
afd8ef6
..
ac010fd
100644
(file)
--- a/
progress.c
+++ b/
progress.c
@@
-4,7
+4,7
@@
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
* Copyright (C) 1996-2000 Andrew Tridgell
* Copyright (C) 1996 Paul Mackerras
* Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2003-200
8
Wayne Davison
+ * Copyright (C) 2003-200
9
Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-21,8
+21,10
@@
*/
#include "rsync.h"
*/
#include "rsync.h"
+#include "inums.h"
extern int am_server;
extern int am_server;
+extern int flist_eof;
extern int need_unsorted_flist;
extern int output_needs_newline;
extern struct stats stats;
extern int need_unsorted_flist;
extern int output_needs_newline;
extern struct stats stats;
@@
-71,8
+73,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_transferred_files
,
+ " (xf
r#%d, %s-ch
k=%d/%d)\n",
+ stats.
xferred_files, flist_eof ? "to" : "ir"
,
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)) {
@@
-123,7
+125,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);
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",
+ 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;
human_num(ofs), pct, rate, units, rembuf, eol);
if (!is_last) {
output_needs_newline = 1;