Make sure the log file is always opened before root privileges (if any)

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 8619e4d..c19ebe8 100644 (file)
--- a/log.c
+++ b/log.c
@@ -23,12 +23,15 @@
   */
 #include "rsync.h"
 
+static char *logfname;
 static FILE *logfile;
 static int log_error_fd = -1;
 
 static void logit(int priority, char *buf)
 {
-       if (logfile) {
+       if (logfname) {
+               if (!logfile)
+                       log_open();
                fprintf(logfile,"%s [%d] %s", 
                        timestring(time(NULL)), (int)getpid(), buf);
                fflush(logfile);
@@ -37,12 +40,11 @@ static void logit(int priority, char *buf)
        }
 }
 
-void log_open(void)
+void log_init(void)
 {
        static int initialised;
        int options = LOG_PID;
        time_t t;
-       char *logf;
 
        if (initialised) return;
        initialised = 1;
@@ -54,13 +56,13 @@ void log_open(void)
        localtime(&t);
 
        /* optionally use a log file instead of syslog */
-       logf = lp_log_file();
-       if (logf && *logf) {
-               extern int orig_umask;
-               int old_umask = umask(022 | orig_umask);
-               logfile = fopen(logf, "a");
-               umask(old_umask);
-               return;
+       logfname = lp_log_file();
+       if (logfname) {
+               if (*logfname) {
+                       log_open();
+                       return;
+               }
+               logfname = NULL;
        }
 
 #ifdef LOG_NDELAY
@@ -78,6 +80,24 @@ void log_open(void)
 #endif
 }
 
+void log_open()
+{
+       if (logfname && !logfile) {
+               extern int orig_umask;
+               int old_umask = umask(022 | orig_umask);
+               logfile = fopen(logfname, "a");
+               umask(old_umask);
+       }
+}
+
+void log_close()
+{
+       if (logfile) {
+               fclose(logfile);
+               logfile = NULL;
+       }
+}
+
 /* setup the error file descriptor - used when we are a server
    that is receiving files */
 void set_error_fd(int fd)
@@ -91,10 +111,11 @@ void rwrite(enum logcode code, char *buf, int len)
 {
        FILE *f=NULL;
        extern int am_daemon;
+       extern int am_server;
        extern int quiet;
        /* recursion can happen with certain fatal conditions */
 
-       if (quiet != 0 && code == FINFO) return;
+       if (quiet && code == FINFO) return;
 
        if (len < 0) exit_cleanup(RERR_MESSAGEIO);
 
@@ -105,7 +126,15 @@ void rwrite(enum logcode code, char *buf, int len)
                return;
        }
 
-       if (io_error_write(log_error_fd, code, buf, strlen(buf))) return;
+       /* first try to pass it off the our sibling */
+       if (am_server && io_error_write(log_error_fd, code, buf, len)) {
+               return;
+       }
+
+       /* then try to pass it to the other end */
+       if (am_server && io_multiplex_write(code, buf, len)) {
+               return;
+       }
 
        if (am_daemon) {
                static int depth;
@@ -116,10 +145,8 @@ void rwrite(enum logcode code, char *buf, int len)
 
                depth++;
 
-               log_open();
-               if (!io_multiplex_write(code, buf, strlen(buf))) {
-                       logit(priority, buf);
-               }
+               log_init();
+               logit(priority, buf);
 
                depth--;
                return;
@@ -130,7 +157,6 @@ void rwrite(enum logcode code, char *buf, int len)
        } 
 
        if (code == FINFO) {
-               extern int am_server;
                if (am_server) 
                        f = stderr;
                else
@@ -194,7 +220,7 @@ void rflush(enum logcode code)
 
 /* a generic logging routine for send/recv, with parameter
    substitiution */
-static void log_formatted(int fd,
+static void log_formatted(enum logcode code,
                          char *format, char *op, struct file_struct *file,
                          struct stats *initial_stats)
 {
@@ -284,7 +310,7 @@ static void log_formatted(int fd,
                s = p+l;
        }
 
-       rprintf(fd,"%s\n", buf);
+       rprintf(code,"%s\n", buf);
 }
 
 /* log the outgoing transfer of a file */