use strlcat() strlcpy() and slprintf() whenever possible to avoid any

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index e047d96..8be3605 100644 (file)
--- 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,31 +32,30 @@ 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
-       }
 
        va_start(ap, format);
-
-#if HAVE_VSNPRINTF
-       len = vsnprintf(buf, sizeof(buf)-1, format, ap);
-#else
-       len = vsprintf(buf, format, ap);
-#endif
+       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) {
+               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
+               }
                
                syslog(priority, "%s", buf);
                return;