html.c: add html_intoption()

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index 1305910b40f9513ef11a0eda21fb6d6d06e11ae5..ae1cef983265979144a6e1c6da835fd4746ae630 100644 (file)
--- a/html.c
+++ b/html.c
@@ -18,7 +18,7 @@ static const char* url_escape_table[256] = {
        "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09",
        "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13",
        "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d",
-       "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
+       "%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0,
        "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d",
        "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0,
@@ -181,7 +181,7 @@ void html_url_arg(const char *txt)
                const char *e = url_escape_table[c];
                if (e) {
                        html_raw(txt, t - txt);
-                       html_raw(e, 3);
+                       html_raw(e, strlen(e));
                        txt = t+1;
                }
                t++;
@@ -211,6 +211,14 @@ void html_option(const char *value, const char *text, const char *selected_value
        html("</option>\n");
 }
 
+void html_intoption(int value, const char *text, int selected_value)
+{
+       htmlf("<option value='%d'%s>", value,
+             value == selected_value ? " selected='selected'" : "");
+       html_txt(text);
+       html("</option>");
+}
+
 void html_link_open(const char *url, const char *title, const char *class)
 {
        html("<a href='");
@@ -277,7 +285,7 @@ char *convert_query_hexchar(char *txt)
        d1 = hextoint(*(txt+1));
        d2 = hextoint(*(txt+2));
        if (d1<0 || d2<0) {
-               memmove(txt, txt+3, n-3);
+               memmove(txt, txt+3, n-2);
                return txt-1;
        } else {
                *txt = d1 * 16 + d2;