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
Decided I don't like "set -x".
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
d4cce69
..
f2df600
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-218,18
+218,21
@@
void rwrite(enum logcode code, char *buf, int len)
int trailing_CR_or_NL;
FILE *f = NULL;
int trailing_CR_or_NL;
FILE *f = NULL;
- if (quiet && code == FINFO)
- return;
-
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
+ if (quiet && code == FINFO)
+ return;
+
if (am_server && msg_fd_out >= 0) {
/* Pass the message to our sibling. */
send_msg((enum msgcode)code, buf, len);
return;
}
if (am_server && msg_fd_out >= 0) {
/* Pass the message to our sibling. */
send_msg((enum msgcode)code, buf, len);
return;
}
+ if (code == FSOCKERR) /* This gets simplified for a non-sibling. */
+ code = FERROR;
+
if (code == FCLIENT)
code = FINFO;
else if (am_daemon) {
if (code == FCLIENT)
code = FINFO;
else if (am_daemon) {
@@
-536,6
+539,7
@@
static void log_formatted(enum logcode code, char *format, char *op,
: !(iflags & ITEM_TRANSFER) ? '.'
: !local_server && *op == 's' ? '<' : '>';
n[1] = S_ISDIR(file->mode) ? 'd'
: !(iflags & ITEM_TRANSFER) ? '.'
: !local_server && *op == 's' ? '<' : '>';
n[1] = S_ISDIR(file->mode) ? 'd'
+ : IS_SPECIAL(file->mode) ? 'S'
: IS_DEVICE(file->mode) ? 'D'
: S_ISLNK(file->mode) ? 'L' : 'f';
n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';
: IS_DEVICE(file->mode) ? 'D'
: S_ISLNK(file->mode) ? 'L' : 'f';
n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';