*/
#include "rsync.h"
+
+void log_open(void)
+{
+ static int initialised;
+ int options = LOG_PID;
+
+ if (initialised) return;
+ initialised = 1;
+
+#ifdef LOG_NDELAY
+ options |= LOG_NDELAY;
+#endif
+
+#ifdef LOG_DAEMON
+ openlog("rsyncd", options, lp_syslog_facility());
+#else
+ openlog("rsyncd", options);
+#endif
+
+#ifndef LOG_NDELAY
+ syslog(LOG_INFO,"rsyncd started\n");
+#endif
+}
+
+
/* this is the rsync debugging function. Call it with FINFO or FERROR */
void rprintf(int fd, const char *format, ...)
{
int len;
FILE *f=NULL;
extern int am_daemon;
-
- if (am_daemon) {
-#ifdef LOG_DAEMON
- openlog("rsyncd", LOG_PID, LOG_DAEMON);
-#else /* for old systems that have no facility codes. */
- openlog("rsyncd", LOG_PID);
-#endif
- }
+ /* recursion can happen with certain fatal conditions */
+ static int depth;
- va_start(ap, format);
+ if (depth) return;
-#if HAVE_VSNPRINTF
- len = vsnprintf(buf, sizeof(buf)-1, format, ap);
-#else
- len = vsprintf(buf, format, ap);
-#endif
+ depth++;
+
+ va_start(ap, format);
+ len = vslprintf(buf, sizeof(buf)-1, format, ap);
va_end(ap);
if (len < 0) exit_cleanup(1);
+ if (len > sizeof(buf)-1) exit_cleanup(1);
+
buf[len] = 0;
if (am_daemon) {
int priority = LOG_INFO;
if (fd == FERROR) priority = LOG_WARNING;
-
- syslog(priority, "%s", buf);
+
+ log_open();
+ if (!io_multiplex_write(fd, buf, strlen(buf))) {
+ syslog(priority, "%s", buf);
+ }
+
+ depth--;
return;
}
if (!f) exit_cleanup(1);
if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+
+ depth--;
}
void rflush(int fd)