X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f855d1a309f38301bcd8898e9fbc5c70133d1f98..79b34efe9229265da3e0b0995e8828e29c4d5dd9:/log.c

diff --git a/log.c b/log.c
index 068b5a93..71eb234d 100644
--- a/log.c
+++ b/log.c
@@ -23,6 +23,31 @@
   */
 #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, ...)
 {
@@ -31,15 +56,15 @@ void rprintf(int fd, const char *format, ...)
 	int len;
 	FILE *f=NULL;
 	extern int am_daemon;
+	/* 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
-	vsprintf(buf, format, ap);
-	len = strlen(buf);
-#endif
+	depth++;
+
+	va_start(ap, format);
+	len = vslprintf(buf, sizeof(buf)-1, format, ap);
 	va_end(ap);
 
 	if (len < 0) exit_cleanup(1);
@@ -49,20 +74,15 @@ void rprintf(int fd, const char *format, ...)
 	buf[len] = 0;
 
 	if (am_daemon) {
-		static int initialised;
 		int priority = LOG_INFO;
 		if (fd == FERROR) priority = LOG_WARNING;
 
-		if (!initialised) {
-			initialised = 1;
-#ifdef LOG_DAEMON
-			openlog("rsyncd", LOG_PID, lp_syslog_facility());
-#else
-			openlog("rsyncd", LOG_PID);
-#endif
+		log_open();
+		if (!io_multiplex_write(fd, buf, strlen(buf))) {
+			syslog(priority, "%s", buf);
 		}
-		
-		syslog(priority, "%s", buf);
+
+		depth--;
 		return;
 	}
 
@@ -81,6 +101,8 @@ void rprintf(int fd, const char *format, ...)
 	if (!f) exit_cleanup(1);
 
 	if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
+
+	depth--;
 }
 
 void rflush(int fd)