added a perl script to summarise the rsyncd log format

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 93d7a17..d09094c 100644 (file)
--- a/log.c
+++ b/log.c
@@ -106,9 +106,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;
 
        va_start(ap, format);
        len = vslprintf(buf, sizeof(buf)-1, format, ap);
@@ -126,9 +123,12 @@ void log_open(void)
        }
 
        if (am_daemon) {
+               static int depth;
                int priority = LOG_INFO;
                if (fd == FERROR) priority = LOG_WARNING;
 
+               if (depth) return;
+
                depth++;
 
                log_open();
@@ -195,6 +195,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];
@@ -222,6 +223,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;
@@ -235,7 +239,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);