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
Include the array-size in array externs so that IBM's code-checker
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
8f8f049
..
6f9a47e
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-36,6
+36,7
@@
extern int allow_8bit_chars;
extern int protocol_version;
extern int always_checksum;
extern int preserve_times;
extern int protocol_version;
extern int always_checksum;
extern int preserve_times;
+extern int msgs2stderr;
extern int uid_ndx;
extern int gid_ndx;
extern int stdout_format_has_i;
extern int uid_ndx;
extern int gid_ndx;
extern int stdout_format_has_i;
@@
-54,10
+55,10
@@
extern iconv_t ic_chck;
#ifdef ICONV_OPTION
extern iconv_t ic_send, ic_recv;
#endif
#ifdef ICONV_OPTION
extern iconv_t ic_send, ic_recv;
#endif
-extern char curr_dir[];
+extern char curr_dir[
MAXPATHLEN
];
extern char *module_dir;
extern unsigned int module_dirlen;
extern char *module_dir;
extern unsigned int module_dirlen;
-extern char sender_file_sum[];
+extern char sender_file_sum[
MAX_DIGEST_LEN
];
static int log_initialised;
static int logfile_was_closed;
static int log_initialised;
static int logfile_was_closed;
@@
-257,6
+258,9
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
if (len < 0)
exit_cleanup(RERR_MESSAGEIO);
+ if (msgs2stderr > 0 && code != FLOG)
+ goto output_msg;
+
if (am_server && msg_fd_out >= 0) {
assert(!is_utf8);
/* Pass the message to our sibling. */
if (am_server && msg_fd_out >= 0) {
assert(!is_utf8);
/* Pass the message to our sibling. */
@@
-306,8
+310,10
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
/* TODO: can we send the error to the user somehow? */
return;
}
/* TODO: can we send the error to the user somehow? */
return;
}
+ msgs2stderr = -1;
}
}
+output_msg:
switch (code) {
case FERROR_XFER:
got_xfer_error = 1;
switch (code) {
case FERROR_XFER:
got_xfer_error = 1;
@@
-317,7
+323,8
@@
void rwrite(enum logcode code, const char *buf, int len, int is_utf8)
f = stderr;
break;
case FINFO:
f = stderr;
break;
case FINFO:
- f = am_server ? stderr : stdout;
+ case FCLIENT:
+ f = msgs2stderr ? stderr : stdout;
break;
default:
exit_cleanup(RERR_MESSAGEIO);
break;
default:
exit_cleanup(RERR_MESSAGEIO);