if f_in == f_out then don't close one of them

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 20dc702..90b287e 100644 (file)
--- 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,39 +56,38 @@ 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);
-
-#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 (!am_daemon) {               
-               if (fd == FERROR) {
-                       f = stderr;
-               } 
-
-               if (fd == FINFO) {
-                       extern int am_server;
-                       if (am_server) 
-                               f = stderr;
-                       else
-                               f = stdout;
-               } 
+       if (len > sizeof(buf)-1) exit_cleanup(1);
+
+       buf[len] = 0;
+
+       if (am_daemon) {
+               int priority = LOG_INFO;
+               if (fd == FERROR) priority = LOG_WARNING;
+
+               log_open();
+               syslog(priority, "%s", buf);
+               return;
        }
 
+       if (fd == FERROR) {
+               f = stderr;
+       } 
+
+       if (fd == FINFO) {
+               extern int am_server;
+               if (am_server) 
+                       f = stderr;
+               else
+                       f = stdout;
+       } 
+
        if (!f) exit_cleanup(1);
 
        if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);