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
Fixed an "Internal abbrev error" when dealing with an xattr value
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
b5bd966
..
975ebaf
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-37,6
+37,7
@@
extern int protocol_version;
extern int preserve_times;
extern int uid_ndx;
extern int gid_ndx;
extern int preserve_times;
extern int uid_ndx;
extern int gid_ndx;
+extern int progress_is_active;
extern int stdout_format_has_i;
extern int stdout_format_has_o_or_i;
extern int logfile_format_has_i;
extern int stdout_format_has_i;
extern int stdout_format_has_o_or_i;
extern int logfile_format_has_i;
@@
-320,6
+321,11
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
exit_cleanup(RERR_MESSAGEIO);
}
exit_cleanup(RERR_MESSAGEIO);
}
+ if (progress_is_active && !am_server) {
+ fputc('\n', f);
+ progress_is_active = 0;
+ }
+
trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
? buf[--len] : 0;
trailing_CR_or_NL = len && (buf[len-1] == '\n' || buf[len-1] == '\r')
? buf[--len] : 0;
@@
-517,7
+523,7
@@
static void log_formatted(enum logcode code, const char *format, const char *op,
break;
case 'M':
n = c = timestring(file->modtime);
break;
case 'M':
n = c = timestring(file->modtime);
- while ((c = strchr(
p
, ' ')) != NULL)
+ while ((c = strchr(
c
, ' ')) != NULL)
*c = '-';
break;
case 'B':
*c = '-';
break;
case 'B':