X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/0b76cd63ee0eacb95285dfb5d2cac2992e1794ef..e42c9458c2f1e3a78d6d45e99741d6edb38fc0cc:/log.c

diff --git a/log.c b/log.c
index 20dc702a..8be3605a 100644
--- a/log.c
+++ b/log.c
@@ -23,6 +23,7 @@
   */
 #include "rsync.h"
 
+
 /* this is the rsync debugging function. Call it with FINFO or FERROR */
 void rprintf(int fd, const char *format, ...)
 {
@@ -31,38 +32,46 @@ void rprintf(int fd, const char *format, ...)
 	int len;
 	FILE *f=NULL;
 	extern int am_daemon;
-	
-	if (am_daemon) {
-		static FILE *logf;
-		if (!logf) logf = fopen(RSYNCD_LOG, "a");
-		f = logf;
-		if (!f) return;
-	}
 
 	va_start(ap, format);
+	len = vslprintf(buf, sizeof(buf)-1, format, ap);
+	va_end(ap);
+
+	if (len < 0) exit_cleanup(1);
 
-#if HAVE_VSNPRINTF
-	len = vsnprintf(buf, sizeof(buf)-1, format, ap);
+	if (len > sizeof(buf)-1) exit_cleanup(1);
+
+	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
-	len = vsprintf(buf, format, ap);
+			openlog("rsyncd", LOG_PID);
 #endif
-	va_end(ap);
+		}
+		
+		syslog(priority, "%s", buf);
+		return;
+	}
 
-	if (len < 0) exit_cleanup(1);
+	if (fd == FERROR) {
+		f = stderr;
+	} 
 
-	if (!am_daemon) {		
-		if (fd == FERROR) {
+	if (fd == FINFO) {
+		extern int am_server;
+		if (am_server) 
 			f = stderr;
-		} 
-
-		if (fd == FINFO) {
-			extern int am_server;
-			if (am_server) 
-				f = stderr;
-			else
-				f = stdout;
-		} 
-	}
+		else
+			f = stdout;
+	} 
 
 	if (!f) exit_cleanup(1);