mirror of
https://git.zx2c4.com/cgit
synced 2024-11-09 10:08:42 +00:00
Merge branch 'stable'
This commit is contained in:
commit
780d2d9859
@ -156,20 +156,31 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
|
||||
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,
|
||||
const char *filename, int snapshots, int dwim)
|
||||
{
|
||||
const struct cgit_snapshot_format* f;
|
||||
char *prefix = NULL;
|
||||
|
||||
if (!filename) {
|
||||
show_error("No snapshot name specified");
|
||||
return;
|
||||
}
|
||||
|
||||
f = get_format(filename);
|
||||
if (!f) {
|
||||
ctx.page.mimetype = "text/html";
|
||||
cgit_print_http_headers(&ctx);
|
||||
cgit_print_docstart(&ctx);
|
||||
cgit_print_pageheader(&ctx);
|
||||
cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
|
||||
cgit_print_docend();
|
||||
show_error(xstrdup(fmt("Unsupported snapshot format: %s",
|
||||
filename)));
|
||||
return;
|
||||
}
|
||||
|
||||
|
13
ui-tree.c
13
ui-tree.c
@ -25,11 +25,14 @@ static void print_text_buffer(char *buf, unsigned long size)
|
||||
html("<tr><td class='linenumbers'><pre>");
|
||||
idx = 0;
|
||||
lineno = 0;
|
||||
htmlf(numberfmt, ++lineno);
|
||||
while(idx < size - 1) { // skip absolute last newline
|
||||
if (buf[idx] == '\n')
|
||||
htmlf(numberfmt, ++lineno);
|
||||
idx++;
|
||||
|
||||
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");
|
||||
html("<td class='lines'><pre><code>");
|
||||
|
Loading…
Reference in New Issue
Block a user