summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--html.c18
-rw-r--r--ui-blob.c4
-rw-r--r--ui-tree.c2
3 files changed, 12 insertions, 12 deletions
diff --git a/html.c b/html.c
index eaabf72..1305910 100644
--- a/html.c
+++ b/html.c
@@ -66,151 +66,151 @@ void html_raw(const char *data, size_t size)
write(htmlfd, data, size);
}
void html(const char *txt)
{
write(htmlfd, txt, strlen(txt));
}
void htmlf(const char *format, ...)
{
static char buf[65536];
va_list args;
va_start(args, format);
vsnprintf(buf, sizeof(buf), format, args);
va_end(args);
html(buf);
}
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)
{
const char *t = txt;
while(t && *t){
int c = *t;
if (c=='<' || c=='>' || c=='&') {
- write(htmlfd, txt, t - txt);
+ html_raw(txt, t - txt);
if (c=='>')
html("&gt;");
else if (c=='<')
html("&lt;");
else if (c=='&')
html("&amp;");
txt = t+1;
}
t++;
}
if (t!=txt)
html(txt);
}
void html_ntxt(int len, const char *txt)
{
const char *t = txt;
while(t && *t && len--){
int c = *t;
if (c=='<' || c=='>' || c=='&') {
- write(htmlfd, txt, t - txt);
+ html_raw(txt, t - txt);
if (c=='>')
html("&gt;");
else if (c=='<')
html("&lt;");
else if (c=='&')
html("&amp;");
txt = t+1;
}
t++;
}
if (t!=txt)
- write(htmlfd, txt, t - txt);
+ html_raw(txt, t - txt);
if (len<0)
html("...");
}
void html_attr(const char *txt)
{
const char *t = txt;
while(t && *t){
int c = *t;
if (c=='<' || c=='>' || c=='\'' || c=='\"') {
- write(htmlfd, txt, t - txt);
+ html_raw(txt, t - txt);
if (c=='>')
html("&gt;");
else if (c=='<')
html("&lt;");
else if (c=='\'')
html("&#x27;");
else if (c=='"')
html("&quot;");
txt = t+1;
}
t++;
}
if (t!=txt)
html(txt);
}
void html_url_path(const char *txt)
{
const char *t = txt;
while(t && *t){
int c = *t;
const char *e = url_escape_table[c];
if (e && c!='+' && c!='&' && c!='+') {
- write(htmlfd, txt, t - txt);
- write(htmlfd, e, 3);
+ html_raw(txt, t - txt);
+ html_raw(e, 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;
const char *e = url_escape_table[c];
if (e) {
- write(htmlfd, txt, t - txt);
- write(htmlfd, e, 3);
+ html_raw(txt, t - txt);
+ html_raw(e, 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);
html("' value='");
html_attr(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_link_open(const char *url, const char *title, const char *class)
{
html("<a href='");
@@ -220,65 +220,65 @@ void html_link_open(const char *url, const char *title, const char *class)
html_attr(title);
}
if (class) {
html("' class='");
html_attr(class);
}
html("'>");
}
void html_link_close(void)
{
html("</a>");
}
void html_fileperm(unsigned short mode)
{
htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
(mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
}
int html_include(const char *filename)
{
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)
- write(htmlfd, buf, len);
+ html_raw(buf, len);
fclose(f);
return 0;
}
int hextoint(char c)
{
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
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-3);
return txt-1;
} else {
*txt = d1 * 16 + d2;
memmove(txt+1, txt+3, n-2);
diff --git a/ui-blob.c b/ui-blob.c
index 667a451..ec435e1 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -23,90 +23,90 @@ static int walk_tree(const unsigned char *sha1, const char *base,int baselen,
memmove(matched_sha1,sha1,20);
found_path = 1;
return 0;
}
int cgit_print_file(char *path, const char *head)
{
unsigned char sha1[20];
enum object_type type;
char *buf;
unsigned long size;
struct commit *commit;
const char *paths[] = {path, NULL};
if (get_sha1(head, sha1))
return -1;
type = sha1_object_info(sha1, &size);
if(type == OBJ_COMMIT && path) {
commit = lookup_commit_reference(sha1);
match_path = path;
matched_sha1 = sha1;
found_path = 0;
read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
if (!found_path)
return -1;
type = sha1_object_info(sha1, &size);
}
if (type == OBJ_BAD)
return -1;
buf = read_sha1_file(sha1, &type, &size);
if (!buf)
return -1;
buf[size] = '\0';
- write(htmlfd, buf, size);
+ html_raw(buf, size);
return 0;
}
void cgit_print_blob(const char *hex, char *path, const char *head)
{
unsigned char sha1[20];
enum object_type type;
char *buf;
unsigned long size;
struct commit *commit;
const char *paths[] = {path, NULL};
if (hex) {
if (get_sha1_hex(hex, sha1)){
cgit_print_error(fmt("Bad hex value: %s", hex));
return;
}
} else {
if (get_sha1(head,sha1)) {
cgit_print_error(fmt("Bad ref: %s", head));
return;
}
}
type = sha1_object_info(sha1, &size);
if((!hex) && type == OBJ_COMMIT && path) {
commit = lookup_commit_reference(sha1);
match_path = path;
matched_sha1 = sha1;
read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
type = sha1_object_info(sha1,&size);
}
if (type == OBJ_BAD) {
cgit_print_error(fmt("Bad object name: %s", hex));
return;
}
buf = read_sha1_file(sha1, &type, &size);
if (!buf) {
cgit_print_error(fmt("Error reading object %s", hex));
return;
}
buf[size] = '\0';
ctx.page.mimetype = ctx.qry.mimetype;
if (!ctx.page.mimetype) {
if (buffer_is_binary(buf, size))
ctx.page.mimetype = "application/octet-stream";
else
ctx.page.mimetype = "text/plain";
}
ctx.page.filename = path;
cgit_print_http_headers(&ctx);
- write(htmlfd, buf, size);
+ html_raw(buf, size);
}
diff --git a/ui-tree.c b/ui-tree.c
index 0cdbf6d..0b1b531 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -17,65 +17,65 @@ int header = 0;
static void print_text_buffer(const char *name, char *buf, unsigned long size)
{
unsigned long lineno, idx;
const char *numberfmt =
"<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
html("<table summary='blob content' class='blob'>\n");
if (ctx.cfg.enable_tree_linenumbers) {
html("<tr><td class='linenumbers'><pre>");
idx = 0;
lineno = 0;
if (size) {
htmlf(numberfmt, ++lineno);
while(idx < size - 1) { // skip absolute last newline
if (buf[idx] == '\n')
htmlf(numberfmt, ++lineno);
idx++;
}
}
html("</pre></td>\n");
}
else {
html("<tr>\n");
}
if (ctx.repo->source_filter) {
html("<td class='lines'><pre><code>");
ctx.repo->source_filter->argv[1] = xstrdup(name);
cgit_open_filter(ctx.repo->source_filter);
- write(STDOUT_FILENO, buf, size);
+ html_raw(buf, size);
cgit_close_filter(ctx.repo->source_filter);
html("</code></pre></td></tr></table>\n");
return;
}
html("<td class='lines'><pre><code>");
html_txt(buf);
html("</code></pre></td></tr></table>\n");
}
#define ROWLEN 32
static void print_binary_buffer(char *buf, unsigned long size)
{
unsigned long ofs, idx;
static char ascii[ROWLEN + 1];
html("<table summary='blob content' class='bin-blob'>\n");
html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs);
for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
htmlf("%*s%02x",
idx == 16 ? 4 : 1, "",
buf[idx] & 0xff);
html(" </td><td class='hex'>");
for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
ascii[idx] = isgraph(buf[idx]) ? buf[idx] : '.';
ascii[idx] = '\0';
html_txt(ascii);
html("</td></tr>\n");
}