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
removed old "make dist" target
[rsync/rsync.git]
/
log.c
diff --git
a/log.c
b/log.c
index
90b287e
..
0497521
100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-28,6
+28,7
@@
void log_open(void)
{
static int initialised;
int options = LOG_PID;
{
static int initialised;
int options = LOG_PID;
+ time_t t;
if (initialised) return;
initialised = 1;
if (initialised) return;
initialised = 1;
@@
-45,6
+46,12
@@
void log_open(void)
#ifndef LOG_NDELAY
syslog(LOG_INFO,"rsyncd started\n");
#endif
#ifndef LOG_NDELAY
syslog(LOG_INFO,"rsyncd started\n");
#endif
+
+ /* this looks pointless, but it is needed in order for the
+ C library on some systems to fetch the timezone info
+ before the chroot */
+ t = time(NULL);
+ localtime(&t);
}
}
@@
-56,6
+63,12
@@
void rprintf(int fd, const char *format, ...)
int len;
FILE *f=NULL;
extern int am_daemon;
int len;
FILE *f=NULL;
extern int am_daemon;
+ /* recursion can happen with certain fatal conditions */
+ static int depth;
+
+ if (depth) return;
+
+ depth++;
va_start(ap, format);
len = vslprintf(buf, sizeof(buf)-1, format, ap);
va_start(ap, format);
len = vslprintf(buf, sizeof(buf)-1, format, ap);
@@
-72,7
+85,11
@@
void rprintf(int fd, const char *format, ...)
if (fd == FERROR) priority = LOG_WARNING;
log_open();
if (fd == FERROR) priority = LOG_WARNING;
log_open();
- syslog(priority, "%s", buf);
+ if (!io_multiplex_write(fd, buf, strlen(buf))) {
+ syslog(priority, "%s", buf);
+ }
+
+ depth--;
return;
}
return;
}
@@
-91,6
+108,10
@@
void rprintf(int fd, const char *format, ...)
if (!f) exit_cleanup(1);
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
if (!f) exit_cleanup(1);
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+
+ if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+
+ depth--;
}
void rflush(int fd)
}
void rflush(int fd)