mirrors/cgit
0
0
Fork 0
mirror of https://git.zx2c4.com/cgit synced 2024-11-25 01:48:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ml/plain-improvements-part1'

Browse Source
This commit is contained in:
Lars Hjemli 2010-06-19 11:40:34 +02:00
commit d6dc3aee9a
1 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
ui-plain.c
View File

@ -10,8 +10,7 @@
#include "html.h" #include "html.h"
#include "ui-shared.h" #include "ui-shared.h"
char *curr_rev; int match_baselen;
char *match_path;
int match; int match;
static void print_object(const unsigned char *sha1, const char *path) static void print_object(const unsigned char *sha1, const char *path)
@ -53,17 +52,63 @@ static void print_object(const unsigned char *sha1, const char *path)
match = 1; match = 1;
} }
static void print_dir(const unsigned char *sha1, const char *path,
const char *base)
{
char *fullpath;
if (path[0] || base[0])
fullpath = fmt("/%s%s/", base, path);
else
fullpath = "/";
ctx.page.etag = sha1_to_hex(sha1);
cgit_print_http_headers(&ctx);
htmlf("<html><head><title>%s</title></head>\n<body>\n"
" <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
if (path[0] || base[0])
html(" <li><a href=\"../\">../</a></li>\n");
match = 2;
}
static void print_dir_entry(const unsigned char *sha1, const char *path,
unsigned mode)
{
const char *sep = "";
if (S_ISDIR(mode))
sep = "/";
htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
match = 2;
}
static void print_dir_tail(void)
{
html(" </ul>\n</body></html>\n");
}
static int walk_tree(const unsigned char *sha1, const char *base, int baselen, static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned mode, int stage, const char *pathname, unsigned mode, int stage,
void *cbdata) void *cbdata)
{ {
if (S_ISDIR(mode)) if (baselen == match_baselen) {
if (S_ISREG(mode))
print_object(sha1, pathname);
else if (S_ISDIR(mode)) {
print_dir(sha1, pathname, base);
return READ_TREE_RECURSIVE;
}
}
else if (baselen > match_baselen)
print_dir_entry(sha1, pathname, mode);
else if (S_ISDIR(mode))
return READ_TREE_RECURSIVE; return READ_TREE_RECURSIVE;
if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && return 0;
!strcmp(pathname, match_path + baselen)) }
print_object(sha1, pathname);
static int basedir_len(const char *path)
{
char *p = strrchr(path, '/');
if (p)
return p - path + 1;
return 0; return 0;
} }
@ -77,7 +122,6 @@ void cgit_print_plain(struct cgit_context *ctx)
if (!rev) if (!rev)
rev = ctx->qry.head; rev = ctx->qry.head;
curr_rev = xstrdup(rev);
if (get_sha1(rev, sha1)) { if (get_sha1(rev, sha1)) {
html_status(404, "Not found", 0); html_status(404, "Not found", 0);
return; return;
@ -87,8 +131,16 @@ void cgit_print_plain(struct cgit_context *ctx)
html_status(404, "Not found", 0); html_status(404, "Not found", 0);
return; return;
} }
match_path = ctx->qry.path; if (!paths[0]) {
paths[0] = "";
match_baselen = -1;
print_dir(commit->tree->object.sha1, "", "");
}
else
match_baselen = basedir_len(paths[0]);
read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
if (!match) if (!match)
html_status(404, "Not found", 0); html_status(404, "Not found", 0);
else if (match == 2)
print_dir_tail();
} }