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
Quick list of things to do.
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
788225f
..
61a8bd0
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-87,50
+87,56
@@
void set_error_fd(int fd)
/* this is the underlying (unformatted) rsync debugging function. Call
it with FINFO, FERROR or FLOG */
/* this is the underlying (unformatted) rsync debugging function. Call
it with FINFO, FERROR or FLOG */
-void rwrite(
int fd
, char *buf, int len)
+void rwrite(
enum logcode code
, char *buf, int len)
{
FILE *f=NULL;
extern int am_daemon;
{
FILE *f=NULL;
extern int am_daemon;
+ extern int am_server;
extern int quiet;
/* recursion can happen with certain fatal conditions */
extern int quiet;
/* recursion can happen with certain fatal conditions */
- if (quiet
!= 0 && fd
== FINFO) return;
+ if (quiet
&& code
== FINFO) return;
if (len < 0) exit_cleanup(RERR_MESSAGEIO);
buf[len] = 0;
if (len < 0) exit_cleanup(RERR_MESSAGEIO);
buf[len] = 0;
- if (
fd
== FLOG) {
+ if (
code
== FLOG) {
if (am_daemon) logit(LOG_INFO, buf);
return;
}
if (am_daemon) logit(LOG_INFO, buf);
return;
}
+ /* first try to pass it off the our sibling */
+ if (am_server && io_error_write(log_error_fd, code, buf, len)) {
+ return;
+ }
+
+ /* then try to pass it to the other end */
+ if (am_server && io_multiplex_write(code, buf, len)) {
+ return;
+ }
+
if (am_daemon) {
static int depth;
int priority = LOG_INFO;
if (am_daemon) {
static int depth;
int priority = LOG_INFO;
- if (
fd
== FERROR) priority = LOG_WARNING;
+ if (
code
== FERROR) priority = LOG_WARNING;
if (depth) return;
depth++;
log_open();
if (depth) return;
depth++;
log_open();
-
- if (!io_error_write(log_error_fd, buf, strlen(buf)) &&
- !io_multiplex_write(fd, buf, strlen(buf))) {
- logit(priority, buf);
- }
+ logit(priority, buf);
depth--;
return;
}
depth--;
return;
}
- if (
fd
== FERROR) {
+ if (
code
== FERROR) {
f = stderr;
}
f = stderr;
}
- if (fd == FINFO) {
- extern int am_server;
+ if (code == FINFO) {
if (am_server)
f = stderr;
else
if (am_server)
f = stderr;
else
@@
-146,7
+152,7
@@
void rwrite(int fd, char *buf, int len)
/* this is the rsync debugging function. Call it with FINFO, FERROR or FLOG */
/* this is the rsync debugging function. Call it with FINFO, FERROR or FLOG */
- void rprintf(
int fd
, const char *format, ...)
+ void rprintf(
enum logcode code
, const char *format, ...)
{
va_list ap;
char buf[1024];
{
va_list ap;
char buf[1024];
@@
-158,10
+164,10
@@
void rwrite(int fd, char *buf, int len)
if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
if (len > sizeof(buf)-1) exit_cleanup(RERR_MESSAGEIO);
- rwrite(
fd
, buf, len);
+ rwrite(
code
, buf, len);
}
}
-void rflush(
int fd
)
+void rflush(
enum logcode code
)
{
FILE *f = NULL;
extern int am_daemon;
{
FILE *f = NULL;
extern int am_daemon;
@@
-170,15
+176,15
@@
void rflush(int fd)
return;
}
return;
}
- if (
fd
== FLOG) {
+ if (
code
== FLOG) {
return;
}
return;
}
- if (
fd
== FERROR) {
+ if (
code
== FERROR) {
f = stderr;
}
f = stderr;
}
- if (
fd
== FINFO) {
+ if (
code
== FINFO) {
extern int am_server;
if (am_server)
f = stderr;
extern int am_server;
if (am_server)
f = stderr;
@@
-194,7
+200,7
@@
void rflush(int fd)
/* a generic logging routine for send/recv, with parameter
substitiution */
/* a generic logging routine for send/recv, with parameter
substitiution */
-static void log_formatted(
int fd
,
+static void log_formatted(
enum logcode code
,
char *format, char *op, struct file_struct *file,
struct stats *initial_stats)
{
char *format, char *op, struct file_struct *file,
struct stats *initial_stats)
{
@@
-284,7
+290,7
@@
static void log_formatted(int fd,
s = p+l;
}
s = p+l;
}
- rprintf(
fd
,"%s\n", buf);
+ rprintf(
code
,"%s\n", buf);
}
/* log the outgoing transfer of a file */
}
/* log the outgoing transfer of a file */