wanr people who use path names to rsync ::

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index ebf796b..0497521 100644 (file)
--- a/log.c
+++ b/log.c
@@ -23,6 +23,38 @@
   */
 #include "rsync.h"
 
+
+void log_open(void)
+{
+       static int initialised;
+       int options = LOG_PID;
+       time_t t;
+
+       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 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);
+}
+               
+
 /* this is the rsync debugging function. Call it with FINFO or FERROR */
 void rprintf(int fd, const char *format, ...)
 {
@@ -31,14 +63,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
-       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);
@@ -48,20 +81,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, LOG_DAEMON);
-#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;
        }
 
@@ -80,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 (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+
+       depth--;
 }
 
 void rflush(int fd)