summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-06-16 19:35:58 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-06-16 19:35:58 (UTC)
commitf91b9696a36008c245a3195800ba0c5fa3e890f9 (patch) (side-by-side diff)
treec064e555881d3b426b73fd841531a19c064a9984
parentffc69736a606fd8f9a10468cce48b9a37b428944 (diff)
downloadcgit-f91b9696a36008c245a3195800ba0c5fa3e890f9.zip
cgit-f91b9696a36008c245a3195800ba0c5fa3e890f9.tar.gz
cgit-f91b9696a36008c245a3195800ba0c5fa3e890f9.tar.bz2
ui-tree: make blob viewer generate valid html
A leftover '</td></tr>' made ui-tree generate invalid html for blob content. Fix it. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-tree.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ui-tree.c b/ui-tree.c
index eb3d3ac..db0bef6 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -2,97 +2,96 @@
*
* Copyright (C) 2006 Lars Hjemli
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
*/
#include "cgit.h"
char *curr_rev;
char *match_path;
int header = 0;
static void print_object(const unsigned char *sha1, char *path)
{
enum object_type type;
unsigned char *buf;
unsigned long size, lineno, start, idx;
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
cgit_print_error(fmt("Bad object name: %s",
sha1_to_hex(sha1)));
return;
}
buf = read_sha1_file(sha1, &type, &size);
if (!buf) {
cgit_print_error(fmt("Error reading object %s",
sha1_to_hex(sha1)));
return;
}
html("<table class='blob'>\n");
idx = 0;
start = 0;
lineno = 0;
while(idx < size) {
if (buf[idx] == '\n') {
buf[idx] = '\0';
htmlf("<tr><td class='no'>%d</td><td class='txt'>",
++lineno);
html_txt(buf + start);
html("</td></tr>\n");
start = idx + 1;
}
idx++;
}
- html("\n</td></tr>\n");
html("</table>\n");
}
static int ls_item(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned int mode, int stage)
{
char *name;
enum object_type type;
unsigned long size = 0;
char *url, *qry;
name = xstrdup(pathname);
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
name,
sha1_to_hex(sha1));
return 0;
}
qry = fmt("h=%s&amp;path=%s%s%s", curr_rev,
cgit_query_path ? cgit_query_path : "",
cgit_query_path ? "/" : "", pathname);
url = cgit_pageurl(cgit_query_repo, "tree", qry);
html("<tr><td class='filemode'>");
html_filemode(mode);
html("</td><td ");
if (S_ISDIRLNK(mode)) {
htmlf("class='ls-mod'><a href='");
html_attr(fmt(cgit_repo->module_link,
name,
sha1_to_hex(sha1)));
} else if (S_ISDIR(mode)) {
html("class='ls-dir'><a href='");
html_attr(url);
} else {
html("class='ls-blob'><a href='");
html_attr(url);
}
htmlf("'>%s</a></td>", name);
htmlf("<td class='filesize'>%li</td>", size);
html("<td class='links'><a href='");
qry = fmt("h=%s&amp;path=%s%s%s", curr_rev,
cgit_query_path ? cgit_query_path : "",
cgit_query_path ? "/" : "", pathname);
url = cgit_pageurl(cgit_query_repo, "log", qry);
html_attr(url);