Prevent stray newlines

Signed-off-by: Joern Engel <joern@logfs.org>

1 files changed, 7 insertions, 2 deletions

diff --git a/cancd.c b/cancd.c
index 263ba06..4d79a3d 100644
--- a/cancd.c
+++ b/cancd.c
@@ -306,8 +306,13 @@ static int write_formatted(int fd, char *buf, int count)
 	time_t now = time(NULL);
 	struct tm *tm = localtime(&now);
 
-	count += 1; /* add terminating NUL */
-	while (count) {
+	/*
+	 * buf must be NUL-terminated.  We add 1 to count for the terminating
+	 * byte.  But we also abort the loop of only the terminating byte
+	 * remains, so we don't print stray newlines
+	 */
+	count += 1;
+	while (count > 1) {
 		end = strchrnul(buf, 0xa);
 		*end = 0xa;
 		len = end - buf + 1;