summaryrefslogtreecommitdiffabout
authorMark Lodato <lodatom@gmail.com>2010-01-31 19:25:03 (UTC)
committer Mark Lodato <lodatom@gmail.com>2010-01-31 22:10:00 (UTC)
commit6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1 (patch) (unidiff)
treef26eb786154d85d218ad37bc5b27ec9927df181c
parent74ebf82229829bbdbe74a4d9a7b6f29d2889dfc8 (diff)
downloadcgit-6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1.zip
cgit-6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1.tar.gz
cgit-6c1a7364557b5a19ecef3079e9bdad5c1acb3cb1.tar.bz2
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c48
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
@@ -1,100 +1,146 @@
1/* ui-plain.c: functions for output of plain blobs by path 1/* ui-plain.c: functions for output of plain blobs by path
2 * 2 *
3 * Copyright (C) 2008 Lars Hjemli 3 * Copyright (C) 2008 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13int match_baselen; 13int match_baselen;
14int match; 14int match;
15 15
16static void print_object(const unsigned char *sha1, const char *path) 16static void print_object(const unsigned char *sha1, const char *path)
17{ 17{
18 enum object_type type; 18 enum object_type type;
19 char *buf, *ext; 19 char *buf, *ext;
20 unsigned long size; 20 unsigned long size;
21 struct string_list_item *mime; 21 struct string_list_item *mime;
22 22
23 type = sha1_object_info(sha1, &size); 23 type = sha1_object_info(sha1, &size);
24 if (type == OBJ_BAD) { 24 if (type == OBJ_BAD) {
25 html_status(404, "Not found", 0); 25 html_status(404, "Not found", 0);
26 return; 26 return;
27 } 27 }
28 28
29 buf = read_sha1_file(sha1, &type, &size); 29 buf = read_sha1_file(sha1, &type, &size);
30 if (!buf) { 30 if (!buf) {
31 html_status(404, "Not found", 0); 31 html_status(404, "Not found", 0);
32 return; 32 return;
33 } 33 }
34 ctx.page.mimetype = NULL; 34 ctx.page.mimetype = NULL;
35 ext = strrchr(path, '.'); 35 ext = strrchr(path, '.');
36 if (ext && *(++ext)) { 36 if (ext && *(++ext)) {
37 mime = string_list_lookup(ext, &ctx.cfg.mimetypes); 37 mime = string_list_lookup(ext, &ctx.cfg.mimetypes);
38 if (mime) 38 if (mime)
39 ctx.page.mimetype = (char *)mime->util; 39 ctx.page.mimetype = (char *)mime->util;
40 } 40 }
41 if (!ctx.page.mimetype) { 41 if (!ctx.page.mimetype) {
42 if (buffer_is_binary(buf, size)) 42 if (buffer_is_binary(buf, size))
43 ctx.page.mimetype = "application/octet-stream"; 43 ctx.page.mimetype = "application/octet-stream";
44 else 44 else
45 ctx.page.mimetype = "text/plain"; 45 ctx.page.mimetype = "text/plain";
46 } 46 }
47 ctx.page.filename = fmt("%s", path); 47 ctx.page.filename = fmt("%s", path);
48 ctx.page.size = size; 48 ctx.page.size = size;
49 ctx.page.etag = sha1_to_hex(sha1); 49 ctx.page.etag = sha1_to_hex(sha1);
50 cgit_print_http_headers(&ctx); 50 cgit_print_http_headers(&ctx);
51 html_raw(buf, size); 51 html_raw(buf, size);
52 match = 1; 52 match = 1;
53} 53}
54 54
55static 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
72static 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
82static void print_dir_tail(void)
83{
84 html(" </ul>\n</body></html>\n");
85}
86
55static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 87static 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)
58{ 90{
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
66 return 0; 104 return 0;
67} 105}
68 106
69static int basedir_len(const char *path) 107static int basedir_len(const char *path)
70{ 108{
71 char *p = strrchr(path, '/'); 109 char *p = strrchr(path, '/');
72 if (p) 110 if (p)
73 return p - path + 1; 111 return p - path + 1;
74 return 0; 112 return 0;
75} 113}
76 114
77void cgit_print_plain(struct cgit_context *ctx) 115void cgit_print_plain(struct cgit_context *ctx)
78{ 116{
79 const char *rev = ctx->qry.sha1; 117 const char *rev = ctx->qry.sha1;
80 unsigned char sha1[20]; 118 unsigned char sha1[20];
81 struct commit *commit; 119 struct commit *commit;
82 const char *paths[] = {ctx->qry.path, NULL}; 120 const char *paths[] = {ctx->qry.path, NULL};
83 121
84 if (!rev) 122 if (!rev)
85 rev = ctx->qry.head; 123 rev = ctx->qry.head;
86 124
87 if (get_sha1(rev, sha1)) { 125 if (get_sha1(rev, sha1)) {
88 html_status(404, "Not found", 0); 126 html_status(404, "Not found", 0);
89 return; 127 return;
90 } 128 }
91 commit = lookup_commit_reference(sha1); 129 commit = lookup_commit_reference(sha1);
92 if (!commit || parse_commit(commit)) { 130 if (!commit || parse_commit(commit)) {
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}