X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=support%2Fnfs%2Fxlog.c;h=b06d12eb23edc62f2dc34c2599f7c4007f7a9bcb;hb=e7c106f6008ab11558e595585fb72872b21ae624;hp=c4e7ea1d4d6a4cbb51e544d999c86c998ef972fa;hpb=1486c0972d17f2e213b1005e0ef1dfd91f4a155a;p=nfs-utils.git

diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c
index c4e7ea1..b06d12e 100644
--- a/support/nfs/xlog.c
+++ b/support/nfs/xlog.c
@@ -142,13 +142,11 @@ xlog(int kind, const char *fmt, ...)
 		return;
 
 	va_start(args, fmt);
-	vsnprintf(buff, sizeof (buff) - 2, fmt, args);
+	vsnprintf(buff, sizeof (buff), fmt, args);
 	va_end(args);
-	buff[sizeof (buff) - 2] = 0;
 
-	if ((n = strlen(buff)) > 0 && buff[n-1] != '\n') {
-		buff[n++] = '\n'; buff[n++] = '\0';
-	}
+	if ((n = strlen(buff)) > 0 && buff[n-1] == '\n')
+		buff[--n] = '\0';
 
 	switch (kind) {
 	case L_FATAL:
@@ -180,7 +178,7 @@ xlog(int kind, const char *fmt, ...)
 					tm->tm_year, tm->tm_hour, tm->tm_min,
 					buff);
 #else
-			fprintf(log_fp, "%s: %s", log_name, buff);
+			fprintf(log_fp, "%s: %s\n", log_name, buff);
 #endif
 		}
 	}