diff options
| author | Mark Lodato | 2010-01-31 14:25:03 -0500 |
|---|---|---|
| committer | Mark Lodato | 2010-01-31 17:10:00 -0500 |
| commit | 6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1 (patch) | |
| tree | f26eb786154d85d218ad37bc5b27ec9927df181c | |
| parent | ui-plain: more efficient walk_tree() (diff) | |
| download | cgit-6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1.tar.gz cgit-6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1.zip | |
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 <lodatom@gmail.com>
| -rw-r--r-- | ui-plain.c | 48 |
1 files changed, 47 insertions, 1 deletions
| 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) | |||
| 52 | match = 1; | 52 | match = 1; |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | static void print_dir(const unsigned char *sha1, const char *path, | ||
| 56 | const char *base) | ||
| 57 | { | ||
| 58 | char *fullpath; | ||
| 59 | if (path[0] || base[0]) | ||
| 60 | fullpath = fmt("/%s%s/", base, path); | ||
| 61 | else | ||
| 62 | fullpath = "/"; | ||
| 63 | ctx.page.etag = sha1_to_hex(sha1); | ||
| 64 | cgit_print_http_headers(&ctx); | ||
| 65 | htmlf("<html><head><title>%s</title></head>\n<body>\n" | ||
| 66 | " <h2>%s</h2>\n <ul>\n", fullpath, fullpath); | ||
| 67 | if (path[0] || base[0]) | ||
| 68 | html(" <li><a href=\"../\">../</a></li>\n"); | ||
| 69 | match = 2; | ||
| 70 | } | ||
| 71 | |||
| 72 | static void print_dir_entry(const unsigned char *sha1, const char *path, | ||
| 73 | unsigned mode) | ||
| 74 | { | ||
| 75 | const char *sep = ""; | ||
| 76 | if (S_ISDIR(mode)) | ||
| 77 | sep = "/"; | ||
| 78 | htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep); | ||
| 79 | match = 2; | ||
| 80 | } | ||
| 81 | |||
| 82 | static void print_dir_tail(void) | ||
| 83 | { | ||
| 84 | html(" </ul>\n</body></html>\n"); | ||
| 85 | } | ||
| 86 | |||
| 55 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | 87 | static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
| 56 | const char *pathname, unsigned mode, int stage, | 88 | const char *pathname, unsigned mode, int stage, |
| 57 | void *cbdata) | 89 | void *cbdata) |
| @@ -59,7 +91,13 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, | |||
| 59 | if (baselen == match_baselen) { | 91 | if (baselen == match_baselen) { |
| 60 | if (S_ISREG(mode)) | 92 | if (S_ISREG(mode)) |
| 61 | print_object(sha1, pathname); | 93 | print_object(sha1, pathname); |
| 94 | else if (S_ISDIR(mode)) { | ||
| 95 | print_dir(sha1, pathname, base); | ||
| 96 | return READ_TREE_RECURSIVE; | ||
| 97 | } | ||
| 62 | } | 98 | } |
| 99 | else if (baselen > match_baselen) | ||
| 100 | print_dir_entry(sha1, pathname, mode); | ||
| 63 | else if (S_ISDIR(mode)) | 101 | else if (S_ISDIR(mode)) |
| 64 | return READ_TREE_RECURSIVE; | 102 | return READ_TREE_RECURSIVE; |
| 65 | 103 | ||
| @@ -93,8 +131,16 @@ void cgit_print_plain(struct cgit_context *ctx) | |||
| 93 | html_status(404, "Not found", 0); | 131 | html_status(404, "Not found", 0); |
| 94 | return; | 132 | return; |
| 95 | } | 133 | } |
| 96 | match_baselen = basedir_len(paths[0]); | 134 | if (!paths[0]) { |
| 135 | paths[0] = ""; | ||
| 136 | match_baselen = -1; | ||
| 137 | print_dir(commit->tree->object.sha1, "", ""); | ||
| 138 | } | ||
| 139 | else | ||
| 140 | match_baselen = basedir_len(paths[0]); | ||
| 97 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); | 141 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
| 98 | if (!match) | 142 | if (!match) |
| 99 | html_status(404, "Not found", 0); | 143 | html_status(404, "Not found", 0); |
| 144 | else if (match == 2) | ||
| 145 | print_dir_tail(); | ||
| 100 | } | 146 | } |