all repos — cgit @ d187b98557d91b874836f286b955ba76ab26fb02

a hyperfast web frontend for git written in c 

prefer html_raw() to write()

To make the code more consistent, and to not rely on the implementation
of html(), always use html_raw(...) instead of write(htmlfd, ...).

Signed-off-by: Mark Lodato <lodatom@gmail.com>
Mark Lodato lodatom@gmail.com
Sat, 04 Sep 2010 14:18:16 -0400
commit

d187b98557d91b874836f286b955ba76ab26fb02

parent

25e8ba1996a7b5ea291c924b0990d706176f6fe6

3 files changed, 12 insertions(+), 12 deletions(-)

jump to
M html.c → html.c 
@@ -95,7 +95,7 @@ const char *t = txt;
 	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
-			write(htmlfd, txt, t - txt);
+			html_raw(txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')

@@ -116,7 +116,7 @@ const char *t = txt;
 	while(t && *t && len--){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
-			write(htmlfd, txt, t - txt);
+			html_raw(txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')

@@ -128,7 +128,7 @@ }
 		t++;
 	}
 	if (t!=txt)
-		write(htmlfd, txt, t - txt);
+		html_raw(txt, t - txt);
 	if (len<0)
 		html("...");
 }

@@ -139,7 +139,7 @@ const char *t = txt;
 	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='\'' || c=='\"') {
-			write(htmlfd, txt, t - txt);
+			html_raw(txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')

@@ -163,8 +163,8 @@ while(t && *t){
 		int c = *t;
 		const char *e = url_escape_table[c];
 		if (e && c!='+' && c!='&' && c!='+') {
-			write(htmlfd, txt, t - txt);
-			write(htmlfd, e, 3);
+			html_raw(txt, t - txt);
+			html_raw(e, 3);
 			txt = t+1;
 		}
 		t++;

@@ -180,8 +180,8 @@ while(t && *t){
 		int c = *t;
 		const char *e = url_escape_table[c];
 		if (e) {
-			write(htmlfd, txt, t - txt);
-			write(htmlfd, e, 3);
+			html_raw(txt, t - txt);
+			html_raw(e, 3);
 			txt = t+1;
 		}
 		t++;

@@ -249,7 +249,7 @@ filename, strerror(errno), errno);
 		return -1;
 	}
 	while((len = fread(buf, 1, 4096, f)) > 0)
-		write(htmlfd, buf, len);
+		html_raw(buf, len);
 	fclose(f);
 	return 0;
 }
M ui-blob.c → ui-blob.c 
@@ -52,7 +52,7 @@ buf = read_sha1_file(sha1, &type, &size);
 	if (!buf)
 		return -1;
 	buf[size] = '\0';
-	write(htmlfd, buf, size);
+	html_raw(buf, size);
 	return 0;
 }
 

@@ -108,5 +108,5 @@ ctx.page.mimetype = "text/plain";
 	}
 	ctx.page.filename = path;
 	cgit_print_http_headers(&ctx);
-	write(htmlfd, buf, size);
+	html_raw(buf, size);
 }
M ui-tree.c → ui-tree.c 
@@ -46,7 +46,7 @@ if (ctx.repo->source_filter) {
 		html("<td class='lines'><pre><code>");
 		ctx.repo->source_filter->argv[1] = xstrdup(name);
 		cgit_open_filter(ctx.repo->source_filter);
-		write(STDOUT_FILENO, buf, size);
+		html_raw(buf, size);
 		cgit_close_filter(ctx.repo->source_filter);
 		html("</code></pre></td></tr></table>\n");
 		return;