mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-22 08:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Lars Hjemli 2009-03-15 09:06:20 +01:00
commit 780d2d9859
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ui-snapshot.c
View File

@ -156,20 +156,31 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
return NULL; return NULL;
} }
void show_error(char *msg)
{
ctx.page.mimetype = "text/html";
cgit_print_http_headers(&ctx);
cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
cgit_print_error(msg);
cgit_print_docend();
}
void cgit_print_snapshot(const char *head, const char *hex, void cgit_print_snapshot(const char *head, const char *hex,
const char *filename, int snapshots, int dwim) const char *filename, int snapshots, int dwim)
{ {
const struct cgit_snapshot_format* f; const struct cgit_snapshot_format* f;
char *prefix = NULL; char *prefix = NULL;
if (!filename) {
show_error("No snapshot name specified");
return;
}
f = get_format(filename); f = get_format(filename);
if (!f) { if (!f) {
ctx.page.mimetype = "text/html"; show_error(xstrdup(fmt("Unsupported snapshot format: %s",
cgit_print_http_headers(&ctx); filename)));
cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
cgit_print_docend();
return; return;
} }

13
ui-tree.c
View File

@ -25,11 +25,14 @@ static void print_text_buffer(char *buf, unsigned long size)
html("<tr><td class='linenumbers'><pre>"); html("<tr><td class='linenumbers'><pre>");
idx = 0; idx = 0;
lineno = 0; lineno = 0;
htmlf(numberfmt, ++lineno);
while(idx < size - 1) { // skip absolute last newline if (size) {
if (buf[idx] == '\n') htmlf(numberfmt, ++lineno);
htmlf(numberfmt, ++lineno); while(idx < size - 1) { // skip absolute last newline
idx++; if (buf[idx] == '\n')
htmlf(numberfmt, ++lineno);
idx++;
}
} }
html("</pre></td>\n"); html("</pre></td>\n");
html("<td class='lines'><pre><code>"); html("<td class='lines'><pre><code>");