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
The sender now sets IOERR_GENERAL in more skipped-file instances.
[rsync/rsync.git]
/
progress.c
diff --git
a/progress.c
b/progress.c
index
c8ab1a1
..
86f8ea1
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
7
Wayne Davison
+ * Copyright (C) 2003-200
8
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
@@
-40,6
+40,8
@@
struct progress_history {
OFF_T ofs;
};
OFF_T ofs;
};
+int progress_is_active = 0;
+
static struct progress_history ph_start;
static struct progress_history ph_list[PROGRESS_HISTORY_SECS];
static int newest_hpos, oldest_hpos;
static struct progress_history ph_start;
static struct progress_history ph_list[PROGRESS_HISTORY_SECS];
static int newest_hpos, oldest_hpos;
@@
-111,8
+113,11
@@
static void rprint_progress(OFF_T ofs, OFF_T size, struct timeval *now,
stats.num_files);
} else
strlcpy(eol, "\r", sizeof eol);
stats.num_files);
} else
strlcpy(eol, "\r", sizeof eol);
+ progress_is_active = 0;
rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s",
human_num(ofs), pct, rate, units, rembuf, eol);
rprintf(FCLIENT, "%12s %3d%% %7.2f%s %s%s",
human_num(ofs), pct, rate, units, rembuf, eol);
+ if (!is_last)
+ progress_is_active = 1;
}
void set_current_file_index(struct file_struct *file, int ndx)
}
void set_current_file_index(struct file_struct *file, int ndx)