doc updates

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 71eb234..b727a53 100644 (file)
--- a/log.c
+++ b/log.c
@@ -23,15 +23,32 @@
   */
 #include "rsync.h"
 
+static FILE *logfile;
+
+static void logit(int priority, char *buf)
+{
+       if (logfile) {
+               fprintf(logfile,"%s", buf);
+               fflush(logfile);
+       } else {
+               syslog(priority, "%s", buf);
+       }
+}
 
 void log_open(void)
 {
        static int initialised;
        int options = LOG_PID;
+       time_t t;
 
        if (initialised) return;
        initialised = 1;
 
+       if (lp_log_file()) {
+               logfile = fopen(lp_log_file(), "a");
+               return;
+       }
+
 #ifdef LOG_NDELAY
        options |= LOG_NDELAY;
 #endif
@@ -43,8 +60,14 @@ void log_open(void)
 #endif
 
 #ifndef LOG_NDELAY
-       syslog(LOG_INFO,"rsyncd started\n");
+       logit(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);
 }
                
 
@@ -79,7 +102,7 @@ void rprintf(int fd, const char *format, ...)
 
                log_open();
                if (!io_multiplex_write(fd, buf, strlen(buf))) {
-                       syslog(priority, "%s", buf);
+                       logit(priority, buf);
                }
 
                depth--;
@@ -102,6 +125,8 @@ void rprintf(int fd, const char *format, ...)
 
        if (fwrite(buf, len, 1, f) != 1) exit_cleanup(1);
 
+       if (buf[len-1] == '\r' || buf[len-1] == '\n') fflush(f);
+
        depth--;
 }