X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e08bfe1248d9640e77544fe7df50573c6e8843b3..2c51d5deec879ab7aade039139e9d3a4d5643656:/log.c

diff --git a/log.c b/log.c
index a4f06f16..d09094c6 100644
--- a/log.c
+++ b/log.c
@@ -106,11 +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;
-
-	depth++;
 
 	va_start(ap, format);
 	len = vslprintf(buf, sizeof(buf)-1, format, ap);
@@ -124,14 +119,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 +157,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 +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];
@@ -225,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;
@@ -238,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);