aboutsummaryrefslogtreecommitdiff
path: root/html.c
diff refs
from:
to:
flip
diff options
context:
space:
mode:
Diffstat (limited to 'html.c')
-rw-r--r--html.c309
1 files changed, 66 insertions, 243 deletions
diff --git a/html.c b/html.c
index 0bac34b..c0b2ed4 100644
--- a/html.c
+++ b/html.c
@@ -1,50 +1,12 @@
/* html.c: helper functions for html output
*
- * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
+ * Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
-#include "html.h"
-#include "url.h"
-
-/* 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", NULL, "%22", "%23", NULL, "%25", "%26", "%27",
- NULL, NULL, NULL, "%2b", NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, "%3c", "%3d", "%3e", "%3f",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, "%5c", NULL, "%5e", NULL,
- "%60", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, "%7b", "%7c", "%7d", NULL, "%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"
-};
char *fmt(const char *format, ...)
{
@@ -59,204 +21,103 @@ 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])) {
- fprintf(stderr, "[html.c] string truncated: %s\n", format);
- exit(1);
- }
+ if (len>sizeof(buf[bufidx]))
+ die("[html.c] string truncated: %s", format);
return buf[bufidx];
}
-char *fmtalloc(const char *format, ...)
-{
- struct strbuf sb = STRBUF_INIT;
- va_list args;
-
- va_start(args, format);
- strbuf_vaddf(&sb, format, args);
- va_end(args);
-
- return strbuf_detach(&sb, NULL);
-}
-
-void html_raw(const char *data, size_t size)
-{
- if (write(STDOUT_FILENO, data, size) != size)
- die_errno("write error on html output");
-}
-
void html(const char *txt)
{
- html_raw(txt, strlen(txt));
+ write(htmlfd, txt, strlen(txt));
}
void htmlf(const char *format, ...)
{
+ static char buf[65536];
va_list args;
- struct strbuf buf = STRBUF_INIT;
va_start(args, format);
- strbuf_vaddf(&buf, format, args);
+ vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
- html(buf.buf);
- strbuf_release(&buf);
+ html(buf);
}
-void html_txtf(const char *format, ...)
+void html_txt(char *txt)
{
- va_list args;
-
- va_start(args, format);
- html_vtxtf(format, args);
- va_end(args);
-}
-
-void html_vtxtf(const char *format, va_list ap)
-{
- va_list cp;
- struct strbuf buf = STRBUF_INIT;
-
- va_copy(cp, ap);
- strbuf_vaddf(&buf, format, cp);
- va_end(cp);
- html_txt(buf.buf);
- strbuf_release(&buf);
-}
-
-void html_txt(const char *txt)
-{
- if (txt)
- html_ntxt(txt, strlen(txt));
-}
-
-ssize_t html_ntxt(const char *txt, size_t len)
-{
- const char *t = txt;
- ssize_t slen;
-
- if (len > SSIZE_MAX)
- return -1;
-
- slen = (ssize_t) len;
- while (t && *t && slen--) {
+ char *t = txt;
+ while(t && *t){
int c = *t;
- if (c == '<' || c == '>' || c == '&') {
- html_raw(txt, t - txt);
- if (c == '>')
+ if (c=='<' || c=='>' || c=='&') {
+ *t = '\0';
+ html(txt);
+ *t = c;
+ if (c=='>')
html("&gt;");
- else if (c == '<')
+ else if (c=='<')
html("&lt;");
- else if (c == '&')
+ else if (c=='&')
html("&amp;");
- txt = t + 1;
+ txt = t+1;
}
t++;
}
- if (t != txt)
- html_raw(txt, t - txt);
- return slen;
-}
-
-void html_attrf(const char *fmt, ...)
-{
- va_list ap;
- struct strbuf sb = STRBUF_INIT;
-
- va_start(ap, fmt);
- strbuf_vaddf(&sb, fmt, ap);
- va_end(ap);
-
- html_attr(sb.buf);
- strbuf_release(&sb);
+ if (t!=txt)
+ html(txt);
}
-void html_attr(const char *txt)
+void html_ntxt(int len, char *txt)
{
- const char *t = txt;
- while (t && *t) {
+ char *t = txt;
+ while(t && *t && len--){
int c = *t;
- if (c == '<' || c == '>' || c == '\'' || c == '\"' || c == '&') {
- html_raw(txt, t - txt);
- if (c == '>')
+ if (c=='<' || c=='>' || c=='&') {
+ *t = '\0';
+ html(txt);
+ *t = c;
+ if (c=='>')
html("&gt;");
- else if (c == '<')
+ else if (c=='<')
html("&lt;");
- else if (c == '\'')
- html("&#x27;");
- else if (c == '"')
- html("&quot;");
- else if (c == '&')
+ else if (c=='&')
html("&amp;");
- txt = t + 1;
+ txt = t+1;
}
t++;
}
- if (t != txt)
+ if (t!=txt) {
+ char c = *t;
+ *t = '\0';
html(txt);
-}
-
-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++;
+ *t = c;
}
- if (t != txt)
- html(txt);
+ if (len<0)
+ html("...");
}
-void html_url_arg(const char *txt)
+void html_attr(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_header_arg_in_quotes(const char *txt)
-{
- const char *t = txt;
- while (t && *t) {
- unsigned char c = *t;
- const char *e = NULL;
- if (c == '\\')
- e = "\\\\";
- else if (c == '\r')
- e = "\\r";
- else if (c == '\n')
- e = "\\n";
- else if (c == '"')
- e = "\\\"";
- if (e) {
- html_raw(txt, t - txt);
- html(e);
- txt = t + 1;
+ char *t = txt;
+ while(t && *t){
+ int c = *t;
+ if (c=='<' || c=='>' || c=='\'') {
+ *t = '\0';
+ html(txt);
+ *t = c;
+ if (c=='>')
+ html("&gt;");
+ else if (c=='<')
+ html("&lt;");
+ else if (c=='\'')
+ html("&quote;");
+ txt = t+1;
}
t++;
}
- if (t != txt)
+ if (t!=txt)
html(txt);
-
}
-void html_hidden(const char *name, const char *value)
+void html_hidden(char *name, char *value)
{
html("<input type='hidden' name='");
html_attr(name);
@@ -265,27 +126,7 @@ void html_hidden(const char *name, const char *value)
html("'/>");
}
-void html_option(const char *value, const char *text, const 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_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)
+void html_link_open(char *url, char *title, char *class)
{
html("<a href='");
html_attr(url);
@@ -307,38 +148,20 @@ void html_link_close(void)
void html_fileperm(unsigned short mode)
{
- htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
+ htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
(mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
}
-int html_include(const char *filename)
+void html_filemode(unsigned short mode)
{
- FILE *f;
- char buf[4096];
- size_t len;
-
- if (!(f = fopen(filename, "r"))) {
- fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n",
- filename, strerror(errno), errno);
- return -1;
- }
- while ((len = fread(buf, 1, 4096, f)) > 0)
- html_raw(buf, len);
- fclose(f);
- return 0;
+ if (S_ISDIR(mode))
+ html("d");
+ else if (S_ISLNK(mode))
+ html("l");
+ else
+ html("-");
+ html_fileperm(mode >> 6);
+ html_fileperm(mode >> 3);
+ html_fileperm(mode);
}
-void http_parse_querystring(const char *txt, void (*fn)(const char *name, const char *value))
-{
- const char *t = txt;
-
- while (t && *t) {
- char *name = url_decode_parameter_name(&t);
- if (*name) {
- char *value = url_decode_parameter_value(&t);
- fn(name, value);
- free(value);
- }
- free(name);
- }
-}