move the time init before the logfile opening.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index a4f06f1..30aca47 100644 (file)
--- a/log.c
+++ b/log.c
@@ -69,6 +69,13 @@ void log_open(void)
        if (initialised) return;
        initialised = 1;
 
+       /* 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);
+
+       /* optionally use a log file instead of syslog */
        logf = lp_log_file();
        if (logf && *logf) {
                logfile = fopen(logf, "a");
@@ -88,12 +95,6 @@ void log_open(void)
 #ifndef LOG_NDELAY
        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);
 }
                
 
@@ -106,11 +107,6 @@ void log_open(void)
        FILE *f=NULL;
        extern int am_daemon;
        /* recursion can happen with certain fatal conditions */
-       static int depth;
-
-       if (depth) return;
-
-       depth++;
 
        va_start(ap, format);
        len = vslprintf(buf, sizeof(buf)-1, format, ap);
@@ -124,14 +120,18 @@ void log_open(void)
 
        if (fd == FLOG) {
                if (am_daemon) logit(LOG_INFO, buf);
-               depth--;
                return;
        }
 
        if (am_daemon) {
+               static int depth;
                int priority = LOG_INFO;
                if (fd == FERROR) priority = LOG_WARNING;
 
+               if (depth) return;
+
+               depth++;
+
                log_open();
                if (!io_multiplex_write(fd, buf, strlen(buf))) {
                        logit(priority, buf);
@@ -158,8 +158,6 @@ void log_open(void)
        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)
@@ -198,6 +196,7 @@ void rflush(int fd)
 static void log_formatted(char *op, struct file_struct *file)
 {
        extern int module_id;
+       extern char *auth_user;
        char buf[1024];
        char *p, *s, *n;
        char buf2[100];
@@ -225,6 +224,9 @@ static void log_formatted(char *op, struct file_struct *file)
                        break;
                case 'o': n = op; break;
                case 'f': n = f_name(file); break;
+               case 'm': n = lp_name(module_id); break;
+               case 'P': n = lp_path(module_id); break;
+               case 'u': n = auth_user; break;
                }
 
                if (!n) continue;
@@ -238,7 +240,7 @@ static void log_formatted(char *op, struct file_struct *file)
                }
 
                if (l != 2) {
-                       memmove(s+(l-1), s+1, strlen(s+1));
+                       memmove(s+(l-1), s+1, strlen(s+1)+1);
                }
                memcpy(p, n, l);