From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 30 Oct 1998 02:43:10 +0000 (+0000)
Subject: get null termination right in logging
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/b24203b323c86e250054bff19274b1f466303712

get null termination right in logging
---

diff --git a/log.c b/log.c
index d1da4613..e06617ae 100644
--- 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();