# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1050514405 0
# Node ID 5736055629cbd02f5c5b03b2089f24602e9f1456
# Parent  8c71c0727a1c419cd7ee98430541c96fe42aae90
[gaim-migrate @ 5505]
this is better (lets you use an apostrophe without things croaking)

committer: Tailor Script <tailor@pidgin.im>

diff -r 8c71c0727a1c -r 5736055629cb src/html.c
--- a/src/html.c	Wed Apr 16 01:28:01 2003 +0000
+++ b/src/html.c	Wed Apr 16 17:33:25 2003 +0000
@@ -329,9 +329,26 @@
 };
 
 #define ALLOW_TAG_ALT(x, y) if(!g_ascii_strncasecmp(c, "<" x " ", strlen("<" x " "))) { \
-						char *o = strchr(c+1, '<'); \
-						char *p = strchr(c+1, '>'); \
-						if(p && (!o || p < o)) { \
+						const char *o = c + 1; \
+						const char *p = NULL, *q = NULL, *r = NULL; \
+						while(*o) { \
+							if(!q && (*o == '\"' || *o == '\'') ) { \
+								q = o; \
+							} else if(q) { \
+								if(*o == *q) { \
+									q = NULL; \
+								} else if(*c == '\\') { \
+									o++; \
+								} \
+							} else if(*o == '<') { \
+								r = o; \
+							} else if(*o == '>') { \
+								p = o; \
+								break; \
+							} \
+							o++; \
+						} \
+						if(p && !r) { \
 							if(*(p-1) != '/') { \
 								struct gaim_parse_tag *pt = g_new0(struct gaim_parse_tag, 1); \
 								pt->src_tag = x; \
@@ -371,25 +388,9 @@
 	GString *xhtml = g_string_new("");
 	GString *plain = g_string_new("");
 	GList *tags = NULL, *tag;
-	const char *q = NULL, *c = html;
+	const char *c = html;
 	while(*c) {
-		if(!q && (*c == '\"' || *c == '\'')) {
-			q = c;
-			xhtml = g_string_append_c(xhtml, *c);
-			plain = g_string_append_c(plain, *c);
-			c++;
-		} else if(q) {
-			if(*c == *q) {
-				q = NULL;
-			} else if(*c == '\\') {
-				xhtml = g_string_append_c(xhtml, *c);
-				plain = g_string_append_c(plain, *c);
-				c++;
-			}
-			xhtml = g_string_append_c(xhtml, *c);
-			plain = g_string_append_c(plain, *c);
-			c++;
-		} else if(*c == '<') {
+		if(*c == '<') {
 			if(*(c+1) == '/') { /* closing tag */
 				tag = tags;
 				while(tag) {