%s

From 89082346d50ec283a16d3127677f30b427781b6a Mon Sep 17 00:00:00 2001 From: Mark Lodato Date: Sat, 30 Jan 2010 23:54:16 -0500 Subject: ui-plain: remove unused curr_rev variable Signed-off-by: Mark Lodato --- ui-plain.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/ui-plain.c b/ui-plain.c index 66cb19c..98e6908 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -10,7 +10,6 @@ #include "html.h" #include "ui-shared.h" -char *curr_rev; char *match_path; int match; @@ -77,7 +76,6 @@ void cgit_print_plain(struct cgit_context *ctx) if (!rev) rev = ctx->qry.head; - curr_rev = xstrdup(rev); if (get_sha1(rev, sha1)) { html_status(404, "Not found", 0); return; -- cgit From 74ebf82229829bbdbe74a4d9a7b6f29d2889dfc8 Mon Sep 17 00:00:00 2001 From: Mark Lodato Date: Sun, 31 Jan 2010 01:07:41 -0500 Subject: ui-plain: more efficient walk_tree() Git's read_tree_recursive() already filters out the objects by pathname, so we only have to compare baselen to the expected. That is, no string matching is required. Additionally, if the requested path is a directory, the old code would walk through all of its immediate children. This is not necessary, this so we no longer do that. Signed-off-by: Mark Lodato --- ui-plain.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/ui-plain.c b/ui-plain.c index 98e6908..8b0badd 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -10,7 +10,7 @@ #include "html.h" #include "ui-shared.h" -char *match_path; +int match_baselen; int match; static void print_object(const unsigned char *sha1, const char *path) @@ -56,13 +56,21 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, void *cbdata) { - if (S_ISDIR(mode)) + if (baselen == match_baselen) { + if (S_ISREG(mode)) + print_object(sha1, pathname); + } + else if (S_ISDIR(mode)) return READ_TREE_RECURSIVE; - if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && - !strcmp(pathname, match_path + baselen)) - print_object(sha1, pathname); + return 0; +} +static int basedir_len(const char *path) +{ + char *p = strrchr(path, '/'); + if (p) + return p - path + 1; return 0; } @@ -85,7 +93,7 @@ void cgit_print_plain(struct cgit_context *ctx) html_status(404, "Not found", 0); return; } - match_path = ctx->qry.path; + 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); -- cgit From 6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1 Mon Sep 17 00:00:00 2001 From: Mark Lodato Date: Sun, 31 Jan 2010 14:25:03 -0500 Subject: ui-plain: print directory listings When a user requests a plain view of a tree (as opposed to a blob), print out a directory listing rather than giving a 404 Not Found. Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is requested without a path. Signed-off-by: Mark Lodato --- ui-plain.c | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/ui-plain.c b/ui-plain.c index 8b0badd..da76406 100644 --- a/ui-plain.c +++ b/ui-plain.c @@ -52,6 +52,38 @@ static void print_object(const unsigned char *sha1, const char *path) 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("%s\n\n" + "

%s

../
%s%s

\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 +91,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, 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; @@ -93,8 +131,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, "", ""); + } + 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(); } -- cgit