X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9d8d9b61238df3a855504825e5f735d00289f12b..e5ca46bf4b974ce3b51d09da4c7ad741aaa70ede:/html.c

diff --git a/html.c b/html.c
index 957b326..339bf00 100644
--- a/html.c
+++ b/html.c
@@ -45,12 +45,10 @@ void htmlf(const char *format, ...)
 void html_txt(char *txt)
 {
 	char *t = txt;
-	while(*t){
+	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
-			*t = '\0';
-			html(txt);
-			*t = c;
+			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
@@ -68,12 +66,10 @@ void html_txt(char *txt)
 void html_ntxt(int len, char *txt)
 {
 	char *t = txt;
-	while(*t && len--){
+	while(t && *t && len--){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
-			*t = '\0';
-			html(txt);
-			*t = c;
+			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
@@ -84,12 +80,8 @@ void html_ntxt(int len, char *txt)
 		}
 		t++;
 	}
-	if (t!=txt) {
-		char c = *t;
-		*t = '\0';
-		html(txt);
-		*t = c;
-	}
+	if (t!=txt)
+		write(htmlfd, txt, t - txt);
 	if (len<0)
 		html("...");
 }
@@ -97,12 +89,10 @@ void html_ntxt(int len, char *txt)
 void html_attr(char *txt)
 {
 	char *t = txt;
-	while(*t){
+	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='\'') {
-			*t = '\0';
-			html(txt);
-			*t = c;
+			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
@@ -117,6 +107,27 @@ void html_attr(char *txt)
 		html(txt);
 }
 
+void html_hidden(char *name, char *value)
+{
+	html("<input type='hidden' name='");
+	html_attr(name);
+	html("' value='");
+	html_attr(value);
+	html("'/>");
+}
+
+void html_option(char *value, char *text, char *selected_value)
+{
+	html("<option value='");
+	html_attr(value);
+	html("'");
+	if (selected_value && !strcmp(selected_value, value))
+		html(" selected='selected'");
+	html(">");
+	html_txt(text);
+	html("</option>\n");
+}
+
 void html_link_open(char *url, char *title, char *class)
 {
 	html("<a href='");
@@ -149,6 +160,8 @@ void html_filemode(unsigned short mode)
 		html("d");
 	else if (S_ISLNK(mode))
 		html("l");
+	else if (S_ISGITLINK(mode))
+		html("m");
 	else
 		html("-");
 	html_fileperm(mode >> 6);
@@ -156,3 +169,16 @@ void html_filemode(unsigned short mode)
 	html_fileperm(mode);
 }
 
+int html_include(const char *filename)
+{
+	FILE *f;
+	char buf[4096];
+	size_t len;
+
+	if (!(f = fopen(filename, "r")))
+		return -1;
+	while((len = fread(buf, 1, 4096, f)) > 0)
+		write(htmlfd, buf, len);
+	fclose(f);
+	return 0;
+}