From f51fb4696c63d368e8444fb9baa9126caf7b0d4c Mon Sep 17 00:00:00 2001
From: Michael Lotz <mmlr@mlotz.ch>
Date: Mon, 3 Apr 2006 20:48:30 +0000
Subject: [PATCH] Corrected the repeat checks (did not compare the right
 buffers) and added a length argument to debug_puts() to safe the strlen in
 the syslog case. Also removed some leftover.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16991 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 headers/private/kernel/debug.h                |  2 +-
 src/add-ons/kernel/drivers/common/dprintf.cpp |  4 +-
 src/system/kernel/debug/debug.c               | 43 ++++++++++---------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/headers/private/kernel/debug.h b/headers/private/kernel/debug.h
index 3a7c3aa199..28cf902250 100644
--- a/headers/private/kernel/debug.h
+++ b/headers/private/kernel/debug.h
@@ -32,7 +32,7 @@ extern status_t debug_init(struct kernel_args *args);
 extern status_t	debug_init_post_vm(struct kernel_args *args);
 extern status_t	debug_init_post_modules(struct kernel_args *args);
 extern void debug_early_boot_message(const char *string);
-extern void debug_puts(const char *s);
+extern void debug_puts(const char *s, int32 length);
 extern bool debug_debugger_running(void);
 extern void debug_stop_screen_debug_output(void);
 
diff --git a/src/add-ons/kernel/drivers/common/dprintf.cpp b/src/add-ons/kernel/drivers/common/dprintf.cpp
index 393bef856d..f68ac3caef 100644
--- a/src/add-ons/kernel/drivers/common/dprintf.cpp
+++ b/src/add-ons/kernel/drivers/common/dprintf.cpp
@@ -88,14 +88,14 @@ dprintf_write(void *cookie, off_t pos, const void *buffer, size_t *_length)
 				memcpy(localBuffer, str, chunkSize);
 				localBuffer[chunkSize] = '\0';
 
-				debug_puts(localBuffer);
+				debug_puts(localBuffer, chunkSize);
 
 				str += chunkSize;
 				bytesLeft -= chunkSize;
 			}
 		} else {
 			// null-terminated chunk -- just write it
-			debug_puts(str);
+			debug_puts(str, chunkSize);
 
 			str += chunkSize + 1;
 			bytesLeft -= chunkSize + 1;
diff --git a/src/system/kernel/debug/debug.c b/src/system/kernel/debug/debug.c
index 1623b8ec8f..8144d6a243 100644
--- a/src/system/kernel/debug/debug.c
+++ b/src/system/kernel/debug/debug.c
@@ -579,32 +579,30 @@ debug_debugger_running(void)
 
 
 void
-debug_puts(const char *string)
+debug_puts(const char *string, int32 length)
 {
-	cpu_status state;
-	int64 newHash;
-
-	// we only need the length for syslog
-	size_t length = 0;
-	if (sSyslogOutputEnabled)
-		length = strlen(string);
-
-	state = disable_interrupts();
+	cpu_status state = disable_interrupts();
 	acquire_spinlock(&sSpinlock);
 
-	if (strncmp(sOutputBuffer, sLastOutputBuffer, OUTPUT_BUFFER_SIZE) == 0) {
+	if (length >= OUTPUT_BUFFER_SIZE)
+		length = OUTPUT_BUFFER_SIZE - 1;
+
+	if (strncmp(string, sLastOutputBuffer, length) == 0
+		&& length > 0 && string[length - 1] == '\n') {
 		sMessageRepeatCount++;
 		sMessageRepeatTime = system_time();
 	} else {
 		flush_pending_repeats();
 		kputs(string);
-		memcpy(sLastOutputBuffer, sOutputBuffer, OUTPUT_BUFFER_SIZE);
-	}
 
-	// kputs() doesn't output to syslog (as it's only used
-	// from the kernel debugger elsewhere)
-	if (sSyslogOutputEnabled)
-		syslog_write(sOutputBuffer, length);
+		// kputs() doesn't output to syslog (as it's only used
+		// from the kernel debugger elsewhere)
+		if (sSyslogOutputEnabled)
+			syslog_write(string, length);
+
+		memcpy(sLastOutputBuffer, string, length);
+		sLastOutputBuffer[length] = 0;
+	}
 
 	release_spinlock(&sSpinlock);
 	restore_interrupts(state);
@@ -866,7 +864,6 @@ dprintf(const char *format, ...)
 {
 	cpu_status state;
 	va_list args;
-	int64 newHash;
 	int32 length;
 
 	if (!sSerialDebugEnabled && !sSyslogOutputEnabled && !sBlueScreenEnabled)
@@ -883,7 +880,11 @@ dprintf(const char *format, ...)
 	length = vsnprintf(sOutputBuffer, OUTPUT_BUFFER_SIZE, format, args);
 	va_end(args);
 
-	if (strncmp(sOutputBuffer, sLastOutputBuffer, length) == 0) {
+	if (length >= OUTPUT_BUFFER_SIZE)
+		length = OUTPUT_BUFFER_SIZE - 1;
+
+	if (strncmp(sOutputBuffer, sLastOutputBuffer, length) == 0
+		&& length > 0 && sOutputBuffer[length - 1] == '\n') {
 		sMessageRepeatCount++;
 		sMessageRepeatTime = system_time();
 	} else {
@@ -897,6 +898,7 @@ dprintf(const char *format, ...)
 			blue_screen_puts(sOutputBuffer);
 
 		memcpy(sLastOutputBuffer, sOutputBuffer, length);
+		sLastOutputBuffer[length] = 0;
 	}
 
 	release_spinlock(&sSpinlock);
@@ -919,6 +921,7 @@ kprintf(const char *format, ...)
 	vsnprintf(sOutputBuffer, OUTPUT_BUFFER_SIZE, format, args);
 	va_end(args);
 
+	flush_pending_repeats();
 	kputs(sOutputBuffer);
 }
 
@@ -941,7 +944,7 @@ _user_debug_output(const char *userString)
 
 	do {
 		length = user_strlcpy(string, userString, sizeof(string));
-		debug_puts(string);
+		debug_puts(string, length);
 		userString += sizeof(string) - 1;
 	} while (length >= (ssize_t)sizeof(string));
 }