From d8f0863a2a6b31cb017da9b2da4d73e8f0d9a07a Mon Sep 17 00:00:00 2001
From: Brian Pow <brianpow@gmail.com>
Date: Sun, 25 Feb 2018 00:39:05 +0800
Subject: [PATCH] PrintAndLogEx supports multi-line messages

---
 client/ui.c | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/client/ui.c b/client/ui.c
index 0d176862c..b640c73f9 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -29,34 +29,49 @@ void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
 		return;
 	
 	char buffer[MAX_PRINT_BUFFER] = {0};
+	char buffer2[MAX_PRINT_BUFFER] = {0};
+	char prefix[20] = {0};
+	char *token = NULL;
 	int size = 0;
 						//   {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG}
-	static char *prefix[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
+	static char *prefixes[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
 	
 	switch( level ) {
 		case FAILED:
-			size = strlen( _RED_([-] ) );
-			strncpy(buffer,_RED_([-] ), size);
+			strncpy(prefix,_RED_([-] ), sizeof(prefix)-1);
 			break;
 		case DEBUG:
-			size = strlen( _BLUE_([#] ) );
-			strncpy(buffer,_BLUE_([#] ), size);			
+			strncpy(prefix,_BLUE_([#] ), sizeof(prefix)-1);			
 			break;
 		case SUCCESS: 
-			size = strlen( _GREEN_([+] ) );
-			strncpy(buffer,_GREEN_([+] ), size);
+			strncpy(prefix,_GREEN_([+] ), sizeof(prefix)-1);
 			break;
 		default:
-			size = strlen(prefix[level]);
-			strncpy(buffer, prefix[level], sizeof buffer);
+			strncpy(prefix, prefixes[level], sizeof(buffer)-1);
 			break;
 	}
 	
 	va_list args;
-	va_start(args,fmt);
-	vsnprintf(buffer + size, sizeof(buffer) - size, fmt, args);
+	va_start(args, fmt);
+	vsnprintf(buffer, sizeof(buffer), fmt, args);
 	va_end(args);
-	PrintAndLog(buffer);
+
+	if(strchr(buffer, '\n'))
+	{
+		token = strtok(buffer,"\n");
+		while (token != NULL)
+		{
+			size=strlen(buffer2);
+			if(strlen(token))
+				snprintf(buffer2+size, sizeof(buffer2)-size, "%s%s\n", prefix, token);
+			else
+				snprintf(buffer2+size, sizeof(buffer2)-size, "\n");
+			token = strtok(NULL, "\n");
+		}
+		PrintAndLog(buffer2);
+	}
+	else
+		PrintAndLog(buffer);
 }
 
 void PrintAndLog(char *fmt, ...) {