X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/74ebf82229829bbdbe74a4d9a7b6f29d2889dfc8..afdff8dc1327ed14c94cf447272191bd28009ed1:/ui-plain.c
diff --git a/ui-plain.c b/ui-plain.c
index 8b0badd..733db4d 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -34,7 +34,7 @@ static void print_object(const unsigned char *sha1, const char *path)
ctx.page.mimetype = NULL;
ext = strrchr(path, '.');
if (ext && *(++ext)) {
- mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
+ mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
if (mime)
ctx.page.mimetype = (char *)mime->util;
}
@@ -52,6 +52,65 @@ static void print_object(const unsigned char *sha1, const char *path)
match = 1;
}
+static char *buildpath(const char *base, int baselen, const char *path)
+{
+ if (path[0])
+ return fmt("%.*s%s/", baselen, base, path);
+ else
+ return fmt("%.*s/", baselen, base);
+}
+
+static void print_dir(const unsigned char *sha1, const char *base,
+ int baselen, const char *path)
+{
+ char *fullpath, *slash;
+ size_t len;
+
+ fullpath = buildpath(base, baselen, path);
+ slash = (fullpath[0] == '/' ? "" : "/");
+ ctx.page.etag = sha1_to_hex(sha1);
+ cgit_print_http_headers(&ctx);
+ htmlf("%s", slash);
+ html_txt(fullpath);
+ htmlf("\n\n%s", slash);
+ html_txt(fullpath);
+ html("
\n\n");
+ len = strlen(fullpath);
+ if (len > 1) {
+ fullpath[len - 1] = 0;
+ slash = strrchr(fullpath, '/');
+ if (slash)
+ *(slash + 1) = 0;
+ else
+ fullpath = NULL;
+ html("- ");
+ cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ fullpath);
+ html("
\n");
+ }
+ match = 2;
+}
+
+static void print_dir_entry(const unsigned char *sha1, const char *base,
+ int baselen, const char *path, unsigned mode)
+{
+ char *fullpath;
+
+ fullpath = buildpath(base, baselen, path);
+ if (!S_ISDIR(mode))
+ fullpath[strlen(fullpath) - 1] = 0;
+ html(" - ");
+ cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+ fullpath);
+ html("
\n");
+ match = 2;
+}
+
+static void print_dir_tail(void)
+{
+ html("
\n\n");
+}
+
static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
const char *pathname, unsigned mode, int stage,
void *cbdata)
@@ -59,7 +118,13 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
if (baselen == match_baselen) {
if (S_ISREG(mode))
print_object(sha1, pathname);
+ else if (S_ISDIR(mode)) {
+ print_dir(sha1, base, baselen, pathname);
+ return READ_TREE_RECURSIVE;
+ }
}
+ else if (baselen > match_baselen)
+ print_dir_entry(sha1, base, baselen, pathname, mode);
else if (S_ISDIR(mode))
return READ_TREE_RECURSIVE;
@@ -93,8 +158,16 @@ void cgit_print_plain(struct cgit_context *ctx)
html_status(404, "Not found", 0);
return;
}
- match_baselen = basedir_len(paths[0]);
+ if (!paths[0]) {
+ paths[0] = "";
+ match_baselen = -1;
+ print_dir(commit->tree->object.sha1, "", 0, "");
+ }
+ else
+ match_baselen = basedir_len(paths[0]);
read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
if (!match)
html_status(404, "Not found", 0);
+ else if (match == 2)
+ print_dir_tail();
}