html: make all strings 'const char *'

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index 83fc7a9b7646a2dc96f87f277460c8c0857249ec..4033200e6ff3edfbb926c1baaecd480bf5544470 100644 (file)
--- a/html.c
+++ b/html.c
@@ -56,16 +56,16 @@ void htmlf(const char *format, ...)
        html(buf);
 }
 
-void html_status(int code, int more_headers)
+void html_status(int code, const char *msg, int more_headers)
 {
-       htmlf("Status: %d\n", code);
+       htmlf("Status: %d %s\n", code, msg);
        if (!more_headers)
                html("\n");
 }
 
-void html_txt(char *txt)
+void html_txt(const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
@@ -84,9 +84,9 @@ void html_txt(char *txt)
                html(txt);
 }
 
-void html_ntxt(int len, char *txt)
+void html_ntxt(int len, const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t && len--){
                int c = *t;
                if (c=='<' || c=='>' || c=='&') {
@@ -107,19 +107,21 @@ void html_ntxt(int len, char *txt)
                html("...");
 }
 
-void html_attr(char *txt)
+void html_attr(const char *txt)
 {
-       char *t = txt;
+       const char *t = txt;
        while(t && *t){
                int c = *t;
-               if (c=='<' || c=='>' || c=='\'') {
+               if (c=='<' || c=='>' || c=='\'' || c=='\"') {
                        write(htmlfd, txt, t - txt);
                        if (c=='>')
                                html("&gt;");
                        else if (c=='<')
                                html("&lt;");
                        else if (c=='\'')
-                               html("&quote;");
+                               html("&#x27;");
+                       else if (c=='"')
+                               html("&quot;");
                        txt = t+1;
                }
                t++;
@@ -128,7 +130,39 @@ void html_attr(char *txt)
                html(txt);
 }
 
-void html_hidden(char *name, char *value)
+void html_url_path(const char *txt)
+{
+       const char *t = txt;
+       while(t && *t){
+               int c = *t;
+               if (c=='"' || c=='#' || c=='\'' || c=='?') {
+                       write(htmlfd, txt, t - txt);
+                       write(htmlfd, fmt("%%%2x", c), 3);
+                       txt = t+1;
+               }
+               t++;
+       }
+       if (t!=txt)
+               html(txt);
+}
+
+void html_url_arg(const char *txt)
+{
+       const char *t = txt;
+       while(t && *t){
+               int c = *t;
+               if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
+                       write(htmlfd, txt, t - txt);
+                       write(htmlfd, fmt("%%%2x", c), 3);
+                       txt = t+1;
+               }
+               t++;
+       }
+       if (t!=txt)
+               html(txt);
+}
+
+void html_hidden(const char *name, const char *value)
 {
        html("<input type='hidden' name='");
        html_attr(name);
@@ -137,7 +171,7 @@ void html_hidden(char *name, char *value)
        html("'/>");
 }
 
-void html_option(char *value, char *text, char *selected_value)
+void html_option(const char *value, const char *text, const char *selected_value)
 {
        html("<option value='");
        html_attr(value);
@@ -149,7 +183,7 @@ void html_option(char *value, char *text, char *selected_value)
        html("</option>\n");
 }
 
-void html_link_open(char *url, char *title, char *class)
+void html_link_open(const char *url, const char *title, const char *class)
 {
        html("<a href='");
        html_attr(url);
@@ -223,14 +257,14 @@ char *convert_query_hexchar(char *txt)
        }
 }
 
-int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))
+int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value))
 {
-       char *t, *value = NULL, c;
+       char *t, *txt, *value = NULL, c;
 
-       if (!txt)
+       if (!txt_)
                return 0;
 
-       t = txt = strdup(txt);
+       t = txt = strdup(txt_);
        if (t == NULL) {
                printf("Out of memory\n");
                exit(1);