X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/ded9393b173853d2e960f9b176aeb0bc4ed35be2..fe1bb0e765883fa4149fba12daee81b6ae070de3:/html.c?ds=sidebyside diff --git a/html.c b/html.c index 175b4b6..8f6e4f6 100644 --- a/html.c +++ b/html.c @@ -6,7 +6,40 @@ * (see COPYING for full license text) */ -#include "cgit.h" +#include +#include +#include +#include +#include +#include + +/* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */ +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, + "%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, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b", + "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85", + "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", + "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", + "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", + "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", + "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", + "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", + "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", + "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", + "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", + "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", + "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", + "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", + "%fe", "%ff" +}; + +int htmlfd = STDOUT_FILENO; char *fmt(const char *format, ...) { @@ -21,11 +54,18 @@ char *fmt(const char *format, ...) va_start(args, format); len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); va_end(args); - if (len>sizeof(buf[bufidx])) - die("[html.c] string truncated: %s", format); + if (len>sizeof(buf[bufidx])) { + fprintf(stderr, "[html.c] string truncated: %s\n", format); + exit(1); + } return buf[bufidx]; } +void html_raw(const char *data, size_t size) +{ + write(htmlfd, data, size); +} + void html(const char *txt) { write(htmlfd, txt, strlen(txt)); @@ -42,15 +82,20 @@ void htmlf(const char *format, ...) html(buf); } -void html_txt(char *txt) +void html_status(int code, const char *msg, int more_headers) +{ + htmlf("Status: %d %s\n", code, msg); + if (!more_headers) + html("\n"); +} + +void html_txt(const char *txt) { - char *t = txt; + const char *t = txt; while(t && *t){ int c = *t; if (c=='<' || c=='>' || c=='&') { - *t = '\0'; - html(txt); - *t = c; + html_raw(txt, t - txt); if (c=='>') html(">"); else if (c=='<') @@ -65,15 +110,13 @@ 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=='&') { - *t = '\0'; - html(txt); - *t = c; + html_raw(txt, t - txt); if (c=='>') html(">"); else if (c=='<') @@ -84,31 +127,29 @@ void html_ntxt(int len, char *txt) } t++; } - if (t!=txt) { - char c = *t; - *t = '\0'; - html(txt); - *t = c; - } + if (t!=txt) + html_raw(txt, t - txt); if (len<0) 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=='\'') { - *t = '\0'; - html(txt); - *t = c; + if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') { + html_raw(txt, t - txt); if (c=='>') html(">"); else if (c=='<') html("<"); else if (c=='\'') - html(""e;"); + html("'"); + else if (c=='"') + html("""); + else if (c=='&') + html("&"); txt = t+1; } t++; @@ -117,7 +158,43 @@ 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){ + unsigned char c = *t; + const char *e = url_escape_table[c]; + if (e && c!='+' && c!='&') { + html_raw(txt, t - txt); + html(e); + txt = t+1; + } + t++; + } + if (t!=txt) + html(txt); +} + +void html_url_arg(const char *txt) +{ + const char *t = txt; + while(t && *t){ + unsigned char c = *t; + const char *e = url_escape_table[c]; + if (c == ' ') + e = "+"; + if (e) { + html_raw(txt, t - txt); + html(e); + txt = t+1; + } + t++; + } + if (t!=txt) + html(txt); +} + +void html_hidden(const char *name, const char *value) { html(""); } -void html_link_open(char *url, char *title, char *class) +void html_option(const char *value, const char *text, const char *selected_value) +{ + html("\n"); +} + +void html_intoption(int value, const char *text, int selected_value) +{ + htmlf(""); +} + +void html_link_open(const char *url, const char *title, const char *class) { html(" 0) + html_raw(buf, len); + fclose(f); + return 0; +} + +int hextoint(char c) { - if (S_ISDIR(mode)) - html("d"); - else if (S_ISLNK(mode)) - html("l"); - else if (S_ISDIRLNK(mode)) - html("m"); + if (c >= 'a' && c <= 'f') + return 10 + c - 'a'; + else if (c >= 'A' && c <= 'F') + return 10 + c - 'A'; + else if (c >= '0' && c <= '9') + return c - '0'; else - html("-"); - html_fileperm(mode >> 6); - html_fileperm(mode >> 3); - html_fileperm(mode); + return -1; +} + +char *convert_query_hexchar(char *txt) +{ + int d1, d2, n; + n = strlen(txt); + if (n < 3) { + *txt = '\0'; + return txt-1; + } + d1 = hextoint(*(txt+1)); + d2 = hextoint(*(txt+2)); + if (d1<0 || d2<0) { + memmove(txt, txt+3, n-2); + return txt-1; + } else { + *txt = d1 * 16 + d2; + memmove(txt+1, txt+3, n-2); + return txt; + } +} + +int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) +{ + char *o, *t, *txt, *value = NULL, c; + + if (!txt_) + return 0; + + o = t = txt = strdup(txt_); + if (t == NULL) { + printf("Out of memory\n"); + exit(1); + } + while((c=*t) != '\0') { + if (c=='=') { + *t = '\0'; + value = t+1; + } else if (c=='+') { + *t = ' '; + } else if (c=='%') { + t = convert_query_hexchar(t); + } else if (c=='&') { + *t = '\0'; + (*fn)(txt, value); + txt = t+1; + value = NULL; + } + t++; + } + if (t!=txt) + (*fn)(txt, value); + free(o); + return 0; }