From 86085de07ed717fa38152fa5d1a4ab6328d1fea4 Mon Sep 17 00:00:00 2001
From: "M. Vefa Bicakci" <bicave@superonline.com>
Date: Sun, 19 Oct 2008 03:25:00 +0200
Subject: [PATCH] Patch 1: Finalize modifications to the HTML parser

[Forward ported to 0.12 from bug 1004 attachment 498.  --KON]
---
 src/document/document.c            |  2 +-
 src/document/html/frames.c         |  2 +-
 src/document/html/parser.c         | 24 ++++++------
 src/document/html/parser/forms.c   | 60 ++++++++++++++---------------
 src/document/html/parser/general.c | 32 +++++++--------
 src/document/html/parser/link.c    | 10 ++---
 src/document/html/parser/parse.c   | 16 ++++----
 src/document/html/parser/stack.c   |  6 +--
 src/document/html/parser/table.c   | 62 +++++++++++++++---------------
 src/document/html/renderer.c       |  2 +-
 10 files changed, 108 insertions(+), 108 deletions(-)

diff --git a/src/document/document.c b/src/document/document.c
index af8c09ca..9d474b2c 100644
--- a/src/document/document.c
+++ b/src/document/document.c
@@ -187,7 +187,7 @@ find_tag(struct document *document, unsigned char *name, int namelen)
 	struct tag *tag;
 
 	foreach (tag, document->tags)
-		if (!strlcasecmp(tag->name, -1, name, namelen))
+		if (!c_strlcasecmp(tag->name, -1, name, namelen))
 			return tag->y;
 
 	return -1;
diff --git a/src/document/html/frames.c b/src/document/html/frames.c
index a06af548..3c40db7f 100644
--- a/src/document/html/frames.c
+++ b/src/document/html/frames.c
@@ -137,7 +137,7 @@ find_fd(struct session *ses, unsigned char *name,
 
 	foreachback (doc_view, ses->scrn_frames) {
 		if (doc_view->used) continue;
-		if (strcasecmp(doc_view->name, name)) continue;
+		if (c_strcasecmp(doc_view->name, name)) continue;
 
 		doc_view->used = 1;
 		doc_view->depth = depth;
diff --git a/src/document/html/parser.c b/src/document/html/parser.c
index 8db8e577..81b59091 100644
--- a/src/document/html/parser.c
+++ b/src/document/html/parser.c
@@ -88,7 +88,7 @@ get_target(struct document_options *options, unsigned char *a)
 
 	if (!v) return NULL;
 
-	if (!*v || !strcasecmp(v, "_self")) {
+	if (!*v || !c_strcasecmp(v, "_self")) {
 		mem_free_set(&v, stracpy(options->framename));
 	}
 
@@ -547,7 +547,7 @@ look_for_map(unsigned char **pos, unsigned char *eof, struct uri *uri,
 		return 1;
 	}
 
-	if (strlcasecmp(name, namelen, "MAP", 3)) return 1;
+	if (c_strlcasecmp(name, namelen, "MAP", 3)) return 1;
 
 	if (uri && uri->fragment) {
 		/* FIXME (bug 784): options->cp is the terminal charset;
@@ -555,7 +555,7 @@ look_for_map(unsigned char **pos, unsigned char *eof, struct uri *uri,
 		al = get_attr_val(attr, "name", options->cp);
 		if (!al) return 1;
 
-		if (strlcasecmp(al, -1, uri->fragment, uri->fragmentlen)) {
+		if (c_strlcasecmp(al, -1, uri->fragment, uri->fragmentlen)) {
 			mem_free(al);
 			return 1;
 		}
@@ -602,12 +602,12 @@ look_for_tag(unsigned char **pos, unsigned char *eof,
 
 	if (parse_element(*pos, eof, NULL, NULL, NULL, &pos2)) return 1;
 
-	if (strlcasecmp(name, namelen, "A", 1)
-	    && strlcasecmp(name, namelen, "/A", 2)
-	    && strlcasecmp(name, namelen, "MAP", 3)
-	    && strlcasecmp(name, namelen, "/MAP", 4)
-	    && strlcasecmp(name, namelen, "AREA", 4)
-	    && strlcasecmp(name, namelen, "/AREA", 5)) {
+	if (c_strlcasecmp(name, namelen, "A", 1)
+	    && c_strlcasecmp(name, namelen, "/A", 2)
+	    && c_strlcasecmp(name, namelen, "MAP", 3)
+	    && c_strlcasecmp(name, namelen, "/MAP", 4)
+	    && c_strlcasecmp(name, namelen, "AREA", 4)
+	    && c_strlcasecmp(name, namelen, "/AREA", 5)) {
 		*pos = pos2;
 		return 1;
 	}
@@ -644,12 +644,12 @@ look_for_link(unsigned char **pos, unsigned char *eof, struct menu_item **menu,
 		return 1;
 	}
 
-	if (!strlcasecmp(name, namelen, "A", 1)) {
+	if (!c_strlcasecmp(name, namelen, "A", 1)) {
 		while (look_for_tag(pos, eof, name, namelen, &label));
 
 		if (*pos >= eof) return 0;
 
-	} else if (!strlcasecmp(name, namelen, "AREA", 4)) {
+	} else if (!c_strlcasecmp(name, namelen, "AREA", 4)) {
 		/* FIXME (bug 784): options->cp is the terminal charset;
 		 * should use the document charset instead.  */
 		unsigned char *alt = get_attr_val(attr, "alt", options->cp);
@@ -663,7 +663,7 @@ look_for_link(unsigned char **pos, unsigned char *eof, struct menu_item **menu,
 			label = NULL;
 		}
 
-	} else if (!strlcasecmp(name, namelen, "/MAP", 4)) {
+	} else if (!c_strlcasecmp(name, namelen, "/MAP", 4)) {
 		/* This is the only successful return from here! */
 		add_to_ml(ml, (void *) *menu, (void *) NULL);
 		return 0;
diff --git a/src/document/html/parser/forms.c b/src/document/html/parser/forms.c
index 1a717a8b..c34459a1 100644
--- a/src/document/html/parser/forms.c
+++ b/src/document/html/parser/forms.c
@@ -52,7 +52,7 @@ html_form(struct html_context *html_context, unsigned char *a,
 
 	al = get_attr_val(a, "method", html_context->doc_cp);
 	if (al) {
-		if (!strcasecmp(al, "post")) {
+		if (!c_strcasecmp(al, "post")) {
 			unsigned char *enctype;
 
 			enctype  = get_attr_val(a, "enctype",
@@ -60,9 +60,9 @@ html_form(struct html_context *html_context, unsigned char *a,
 
 			form->method = FORM_METHOD_POST;
 			if (enctype) {
-				if (!strcasecmp(enctype, "multipart/form-data"))
+				if (!c_strcasecmp(enctype, "multipart/form-data"))
 					form->method = FORM_METHOD_POST_MP;
-				else if (!strcasecmp(enctype, "text/plain"))
+				else if (!c_strcasecmp(enctype, "text/plain"))
 					form->method = FORM_METHOD_POST_TEXT_PLAIN;
 				mem_free(enctype);
 			}
@@ -153,11 +153,11 @@ html_button(struct html_context *html_context, unsigned char *a,
 	al = get_attr_val(a, "type", cp);
 	if (!al) goto no_type_attr;
 
-	if (!strcasecmp(al, "button")) {
+	if (!c_strcasecmp(al, "button")) {
 		type = FC_BUTTON;
-	} else if (!strcasecmp(al, "reset")) {
+	} else if (!c_strcasecmp(al, "reset")) {
 		type = FC_RESET;
-	} else if (strcasecmp(al, "submit")) {
+	} else if (c_strcasecmp(al, "submit")) {
 		/* unknown type */
 		mem_free(al);
 		return;
@@ -273,16 +273,16 @@ html_input(struct html_context *html_context, unsigned char *a,
 
 	al = get_attr_val(a, "type", cp);
 	if (al) {
-		if (!strcasecmp(al, "text")) fc->type = FC_TEXT;
-		else if (!strcasecmp(al, "hidden")) fc->type = FC_HIDDEN;
-		else if (!strcasecmp(al, "button")) fc->type = FC_BUTTON;
-		else if (!strcasecmp(al, "checkbox")) fc->type = FC_CHECKBOX;
-		else if (!strcasecmp(al, "radio")) fc->type = FC_RADIO;
-		else if (!strcasecmp(al, "password")) fc->type = FC_PASSWORD;
-		else if (!strcasecmp(al, "submit")) fc->type = FC_SUBMIT;
-		else if (!strcasecmp(al, "reset")) fc->type = FC_RESET;
-		else if (!strcasecmp(al, "file")) fc->type = FC_FILE;
-		else if (!strcasecmp(al, "image")) fc->type = FC_IMAGE;
+		if (!c_strcasecmp(al, "text")) fc->type = FC_TEXT;
+		else if (!c_strcasecmp(al, "hidden")) fc->type = FC_HIDDEN;
+		else if (!c_strcasecmp(al, "button")) fc->type = FC_BUTTON;
+		else if (!c_strcasecmp(al, "checkbox")) fc->type = FC_CHECKBOX;
+		else if (!c_strcasecmp(al, "radio")) fc->type = FC_RADIO;
+		else if (!c_strcasecmp(al, "password")) fc->type = FC_PASSWORD;
+		else if (!c_strcasecmp(al, "submit")) fc->type = FC_SUBMIT;
+		else if (!c_strcasecmp(al, "reset")) fc->type = FC_RESET;
+		else if (!c_strcasecmp(al, "file")) fc->type = FC_FILE;
+		else if (!c_strcasecmp(al, "image")) fc->type = FC_IMAGE;
 		/* else unknown type, let it default to FC_TEXT. */
 		mem_free(al);
 	}
@@ -408,12 +408,12 @@ abort:
 		closing_tag = 0;
 	}
 
-	if (closing_tag && !strlcasecmp(name, namelen, "SELECT", 6)) {
+	if (closing_tag && !c_strlcasecmp(name, namelen, "SELECT", 6)) {
 		add_select_item(&lnk_menu, &lbl, &orig_lbl, values, order, nnmi);
 		goto end_parse;
 	}
 
-	if (!strlcasecmp(name, namelen, "OPTION", 6)) {
+	if (!c_strlcasecmp(name, namelen, "OPTION", 6)) {
 		add_select_item(&lnk_menu, &lbl, &orig_lbl, values, order, nnmi);
 
 		if (!closing_tag) {
@@ -442,7 +442,7 @@ abort:
 		goto see;
 	}
 
-	if (!strlcasecmp(name, namelen, "OPTGROUP", 8)) {
+	if (!c_strlcasecmp(name, namelen, "OPTGROUP", 8)) {
 		add_select_item(&lnk_menu, &lbl, &orig_lbl, values, order, nnmi);
 
 		if (group) new_menu_item(&lnk_menu, NULL, -1, 0), group = 0;
@@ -586,10 +586,10 @@ sp:
 
 		if (namelen < 6) goto se;
 		if (name[0] == '/') name++, namelen--;
-
-		if (strlcasecmp(name, namelen, "OPTION", 6)
-		    && strlcasecmp(name, namelen, "SELECT", 6)
-		    && strlcasecmp(name, namelen, "OPTGROUP", 8))
+		
+		if (c_strlcasecmp(name, namelen, "OPTION", 6)
+		    && c_strlcasecmp(name, namelen, "SELECT", 6)
+		    && c_strlcasecmp(name, namelen, "OPTGROUP", 8))
 			goto se;
 	}
 
@@ -641,7 +641,7 @@ pp:
 		return;
 	}
 	if (parse_element(p, eof, &t_name, &t_namelen, NULL, end)) goto pp;
-	if (strlcasecmp(t_name, t_namelen, "/TEXTAREA", 9)) goto pp;
+	if (c_strlcasecmp(t_name, t_namelen, "/TEXTAREA", 9)) goto pp;
 
 	fc = init_form_control(FC_TEXTAREA, attr, html_context);
 	if (!fc) return;
@@ -684,14 +684,14 @@ pp:
 
 	wrap_attr = get_attr_val(attr, "wrap", html_context->doc_cp);
 	if (wrap_attr) {
-		if (!strcasecmp(wrap_attr, "hard")
-		    || !strcasecmp(wrap_attr, "physical")) {
+		if (!c_strcasecmp(wrap_attr, "hard")
+		    || !c_strcasecmp(wrap_attr, "physical")) {
 			fc->wrap = FORM_WRAP_HARD;
-		} else if (!strcasecmp(wrap_attr, "soft")
-			   || !strcasecmp(wrap_attr, "virtual")) {
+		} else if (!c_strcasecmp(wrap_attr, "soft")
+			   || !c_strcasecmp(wrap_attr, "virtual")) {
 			fc->wrap = FORM_WRAP_SOFT;
-		} else if (!strcasecmp(wrap_attr, "none")
-			   || !strcasecmp(wrap_attr, "off")) {
+		} else if (!c_strcasecmp(wrap_attr, "none")
+			   || !c_strcasecmp(wrap_attr, "off")) {
 			fc->wrap = FORM_WRAP_NONE;
 		}
 		mem_free(wrap_attr);
diff --git a/src/document/html/parser/general.c b/src/document/html/parser/general.c
index 3b38a7ff..4ebf9f99 100644
--- a/src/document/html/parser/general.c
+++ b/src/document/html/parser/general.c
@@ -227,10 +227,10 @@ html_script(struct html_context *html_context, unsigned char *a,
 	if (type) {
 		unsigned char *pos = type;
 
-		if (!strncasecmp(type, "text/", 5)) {
+		if (!c_strncasecmp(type, "text/", 5)) {
 			pos += 5;
 
-		} else if (!strncasecmp(type, "application/", 12)) {
+		} else if (!c_strncasecmp(type, "application/", 12)) {
 			pos += 12;
 
 		} else {
@@ -241,7 +241,7 @@ not_processed:
 			return;
 		}
 
-		if (!strncasecmp(pos, "javascript", 10)) {
+		if (!c_strncasecmp(pos, "javascript", 10)) {
 			int len = strlen(pos);
 
 			if (len > 10 && !isdigit(pos[10])) {
@@ -249,11 +249,11 @@ not_processed:
 				goto not_processed;
 			}
 
-		} else if (strcasecmp(pos, "ecmascript")
-		    && strcasecmp(pos, "jscript")
-		    && strcasecmp(pos, "livescript")
-		    && strcasecmp(pos, "x-javascript")
-		    && strcasecmp(pos, "x-ecmascript")) {
+		} else if (c_strcasecmp(pos, "ecmascript")
+		    && c_strcasecmp(pos, "jscript")
+		    && c_strcasecmp(pos, "livescript")
+		    && c_strcasecmp(pos, "x-javascript")
+		    && c_strcasecmp(pos, "x-ecmascript")) {
 			mem_free(type);
 			goto not_processed;
 		}
@@ -271,7 +271,7 @@ not_processed:
 
 		if (languagelen < 10
 		    || (languagelen > 10 && !isdigit(language[10]))
-		    || strncasecmp(language, "javascript", 10)) {
+		    || c_strncasecmp(language, "javascript", 10)) {
 			mem_free(language);
 			goto not_processed;
 		}
@@ -372,7 +372,7 @@ imported:
 		 * argument. */
 		if (parse_element(*end, eof, &name, &namelen, NULL, NULL))
 			continue;
-		if (strlcasecmp(name, namelen, "/script", 7))
+		if (c_strlcasecmp(name, namelen, "/script", 7))
 			continue;
 		/* We have won! */
 		break;
@@ -482,13 +482,13 @@ html_linebrk(struct html_context *html_context, unsigned char *a,
 	unsigned char *al = get_attr_val(a, "align", html_context->doc_cp);
 
 	if (al) {
-		if (!strcasecmp(al, "left")) par_format.align = ALIGN_LEFT;
-		else if (!strcasecmp(al, "right")) par_format.align = ALIGN_RIGHT;
-		else if (!strcasecmp(al, "center")) {
+		if (!c_strcasecmp(al, "left")) par_format.align = ALIGN_LEFT;
+		else if (!c_strcasecmp(al, "right")) par_format.align = ALIGN_RIGHT;
+		else if (!c_strcasecmp(al, "center")) {
 			par_format.align = ALIGN_CENTER;
 			if (!html_context->table_level)
 				par_format.leftmargin = par_format.rightmargin = 0;
-		} else if (!strcasecmp(al, "justify")) par_format.align = ALIGN_JUSTIFY;
+		} else if (!c_strcasecmp(al, "justify")) par_format.align = ALIGN_JUSTIFY;
 		mem_free(al);
 	}
 }
@@ -745,9 +745,9 @@ html_ul(struct html_context *html_context, unsigned char *a,
 
 	al = get_attr_val(a, "type", html_context->doc_cp);
 	if (al) {
-		if (!strcasecmp(al, "disc") || !strcasecmp(al, "circle"))
+		if (!c_strcasecmp(al, "disc") || !c_strcasecmp(al, "circle"))
 			par_format.flags = P_O;
-		else if (!strcasecmp(al, "square"))
+		else if (!c_strcasecmp(al, "square"))
 			par_format.flags = P_PLUS;
 		mem_free(al);
 	}
diff --git a/src/document/html/parser/link.c b/src/document/html/parser/link.c
index aa22c22c..9e5c66d6 100644
--- a/src/document/html/parser/link.c
+++ b/src/document/html/parser/link.c
@@ -463,12 +463,12 @@ html_object(struct html_context *html_context, unsigned char *a,
 	type = get_attr_val(a, "type", html_context->doc_cp);
 	if (!type) { mem_free(url); return; }
 
-	if (!strncasecmp(type, "text/", 5)) {
+	if (!c_strncasecmp(type, "text/", 5)) {
 		/* We will just emulate <iframe>. */
 		html_iframe_do(a, url, html_context);
 		html_skip(html_context, a);
 
-	} else if (!strncasecmp(type, "image/", 6)) {
+	} else if (!c_strncasecmp(type, "image/", 6)) {
 		/* <img> emulation. */
 		/* TODO: Use the enclosed text as 'alt' attribute. */
 		html_img_do(a, url, html_context);
@@ -519,7 +519,7 @@ html_embed(struct html_context *html_context, unsigned char *a,
 	if (!extension) extension = object_src;
 
 	type = get_extension_content_type(extension);
-	if (type && !strncasecmp(type, "image/", 6)) {
+	if (type && !c_strncasecmp(type, "image/", 6)) {
 		html_img_do(a, object_src, html_context);
 	} else {
 		/* We will just emulate <iframe>. */
@@ -757,7 +757,7 @@ html_link_parse(struct html_context *html_context, unsigned char *a,
 
 	/* TODO: fastfind */
 	for (i = 0; lt_names[i].str; i++)
-		if (!strcasecmp(link->name, lt_names[i].str)) {
+		if (!c_strcasecmp(link->name, lt_names[i].str)) {
 			link->type = lt_names[i].type;
 			return 1;
 		}
@@ -857,7 +857,7 @@ html_link(struct html_context *html_context, unsigned char *a,
 
 	if (link.lang && link.type == LT_ALTERNATE_LANG &&
 	    (link_display < 3 || (link.hreflang &&
-				  strcasecmp(link.hreflang, link.lang)))) {
+				  c_strcasecmp(link.hreflang, link.lang)))) {
 		APPEND(link.lang);
 	}
 
diff --git a/src/document/html/parser/parse.c b/src/document/html/parser/parse.c
index 6cf2f8e3..2fefb801 100644
--- a/src/document/html/parser/parse.c
+++ b/src/document/html/parser/parse.c
@@ -863,11 +863,11 @@ start_element(struct element_info *ei,
 			foreach (e, html_context->stack) {
 				if (is_block_element(e) && is_inline_element(ei)) break;
 				if (e->type < ELEMENT_KILLABLE) break;
-				if (!strlcasecmp(e->name, e->namelen, name, namelen)) break;
+				if (!c_strlcasecmp(e->name, e->namelen, name, namelen)) break;
 			}
 		}
 
-		if (!strlcasecmp(e->name, e->namelen, name, namelen)) {
+		if (!c_strlcasecmp(e->name, e->namelen, name, namelen)) {
 			while (e->prev != (void *) &html_context->stack)
 				kill_html_stack_item(html_context, e->prev);
 
@@ -972,7 +972,7 @@ end_element(struct element_info *ei,
 	/* dump_html_stack(html_context); */
 	foreach (e, html_context->stack) {
 		if (is_block_element(e) && is_inline_element(ei)) kill = 1;
-		if (strlcasecmp(e->name, e->namelen, name, namelen)) {
+		if (c_strlcasecmp(e->name, e->namelen, name, namelen)) {
 			if (e->type < ELEMENT_KILLABLE)
 				break;
 			else
@@ -1070,10 +1070,10 @@ sp:
 	if (parse_element(s, eof, &name, &namelen, &attr, &s)) goto sp;
 
 ps:
-	if (!strlcasecmp(name, namelen, "HEAD", 4)) goto se;
-	if (!strlcasecmp(name, namelen, "/HEAD", 5)) return;
-	if (!strlcasecmp(name, namelen, "BODY", 4)) return;
-	if (title && !title->length && !strlcasecmp(name, namelen, "TITLE", 5)) {
+	if (!c_strlcasecmp(name, namelen, "HEAD", 4)) goto se;
+	if (!c_strlcasecmp(name, namelen, "/HEAD", 5)) return;
+	if (!c_strlcasecmp(name, namelen, "BODY", 4)) return;
+	if (title && !title->length && !c_strlcasecmp(name, namelen, "TITLE", 5)) {
 		unsigned char *s1;
 
 xse:
@@ -1096,7 +1096,7 @@ xsp:
 		clr_spaces(title->source);
 		goto ps;
 	}
-	if (strlcasecmp(name, namelen, "META", 4)) goto se;
+	if (c_strlcasecmp(name, namelen, "META", 4)) goto se;
 
 	/* FIXME (bug 784): options->cp is the terminal charset;
 	 * should use the document charset instead.  */
diff --git a/src/document/html/parser/stack.c b/src/document/html/parser/stack.c
index d5c43b78..3f34a0bf 100644
--- a/src/document/html/parser/stack.c
+++ b/src/document/html/parser/stack.c
@@ -62,7 +62,7 @@ search_html_stack(struct html_context *html_context, unsigned char *name)
 	foreach (element, html_context->stack) {
 		if (element == html_top)
 			continue; /* skip the top element */
-		if (strlcasecmp(element->name, element->namelen, name, namelen))
+		if (c_strlcasecmp(element->name, element->namelen, name, namelen))
 			continue;
 		return element;
 	}
@@ -218,7 +218,7 @@ kill_html_stack_until(struct html_context *html_context, int ls, ...)
 				continue;
 			}
 
-			if (strlcasecmp(e->name, e->namelen, s, slen))
+			if (c_strlcasecmp(e->name, e->namelen, s, slen))
 				continue;
 
 			if (!sk) {
@@ -240,7 +240,7 @@ kill_html_stack_until(struct html_context *html_context, int ls, ...)
 		va_end(arg);
 
 		if (e->type < ELEMENT_KILLABLE
-		    || (!strlcasecmp(e->name, e->namelen, "TABLE", 5)))
+		    || (!c_strlcasecmp(e->name, e->namelen, "TABLE", 5)))
 			break;
 
 		if (e->namelen == 2 && toupper(e->name[0]) == 'T') {
diff --git a/src/document/html/parser/table.c b/src/document/html/parser/table.c
index deddd12f..f8f99223 100644
--- a/src/document/html/parser/table.c
+++ b/src/document/html/parser/table.c
@@ -89,11 +89,11 @@ get_align(struct html_context *html_context, unsigned char *attr, int *a)
 
 	if (!al) return;
 
-	if (!strcasecmp(al, "left")) *a = ALIGN_LEFT;
-	else if (!strcasecmp(al, "right")) *a = ALIGN_RIGHT;
-	else if (!strcasecmp(al, "center")) *a = ALIGN_CENTER;
-	else if (!strcasecmp(al, "justify")) *a = ALIGN_JUSTIFY;
-	else if (!strcasecmp(al, "char")) *a = ALIGN_RIGHT; /* NOT IMPLEMENTED */
+	if (!c_strcasecmp(al, "left")) *a = ALIGN_LEFT;
+	else if (!c_strcasecmp(al, "right")) *a = ALIGN_RIGHT;
+	else if (!c_strcasecmp(al, "center")) *a = ALIGN_CENTER;
+	else if (!c_strcasecmp(al, "justify")) *a = ALIGN_JUSTIFY;
+	else if (!c_strcasecmp(al, "char")) *a = ALIGN_RIGHT; /* NOT IMPLEMENTED */
 	mem_free(al);
 }
 
@@ -104,10 +104,10 @@ get_valign(struct html_context *html_context, unsigned char *attr, int *a)
 
 	if (!al) return;
 
-	if (!strcasecmp(al, "top")) *a = VALIGN_TOP;
-	else if (!strcasecmp(al, "middle")) *a = VALIGN_MIDDLE;
-	else if (!strcasecmp(al, "bottom")) *a = VALIGN_BOTTOM;
-	else if (!strcasecmp(al, "baseline")) *a = VALIGN_BASELINE; /* NOT IMPLEMENTED */
+	if (!c_strcasecmp(al, "top")) *a = VALIGN_TOP;
+	else if (!c_strcasecmp(al, "middle")) *a = VALIGN_MIDDLE;
+	else if (!c_strcasecmp(al, "bottom")) *a = VALIGN_BOTTOM;
+	else if (!c_strcasecmp(al, "baseline")) *a = VALIGN_BASELINE; /* NOT IMPLEMENTED */
 	mem_free(al);
 }
 
@@ -154,16 +154,16 @@ set_table_frame(struct html_context *html_context, struct table *table,
 	al = get_attr_val(attr, "frame", html_context->doc_cp);
 	if (!al) return;
 
-	if (!strcasecmp(al, "void")) table->frame = TABLE_FRAME_VOID;
-	else if (!strcasecmp(al, "above")) table->frame = TABLE_FRAME_ABOVE;
-	else if (!strcasecmp(al, "below")) table->frame = TABLE_FRAME_BELOW;
-	else if (!strcasecmp(al, "hsides")) table->frame = TABLE_FRAME_HSIDES;
-	else if (!strcasecmp(al, "vsides")) table->frame = TABLE_FRAME_VSIDES;
-	else if (!strcasecmp(al, "lhs")) table->frame = TABLE_FRAME_LHS;
-	else if (!strcasecmp(al, "rhs")) table->frame = TABLE_FRAME_RHS;
+	if (!c_strcasecmp(al, "void")) table->frame = TABLE_FRAME_VOID;
+	else if (!c_strcasecmp(al, "above")) table->frame = TABLE_FRAME_ABOVE;
+	else if (!c_strcasecmp(al, "below")) table->frame = TABLE_FRAME_BELOW;
+	else if (!c_strcasecmp(al, "hsides")) table->frame = TABLE_FRAME_HSIDES;
+	else if (!c_strcasecmp(al, "vsides")) table->frame = TABLE_FRAME_VSIDES;
+	else if (!c_strcasecmp(al, "lhs")) table->frame = TABLE_FRAME_LHS;
+	else if (!c_strcasecmp(al, "rhs")) table->frame = TABLE_FRAME_RHS;
 	/* Following tests are useless since TABLE_FRAME_BOX is the default.
-	 * else if (!strcasecmp(al, "box")) table->frame = TABLE_FRAME_BOX;
-	 * else if (!strcasecmp(al, "border")) table->frame = TABLE_FRAME_BOX;
+	 * else if (!c_strcasecmp(al, "box")) table->frame = TABLE_FRAME_BOX;
+	 * else if (!c_strcasecmp(al, "border")) table->frame = TABLE_FRAME_BOX;
 	 */
 	mem_free(al);
 }
@@ -179,11 +179,11 @@ set_table_rules(struct html_context *html_context, struct table *table,
 	al = get_attr_val(attr, "rules", html_context->doc_cp);
 	if (!al) return;
 
-	if (!strcasecmp(al, "none")) table->rules = TABLE_RULE_NONE;
-	else if (!strcasecmp(al, "groups")) table->rules = TABLE_RULE_GROUPS;
-	else if (!strcasecmp(al, "rows")) table->rules = TABLE_RULE_ROWS;
-	else if (!strcasecmp(al, "cols")) table->rules = TABLE_RULE_COLS;
-	else if (!strcasecmp(al, "all")) table->rules = TABLE_RULE_ALL;
+	if (!c_strcasecmp(al, "none")) table->rules = TABLE_RULE_NONE;
+	else if (!c_strcasecmp(al, "groups")) table->rules = TABLE_RULE_GROUPS;
+	else if (!c_strcasecmp(al, "rows")) table->rules = TABLE_RULE_ROWS;
+	else if (!c_strcasecmp(al, "cols")) table->rules = TABLE_RULE_COLS;
+	else if (!c_strcasecmp(al, "all")) table->rules = TABLE_RULE_ALL;
 	mem_free(al);
 }
 
@@ -527,7 +527,7 @@ skip_table(unsigned char *html, unsigned char *eof)
 		}
 
 
-		if (!strlcasecmp(name, namelen, "TABLE", 5)) {
+		if (!c_strlcasecmp(name, namelen, "TABLE", 5)) {
 			if (!closing_tag) {
 				level++;
 			} else {
@@ -608,7 +608,7 @@ see:
 		closing_tag = 0;
 	}
 
-	if (!strlcasecmp(name, namelen, "TABLE", 5)) {
+	if (!c_strlcasecmp(name, namelen, "TABLE", 5)) {
 		if (!closing_tag) {
 			en = skip_table(en, eof);
 			goto see;
@@ -623,7 +623,7 @@ see:
 		}
 	}
 
-	if (!strlcasecmp(name, namelen, "CAPTION", 7)) {
+	if (!c_strlcasecmp(name, namelen, "CAPTION", 7)) {
 		if (!closing_tag) {
 			add_table_bad_html_end(table, html);
 			if (!table->caption.start)
@@ -637,7 +637,7 @@ see:
 		goto see;
 	}
 
-	if (!strlcasecmp(name, namelen, "COLGROUP", 8)) {
+	if (!c_strlcasecmp(name, namelen, "COLGROUP", 8)) {
 		if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
 
 		add_table_bad_html_end(table, html);
@@ -663,7 +663,7 @@ see:
 		goto see;
 	}
 
-	if (!closing_tag && !strlcasecmp(name, namelen, "COL", 3)) {
+	if (!closing_tag && !c_strlcasecmp(name, namelen, "COL", 3)) {
 		int sp, width, al, val;
 
 		add_table_bad_html_end(table, html);
@@ -712,9 +712,9 @@ see:
 
 	/* THEAD TBODY TFOOT */
 	if (namelen == 4
-	    && ((!strlcasecmp(name, namelen, "HEAD", 4)) ||
-		(!strlcasecmp(name, namelen, "BODY", 4)) ||
-		(!strlcasecmp(name, namelen, "FOOT", 4)))) {
+	    && ((!c_strlcasecmp(name, namelen, "HEAD", 4)) ||
+		(!c_strlcasecmp(name, namelen, "BODY", 4)) ||
+		(!c_strlcasecmp(name, namelen, "FOOT", 4)))) {
 		if (c_span) new_columns(table, c_span, c_width, c_al, c_val, 1);
 
 		add_table_bad_html_end(table, html);
diff --git a/src/document/html/renderer.c b/src/document/html/renderer.c
index d7e5cf62..e9ababea 100644
--- a/src/document/html/renderer.c
+++ b/src/document/html/renderer.c
@@ -1251,7 +1251,7 @@ new_link(struct html_context *html_context, unsigned char *name, int namelen)
 	if (!format.form) {
 		link->target = null_or_stracpy(format.target);
 		link->data.name = memacpy(name, namelen);
-		/* if (strlen(url) > 4 && !strncasecmp(url, "MAP@", 4)) { */
+		/* if (strlen(url) > 4 && !c_strncasecmp(url, "MAP@", 4)) { */
 		if (format.link
 		    && ((format.link[0]|32) == 'm')
 		    && ((format.link[1]|32) == 'a')