|
|
|
| @@ -11,6 +11,5 @@ |
| 11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
| 12 | |
12 | |
| 13 | char *curr_rev; |
13 | int match_baselen; |
| 14 | char *match_path; |
| |
| 15 | int match; |
14 | int match; |
| 16 | |
15 | |
| @@ -54,15 +53,61 @@ static void print_object(const unsigned char *sha1, const char *path) |
| 54 | } |
53 | } |
| 55 | |
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 | |
| 56 | 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, |
| 57 | const char *pathname, unsigned mode, int stage, |
88 | const char *pathname, unsigned mode, int stage, |
| 58 | void *cbdata) |
89 | void *cbdata) |
| 59 | { |
90 | { |
| 60 | if (S_ISDIR(mode)) |
91 | if (baselen == match_baselen) { |
| |
92 | if (S_ISREG(mode)) |
| |
93 | print_object(sha1, pathname); |
| |
94 | else if (S_ISDIR(mode)) { |
| |
95 | print_dir(sha1, pathname, base); |
| |
96 | return READ_TREE_RECURSIVE; |
| |
97 | } |
| |
98 | } |
| |
99 | else if (baselen > match_baselen) |
| |
100 | print_dir_entry(sha1, pathname, mode); |
| |
101 | else if (S_ISDIR(mode)) |
| 61 | return READ_TREE_RECURSIVE; |
102 | return READ_TREE_RECURSIVE; |
| 62 | |
103 | |
| 63 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && |
104 | return 0; |
| 64 | !strcmp(pathname, match_path + baselen)) |
105 | } |
| 65 | print_object(sha1, pathname); |
| |
| 66 | |
106 | |
| |
107 | static int basedir_len(const char *path) |
| |
108 | { |
| |
109 | char *p = strrchr(path, '/'); |
| |
110 | if (p) |
| |
111 | return p - path + 1; |
| 67 | return 0; |
112 | return 0; |
| 68 | } |
113 | } |
| @@ -78,5 +123,4 @@ void cgit_print_plain(struct cgit_context *ctx) |
| 78 | rev = ctx->qry.head; |
123 | rev = ctx->qry.head; |
| 79 | |
124 | |
| 80 | curr_rev = xstrdup(rev); |
| |
| 81 | if (get_sha1(rev, sha1)) { |
125 | if (get_sha1(rev, sha1)) { |
| 82 | html_status(404, "Not found", 0); |
126 | html_status(404, "Not found", 0); |
| @@ -88,7 +132,15 @@ void cgit_print_plain(struct cgit_context *ctx) |
| 88 | return; |
132 | return; |
| 89 | } |
133 | } |
| 90 | match_path = ctx->qry.path; |
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]); |
| 91 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
141 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
| 92 | if (!match) |
142 | if (!match) |
| 93 | html_status(404, "Not found", 0); |
143 | html_status(404, "Not found", 0); |
| |
144 | else if (match == 2) |
| |
145 | print_dir_tail(); |
| 94 | } |
146 | } |
|
