From 2d65a22caf6157e3a4759e5e17cb2bbd1d5934a9 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 18 Aug 2011 18:18:38 +0000
Subject: [PATCH] fix StrHtmlEcmaEscAppend, StrECMAEscAppend

  - StrHtmlEcmaEscAppend(): reimplement 'nbsp' - handling
  - StrECMAEscAppend(): copy over required stuff from StrHtmlEcmaEscAppend()
---
 libcitadel/lib/stringbuf.c | 83 +++++++++++++++++++++++++++++++-------
 1 file changed, 68 insertions(+), 15 deletions(-)

diff --git a/libcitadel/lib/stringbuf.c b/libcitadel/lib/stringbuf.c
index 18d9870b5..3a9ccf58e 100644
--- a/libcitadel/lib/stringbuf.c
+++ b/libcitadel/lib/stringbuf.c
@@ -2144,31 +2144,83 @@ long StrECMAEscAppend(StrBuf *Target, const StrBuf *Source, const char *PlainIn)
 		return -1;
 
 	bptr = Target->buf + Target->BufUsed;
-	eptr = Target->buf + Target->BufSize - 3; /* our biggest unit to put in...  */
+	eptr = Target->buf + Target->BufSize - 7; /* our biggest unit to put in...  */
 
 	while (aptr < eiptr){
 		if(bptr >= eptr) {
 			IncreaseBuf(Target, 1, -1);
-			eptr = Target->buf + Target->BufSize - 3; 
+			eptr = Target->buf + Target->BufSize - 7; /* our biggest unit to put in...  */
 			bptr = Target->buf + Target->BufUsed;
 		}
-		if (*aptr == '"') {
+		switch (*aptr) {
+		case '\n':
+			memcpy(bptr, HKEY("\\n"));
+			bptr += 2;
+			Target->BufUsed += 2;				
+			break;
+		case '\r':
+			memcpy(bptr, HKEY("\\r"));
+			bptr += 2;
+			Target->BufUsed += 2;
+			break;
+		case '"':
 			*bptr = '\\';
 			bptr ++;
 			*bptr = '"';
 			bptr ++;
 			Target->BufUsed += 2;
-		} else if (*aptr == '\\') {
+			break;
+		case '\\':
+			if ((*(aptr + 1) == 'u') &&
+			    isxdigit(*(aptr + 2)) &&
+			    isxdigit(*(aptr + 3)) &&
+			    isxdigit(*(aptr + 4)) &&
+			    isxdigit(*(aptr + 5)))
+			{ /* oh, a unicode escaper. let it pass through. */
+				memcpy(bptr, aptr, 6);
+				aptr += 5;
+				bptr +=6;
+				Target->BufUsed += 6;
+			}
+			else 
+			{
+				*bptr = '\\';
+				bptr ++;
+				*bptr = '\\';
+				bptr ++;
+				Target->BufUsed += 2;
+			}
+			break;
+		case '\b':
 			*bptr = '\\';
 			bptr ++;
+			*bptr = 'b';
+			bptr ++;
+			Target->BufUsed += 2;
+			break;
+		case '\f':
 			*bptr = '\\';
 			bptr ++;
+			*bptr = 'f';
+			bptr ++;
 			Target->BufUsed += 2;
-		}
-		else{
-			*bptr = *aptr;
-			bptr++;
-			Target->BufUsed ++;
+			break;
+		case '\t':
+			*bptr = '\\';
+			bptr ++;
+			*bptr = 't';
+			bptr ++;
+			Target->BufUsed += 2;
+			break;
+		default:
+			IsUtf8Sequence =  Ctdl_GetUtf8SequenceLength(aptr, eiptr);
+			while (IsUtf8Sequence > 0){
+				*bptr = *aptr;
+				Target->BufUsed ++;
+				if (--IsUtf8Sequence)
+					aptr++;
+				bptr++;
+			}
 		}
 		aptr ++;
 	}
@@ -2248,12 +2300,6 @@ long StrHtmlEcmaEscAppend(StrBuf *Target, const StrBuf *Source, const char *Plai
 			bptr ++;
 			Target->BufUsed ++;
 			break;
-		case  32:
-//) && (nbsp == 1)) {
-			memcpy(bptr, HKEY("&nbsp;"));
-			bptr += 6;
-			Target->BufUsed += 6;
-			break;
 		case '\n':
 			switch (nolinebreaks) {
 			case 1:
@@ -2333,6 +2379,13 @@ long StrHtmlEcmaEscAppend(StrBuf *Target, const StrBuf *Source, const char *Plai
 			bptr ++;
 			Target->BufUsed += 2;
 			break;
+		case  32:
+			if (nbsp == 1) {
+				memcpy(bptr, HKEY("&nbsp;"));
+				bptr += 6;
+				Target->BufUsed += 6;
+				break;
+			}
 		default:
 			IsUtf8Sequence =  Ctdl_GetUtf8SequenceLength(aptr, eiptr);
 			while (IsUtf8Sequence > 0){
-- 
2.30.2