author | Mark Lodato <lodatom@gmail.com> | 2009-03-15 04:11:54 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-06-07 16:55:44 (UTC) |
commit | b5a3a2049648415e86d518a8bf2229b3e463b10f (patch) (unidiff) | |
tree | 37c44671e4557d38ba3d5905f0b595376aece5d6 | |
parent | 45e7fcecc1117440e6274ce3c6ab7d893c4986ee (diff) | |
download | cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.zip cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.gz cgit-b5a3a2049648415e86d518a8bf2229b3e463b10f.tar.bz2 |
Add head-include configuration option.
This patch adds an option to the configuration file, "head-include",
which works just like "header" or "footer", except the content is put
into the HTML's <head> tag.
-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | ui-shared.c | 4 |
3 files changed, 6 insertions, 1 deletions
@@ -1,486 +1,488 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | #include "ui-stats.h" | 15 | #include "ui-stats.h" |
16 | #include "scan-tree.h" | 16 | #include "scan-tree.h" |
17 | 17 | ||
18 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
19 | 19 | ||
20 | void config_cb(const char *name, const char *value) | 20 | void config_cb(const char *name, const char *value) |
21 | { | 21 | { |
22 | if (!strcmp(name, "root-title")) | 22 | if (!strcmp(name, "root-title")) |
23 | ctx.cfg.root_title = xstrdup(value); | 23 | ctx.cfg.root_title = xstrdup(value); |
24 | else if (!strcmp(name, "root-desc")) | 24 | else if (!strcmp(name, "root-desc")) |
25 | ctx.cfg.root_desc = xstrdup(value); | 25 | ctx.cfg.root_desc = xstrdup(value); |
26 | else if (!strcmp(name, "root-readme")) | 26 | else if (!strcmp(name, "root-readme")) |
27 | ctx.cfg.root_readme = xstrdup(value); | 27 | ctx.cfg.root_readme = xstrdup(value); |
28 | else if (!strcmp(name, "css")) | 28 | else if (!strcmp(name, "css")) |
29 | ctx.cfg.css = xstrdup(value); | 29 | ctx.cfg.css = xstrdup(value); |
30 | else if (!strcmp(name, "favicon")) | 30 | else if (!strcmp(name, "favicon")) |
31 | ctx.cfg.favicon = xstrdup(value); | 31 | ctx.cfg.favicon = xstrdup(value); |
32 | else if (!strcmp(name, "footer")) | 32 | else if (!strcmp(name, "footer")) |
33 | ctx.cfg.footer = xstrdup(value); | 33 | ctx.cfg.footer = xstrdup(value); |
34 | else if (!strcmp(name, "head-include")) | ||
35 | ctx.cfg.head_include = xstrdup(value); | ||
34 | else if (!strcmp(name, "header")) | 36 | else if (!strcmp(name, "header")) |
35 | ctx.cfg.header = xstrdup(value); | 37 | ctx.cfg.header = xstrdup(value); |
36 | else if (!strcmp(name, "logo")) | 38 | else if (!strcmp(name, "logo")) |
37 | ctx.cfg.logo = xstrdup(value); | 39 | ctx.cfg.logo = xstrdup(value); |
38 | else if (!strcmp(name, "index-header")) | 40 | else if (!strcmp(name, "index-header")) |
39 | ctx.cfg.index_header = xstrdup(value); | 41 | ctx.cfg.index_header = xstrdup(value); |
40 | else if (!strcmp(name, "index-info")) | 42 | else if (!strcmp(name, "index-info")) |
41 | ctx.cfg.index_info = xstrdup(value); | 43 | ctx.cfg.index_info = xstrdup(value); |
42 | else if (!strcmp(name, "logo-link")) | 44 | else if (!strcmp(name, "logo-link")) |
43 | ctx.cfg.logo_link = xstrdup(value); | 45 | ctx.cfg.logo_link = xstrdup(value); |
44 | else if (!strcmp(name, "module-link")) | 46 | else if (!strcmp(name, "module-link")) |
45 | ctx.cfg.module_link = xstrdup(value); | 47 | ctx.cfg.module_link = xstrdup(value); |
46 | else if (!strcmp(name, "virtual-root")) { | 48 | else if (!strcmp(name, "virtual-root")) { |
47 | ctx.cfg.virtual_root = trim_end(value, '/'); | 49 | ctx.cfg.virtual_root = trim_end(value, '/'); |
48 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) | 50 | if (!ctx.cfg.virtual_root && (!strcmp(value, "/"))) |
49 | ctx.cfg.virtual_root = ""; | 51 | ctx.cfg.virtual_root = ""; |
50 | } else if (!strcmp(name, "nocache")) | 52 | } else if (!strcmp(name, "nocache")) |
51 | ctx.cfg.nocache = atoi(value); | 53 | ctx.cfg.nocache = atoi(value); |
52 | else if (!strcmp(name, "snapshots")) | 54 | else if (!strcmp(name, "snapshots")) |
53 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); | 55 | ctx.cfg.snapshots = cgit_parse_snapshots_mask(value); |
54 | else if (!strcmp(name, "enable-index-links")) | 56 | else if (!strcmp(name, "enable-index-links")) |
55 | ctx.cfg.enable_index_links = atoi(value); | 57 | ctx.cfg.enable_index_links = atoi(value); |
56 | else if (!strcmp(name, "enable-log-filecount")) | 58 | else if (!strcmp(name, "enable-log-filecount")) |
57 | ctx.cfg.enable_log_filecount = atoi(value); | 59 | ctx.cfg.enable_log_filecount = atoi(value); |
58 | else if (!strcmp(name, "enable-log-linecount")) | 60 | else if (!strcmp(name, "enable-log-linecount")) |
59 | ctx.cfg.enable_log_linecount = atoi(value); | 61 | ctx.cfg.enable_log_linecount = atoi(value); |
60 | else if (!strcmp(name, "max-stats")) | 62 | else if (!strcmp(name, "max-stats")) |
61 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); | 63 | ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); |
62 | else if (!strcmp(name, "cache-size")) | 64 | else if (!strcmp(name, "cache-size")) |
63 | ctx.cfg.cache_size = atoi(value); | 65 | ctx.cfg.cache_size = atoi(value); |
64 | else if (!strcmp(name, "cache-root")) | 66 | else if (!strcmp(name, "cache-root")) |
65 | ctx.cfg.cache_root = xstrdup(value); | 67 | ctx.cfg.cache_root = xstrdup(value); |
66 | else if (!strcmp(name, "cache-root-ttl")) | 68 | else if (!strcmp(name, "cache-root-ttl")) |
67 | ctx.cfg.cache_root_ttl = atoi(value); | 69 | ctx.cfg.cache_root_ttl = atoi(value); |
68 | else if (!strcmp(name, "cache-repo-ttl")) | 70 | else if (!strcmp(name, "cache-repo-ttl")) |
69 | ctx.cfg.cache_repo_ttl = atoi(value); | 71 | ctx.cfg.cache_repo_ttl = atoi(value); |
70 | else if (!strcmp(name, "cache-static-ttl")) | 72 | else if (!strcmp(name, "cache-static-ttl")) |
71 | ctx.cfg.cache_static_ttl = atoi(value); | 73 | ctx.cfg.cache_static_ttl = atoi(value); |
72 | else if (!strcmp(name, "cache-dynamic-ttl")) | 74 | else if (!strcmp(name, "cache-dynamic-ttl")) |
73 | ctx.cfg.cache_dynamic_ttl = atoi(value); | 75 | ctx.cfg.cache_dynamic_ttl = atoi(value); |
74 | else if (!strcmp(name, "max-message-length")) | 76 | else if (!strcmp(name, "max-message-length")) |
75 | ctx.cfg.max_msg_len = atoi(value); | 77 | ctx.cfg.max_msg_len = atoi(value); |
76 | else if (!strcmp(name, "max-repodesc-length")) | 78 | else if (!strcmp(name, "max-repodesc-length")) |
77 | ctx.cfg.max_repodesc_len = atoi(value); | 79 | ctx.cfg.max_repodesc_len = atoi(value); |
78 | else if (!strcmp(name, "max-repo-count")) | 80 | else if (!strcmp(name, "max-repo-count")) |
79 | ctx.cfg.max_repo_count = atoi(value); | 81 | ctx.cfg.max_repo_count = atoi(value); |
80 | else if (!strcmp(name, "max-commit-count")) | 82 | else if (!strcmp(name, "max-commit-count")) |
81 | ctx.cfg.max_commit_count = atoi(value); | 83 | ctx.cfg.max_commit_count = atoi(value); |
82 | else if (!strcmp(name, "summary-log")) | 84 | else if (!strcmp(name, "summary-log")) |
83 | ctx.cfg.summary_log = atoi(value); | 85 | ctx.cfg.summary_log = atoi(value); |
84 | else if (!strcmp(name, "summary-branches")) | 86 | else if (!strcmp(name, "summary-branches")) |
85 | ctx.cfg.summary_branches = atoi(value); | 87 | ctx.cfg.summary_branches = atoi(value); |
86 | else if (!strcmp(name, "summary-tags")) | 88 | else if (!strcmp(name, "summary-tags")) |
87 | ctx.cfg.summary_tags = atoi(value); | 89 | ctx.cfg.summary_tags = atoi(value); |
88 | else if (!strcmp(name, "agefile")) | 90 | else if (!strcmp(name, "agefile")) |
89 | ctx.cfg.agefile = xstrdup(value); | 91 | ctx.cfg.agefile = xstrdup(value); |
90 | else if (!strcmp(name, "renamelimit")) | 92 | else if (!strcmp(name, "renamelimit")) |
91 | ctx.cfg.renamelimit = atoi(value); | 93 | ctx.cfg.renamelimit = atoi(value); |
92 | else if (!strcmp(name, "robots")) | 94 | else if (!strcmp(name, "robots")) |
93 | ctx.cfg.robots = xstrdup(value); | 95 | ctx.cfg.robots = xstrdup(value); |
94 | else if (!strcmp(name, "clone-prefix")) | 96 | else if (!strcmp(name, "clone-prefix")) |
95 | ctx.cfg.clone_prefix = xstrdup(value); | 97 | ctx.cfg.clone_prefix = xstrdup(value); |
96 | else if (!strcmp(name, "local-time")) | 98 | else if (!strcmp(name, "local-time")) |
97 | ctx.cfg.local_time = atoi(value); | 99 | ctx.cfg.local_time = atoi(value); |
98 | else if (!strcmp(name, "repo.group")) | 100 | else if (!strcmp(name, "repo.group")) |
99 | ctx.cfg.repo_group = xstrdup(value); | 101 | ctx.cfg.repo_group = xstrdup(value); |
100 | else if (!strcmp(name, "repo.url")) | 102 | else if (!strcmp(name, "repo.url")) |
101 | ctx.repo = cgit_add_repo(value); | 103 | ctx.repo = cgit_add_repo(value); |
102 | else if (!strcmp(name, "repo.name")) | 104 | else if (!strcmp(name, "repo.name")) |
103 | ctx.repo->name = xstrdup(value); | 105 | ctx.repo->name = xstrdup(value); |
104 | else if (ctx.repo && !strcmp(name, "repo.path")) | 106 | else if (ctx.repo && !strcmp(name, "repo.path")) |
105 | ctx.repo->path = trim_end(value, '/'); | 107 | ctx.repo->path = trim_end(value, '/'); |
106 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) | 108 | else if (ctx.repo && !strcmp(name, "repo.clone-url")) |
107 | ctx.repo->clone_url = xstrdup(value); | 109 | ctx.repo->clone_url = xstrdup(value); |
108 | else if (ctx.repo && !strcmp(name, "repo.desc")) | 110 | else if (ctx.repo && !strcmp(name, "repo.desc")) |
109 | ctx.repo->desc = xstrdup(value); | 111 | ctx.repo->desc = xstrdup(value); |
110 | else if (ctx.repo && !strcmp(name, "repo.owner")) | 112 | else if (ctx.repo && !strcmp(name, "repo.owner")) |
111 | ctx.repo->owner = xstrdup(value); | 113 | ctx.repo->owner = xstrdup(value); |
112 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) | 114 | else if (ctx.repo && !strcmp(name, "repo.defbranch")) |
113 | ctx.repo->defbranch = xstrdup(value); | 115 | ctx.repo->defbranch = xstrdup(value); |
114 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) | 116 | else if (ctx.repo && !strcmp(name, "repo.snapshots")) |
115 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ | 117 | ctx.repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
116 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) | 118 | else if (ctx.repo && !strcmp(name, "repo.enable-log-filecount")) |
117 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 119 | ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
118 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) | 120 | else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount")) |
119 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 121 | ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
120 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) | 122 | else if (ctx.repo && !strcmp(name, "repo.max-stats")) |
121 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); | 123 | ctx.repo->max_stats = cgit_find_stats_period(value, NULL); |
122 | else if (ctx.repo && !strcmp(name, "repo.module-link")) | 124 | else if (ctx.repo && !strcmp(name, "repo.module-link")) |
123 | ctx.repo->module_link= xstrdup(value); | 125 | ctx.repo->module_link= xstrdup(value); |
124 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { | 126 | else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) { |
125 | if (*value == '/') | 127 | if (*value == '/') |
126 | ctx.repo->readme = xstrdup(value); | 128 | ctx.repo->readme = xstrdup(value); |
127 | else | 129 | else |
128 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); | 130 | ctx.repo->readme = xstrdup(fmt("%s/%s", ctx.repo->path, value)); |
129 | } else if (!strcmp(name, "include")) | 131 | } else if (!strcmp(name, "include")) |
130 | parse_configfile(value, config_cb); | 132 | parse_configfile(value, config_cb); |
131 | } | 133 | } |
132 | 134 | ||
133 | static void querystring_cb(const char *name, const char *value) | 135 | static void querystring_cb(const char *name, const char *value) |
134 | { | 136 | { |
135 | if (!strcmp(name,"r")) { | 137 | if (!strcmp(name,"r")) { |
136 | ctx.qry.repo = xstrdup(value); | 138 | ctx.qry.repo = xstrdup(value); |
137 | ctx.repo = cgit_get_repoinfo(value); | 139 | ctx.repo = cgit_get_repoinfo(value); |
138 | } else if (!strcmp(name, "p")) { | 140 | } else if (!strcmp(name, "p")) { |
139 | ctx.qry.page = xstrdup(value); | 141 | ctx.qry.page = xstrdup(value); |
140 | } else if (!strcmp(name, "url")) { | 142 | } else if (!strcmp(name, "url")) { |
141 | ctx.qry.url = xstrdup(value); | 143 | ctx.qry.url = xstrdup(value); |
142 | cgit_parse_url(value); | 144 | cgit_parse_url(value); |
143 | } else if (!strcmp(name, "qt")) { | 145 | } else if (!strcmp(name, "qt")) { |
144 | ctx.qry.grep = xstrdup(value); | 146 | ctx.qry.grep = xstrdup(value); |
145 | } else if (!strcmp(name, "q")) { | 147 | } else if (!strcmp(name, "q")) { |
146 | ctx.qry.search = xstrdup(value); | 148 | ctx.qry.search = xstrdup(value); |
147 | } else if (!strcmp(name, "h")) { | 149 | } else if (!strcmp(name, "h")) { |
148 | ctx.qry.head = xstrdup(value); | 150 | ctx.qry.head = xstrdup(value); |
149 | ctx.qry.has_symref = 1; | 151 | ctx.qry.has_symref = 1; |
150 | } else if (!strcmp(name, "id")) { | 152 | } else if (!strcmp(name, "id")) { |
151 | ctx.qry.sha1 = xstrdup(value); | 153 | ctx.qry.sha1 = xstrdup(value); |
152 | ctx.qry.has_sha1 = 1; | 154 | ctx.qry.has_sha1 = 1; |
153 | } else if (!strcmp(name, "id2")) { | 155 | } else if (!strcmp(name, "id2")) { |
154 | ctx.qry.sha2 = xstrdup(value); | 156 | ctx.qry.sha2 = xstrdup(value); |
155 | ctx.qry.has_sha1 = 1; | 157 | ctx.qry.has_sha1 = 1; |
156 | } else if (!strcmp(name, "ofs")) { | 158 | } else if (!strcmp(name, "ofs")) { |
157 | ctx.qry.ofs = atoi(value); | 159 | ctx.qry.ofs = atoi(value); |
158 | } else if (!strcmp(name, "path")) { | 160 | } else if (!strcmp(name, "path")) { |
159 | ctx.qry.path = trim_end(value, '/'); | 161 | ctx.qry.path = trim_end(value, '/'); |
160 | } else if (!strcmp(name, "name")) { | 162 | } else if (!strcmp(name, "name")) { |
161 | ctx.qry.name = xstrdup(value); | 163 | ctx.qry.name = xstrdup(value); |
162 | } else if (!strcmp(name, "mimetype")) { | 164 | } else if (!strcmp(name, "mimetype")) { |
163 | ctx.qry.mimetype = xstrdup(value); | 165 | ctx.qry.mimetype = xstrdup(value); |
164 | } else if (!strcmp(name, "s")){ | 166 | } else if (!strcmp(name, "s")){ |
165 | ctx.qry.sort = xstrdup(value); | 167 | ctx.qry.sort = xstrdup(value); |
166 | } else if (!strcmp(name, "showmsg")) { | 168 | } else if (!strcmp(name, "showmsg")) { |
167 | ctx.qry.showmsg = atoi(value); | 169 | ctx.qry.showmsg = atoi(value); |
168 | } else if (!strcmp(name, "period")) { | 170 | } else if (!strcmp(name, "period")) { |
169 | ctx.qry.period = xstrdup(value); | 171 | ctx.qry.period = xstrdup(value); |
170 | } | 172 | } |
171 | } | 173 | } |
172 | 174 | ||
173 | static void prepare_context(struct cgit_context *ctx) | 175 | static void prepare_context(struct cgit_context *ctx) |
174 | { | 176 | { |
175 | memset(ctx, 0, sizeof(ctx)); | 177 | memset(ctx, 0, sizeof(ctx)); |
176 | ctx->cfg.agefile = "info/web/last-modified"; | 178 | ctx->cfg.agefile = "info/web/last-modified"; |
177 | ctx->cfg.nocache = 0; | 179 | ctx->cfg.nocache = 0; |
178 | ctx->cfg.cache_size = 0; | 180 | ctx->cfg.cache_size = 0; |
179 | ctx->cfg.cache_dynamic_ttl = 5; | 181 | ctx->cfg.cache_dynamic_ttl = 5; |
180 | ctx->cfg.cache_max_create_time = 5; | 182 | ctx->cfg.cache_max_create_time = 5; |
181 | ctx->cfg.cache_repo_ttl = 5; | 183 | ctx->cfg.cache_repo_ttl = 5; |
182 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; | 184 | ctx->cfg.cache_root = CGIT_CACHE_ROOT; |
183 | ctx->cfg.cache_root_ttl = 5; | 185 | ctx->cfg.cache_root_ttl = 5; |
184 | ctx->cfg.cache_static_ttl = -1; | 186 | ctx->cfg.cache_static_ttl = -1; |
185 | ctx->cfg.css = "/cgit.css"; | 187 | ctx->cfg.css = "/cgit.css"; |
186 | ctx->cfg.logo = "/git-logo.png"; | 188 | ctx->cfg.logo = "/git-logo.png"; |
187 | ctx->cfg.local_time = 0; | 189 | ctx->cfg.local_time = 0; |
188 | ctx->cfg.max_repo_count = 50; | 190 | ctx->cfg.max_repo_count = 50; |
189 | ctx->cfg.max_commit_count = 50; | 191 | ctx->cfg.max_commit_count = 50; |
190 | ctx->cfg.max_lock_attempts = 5; | 192 | ctx->cfg.max_lock_attempts = 5; |
191 | ctx->cfg.max_msg_len = 80; | 193 | ctx->cfg.max_msg_len = 80; |
192 | ctx->cfg.max_repodesc_len = 80; | 194 | ctx->cfg.max_repodesc_len = 80; |
193 | ctx->cfg.max_stats = 0; | 195 | ctx->cfg.max_stats = 0; |
194 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | 196 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; |
195 | ctx->cfg.renamelimit = -1; | 197 | ctx->cfg.renamelimit = -1; |
196 | ctx->cfg.robots = "index, nofollow"; | 198 | ctx->cfg.robots = "index, nofollow"; |
197 | ctx->cfg.root_title = "Git repository browser"; | 199 | ctx->cfg.root_title = "Git repository browser"; |
198 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; | 200 | ctx->cfg.root_desc = "a fast webinterface for the git dscm"; |
199 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; | 201 | ctx->cfg.script_name = CGIT_SCRIPT_NAME; |
200 | ctx->cfg.summary_branches = 10; | 202 | ctx->cfg.summary_branches = 10; |
201 | ctx->cfg.summary_log = 10; | 203 | ctx->cfg.summary_log = 10; |
202 | ctx->cfg.summary_tags = 10; | 204 | ctx->cfg.summary_tags = 10; |
203 | ctx->page.mimetype = "text/html"; | 205 | ctx->page.mimetype = "text/html"; |
204 | ctx->page.charset = PAGE_ENCODING; | 206 | ctx->page.charset = PAGE_ENCODING; |
205 | ctx->page.filename = NULL; | 207 | ctx->page.filename = NULL; |
206 | ctx->page.size = 0; | 208 | ctx->page.size = 0; |
207 | ctx->page.modified = time(NULL); | 209 | ctx->page.modified = time(NULL); |
208 | ctx->page.expires = ctx->page.modified; | 210 | ctx->page.expires = ctx->page.modified; |
209 | } | 211 | } |
210 | 212 | ||
211 | struct refmatch { | 213 | struct refmatch { |
212 | char *req_ref; | 214 | char *req_ref; |
213 | char *first_ref; | 215 | char *first_ref; |
214 | int match; | 216 | int match; |
215 | }; | 217 | }; |
216 | 218 | ||
217 | int find_current_ref(const char *refname, const unsigned char *sha1, | 219 | int find_current_ref(const char *refname, const unsigned char *sha1, |
218 | int flags, void *cb_data) | 220 | int flags, void *cb_data) |
219 | { | 221 | { |
220 | struct refmatch *info; | 222 | struct refmatch *info; |
221 | 223 | ||
222 | info = (struct refmatch *)cb_data; | 224 | info = (struct refmatch *)cb_data; |
223 | if (!strcmp(refname, info->req_ref)) | 225 | if (!strcmp(refname, info->req_ref)) |
224 | info->match = 1; | 226 | info->match = 1; |
225 | if (!info->first_ref) | 227 | if (!info->first_ref) |
226 | info->first_ref = xstrdup(refname); | 228 | info->first_ref = xstrdup(refname); |
227 | return info->match; | 229 | return info->match; |
228 | } | 230 | } |
229 | 231 | ||
230 | char *find_default_branch(struct cgit_repo *repo) | 232 | char *find_default_branch(struct cgit_repo *repo) |
231 | { | 233 | { |
232 | struct refmatch info; | 234 | struct refmatch info; |
233 | char *ref; | 235 | char *ref; |
234 | 236 | ||
235 | info.req_ref = repo->defbranch; | 237 | info.req_ref = repo->defbranch; |
236 | info.first_ref = NULL; | 238 | info.first_ref = NULL; |
237 | info.match = 0; | 239 | info.match = 0; |
238 | for_each_branch_ref(find_current_ref, &info); | 240 | for_each_branch_ref(find_current_ref, &info); |
239 | if (info.match) | 241 | if (info.match) |
240 | ref = info.req_ref; | 242 | ref = info.req_ref; |
241 | else | 243 | else |
242 | ref = info.first_ref; | 244 | ref = info.first_ref; |
243 | if (ref) | 245 | if (ref) |
244 | ref = xstrdup(ref); | 246 | ref = xstrdup(ref); |
245 | return ref; | 247 | return ref; |
246 | } | 248 | } |
247 | 249 | ||
248 | static int prepare_repo_cmd(struct cgit_context *ctx) | 250 | static int prepare_repo_cmd(struct cgit_context *ctx) |
249 | { | 251 | { |
250 | char *tmp; | 252 | char *tmp; |
251 | unsigned char sha1[20]; | 253 | unsigned char sha1[20]; |
252 | int nongit = 0; | 254 | int nongit = 0; |
253 | 255 | ||
254 | setenv("GIT_DIR", ctx->repo->path, 1); | 256 | setenv("GIT_DIR", ctx->repo->path, 1); |
255 | setup_git_directory_gently(&nongit); | 257 | setup_git_directory_gently(&nongit); |
256 | if (nongit) { | 258 | if (nongit) { |
257 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 259 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
258 | "config error"); | 260 | "config error"); |
259 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 261 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
260 | ctx->repo = NULL; | 262 | ctx->repo = NULL; |
261 | cgit_print_http_headers(ctx); | 263 | cgit_print_http_headers(ctx); |
262 | cgit_print_docstart(ctx); | 264 | cgit_print_docstart(ctx); |
263 | cgit_print_pageheader(ctx); | 265 | cgit_print_pageheader(ctx); |
264 | cgit_print_error(tmp); | 266 | cgit_print_error(tmp); |
265 | cgit_print_docend(); | 267 | cgit_print_docend(); |
266 | return 1; | 268 | return 1; |
267 | } | 269 | } |
268 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 270 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
269 | 271 | ||
270 | if (!ctx->qry.head) { | 272 | if (!ctx->qry.head) { |
271 | ctx->qry.nohead = 1; | 273 | ctx->qry.nohead = 1; |
272 | ctx->qry.head = find_default_branch(ctx->repo); | 274 | ctx->qry.head = find_default_branch(ctx->repo); |
273 | ctx->repo->defbranch = ctx->qry.head; | 275 | ctx->repo->defbranch = ctx->qry.head; |
274 | } | 276 | } |
275 | 277 | ||
276 | if (!ctx->qry.head) { | 278 | if (!ctx->qry.head) { |
277 | cgit_print_http_headers(ctx); | 279 | cgit_print_http_headers(ctx); |
278 | cgit_print_docstart(ctx); | 280 | cgit_print_docstart(ctx); |
279 | cgit_print_pageheader(ctx); | 281 | cgit_print_pageheader(ctx); |
280 | cgit_print_error("Repository seems to be empty"); | 282 | cgit_print_error("Repository seems to be empty"); |
281 | cgit_print_docend(); | 283 | cgit_print_docend(); |
282 | return 1; | 284 | return 1; |
283 | } | 285 | } |
284 | 286 | ||
285 | if (get_sha1(ctx->qry.head, sha1)) { | 287 | if (get_sha1(ctx->qry.head, sha1)) { |
286 | tmp = xstrdup(ctx->qry.head); | 288 | tmp = xstrdup(ctx->qry.head); |
287 | ctx->qry.head = ctx->repo->defbranch; | 289 | ctx->qry.head = ctx->repo->defbranch; |
288 | cgit_print_http_headers(ctx); | 290 | cgit_print_http_headers(ctx); |
289 | cgit_print_docstart(ctx); | 291 | cgit_print_docstart(ctx); |
290 | cgit_print_pageheader(ctx); | 292 | cgit_print_pageheader(ctx); |
291 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 293 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
292 | cgit_print_docend(); | 294 | cgit_print_docend(); |
293 | return 1; | 295 | return 1; |
294 | } | 296 | } |
295 | return 0; | 297 | return 0; |
296 | } | 298 | } |
297 | 299 | ||
298 | static void process_request(void *cbdata) | 300 | static void process_request(void *cbdata) |
299 | { | 301 | { |
300 | struct cgit_context *ctx = cbdata; | 302 | struct cgit_context *ctx = cbdata; |
301 | struct cgit_cmd *cmd; | 303 | struct cgit_cmd *cmd; |
302 | 304 | ||
303 | cmd = cgit_get_cmd(ctx); | 305 | cmd = cgit_get_cmd(ctx); |
304 | if (!cmd) { | 306 | if (!cmd) { |
305 | ctx->page.title = "cgit error"; | 307 | ctx->page.title = "cgit error"; |
306 | cgit_print_http_headers(ctx); | 308 | cgit_print_http_headers(ctx); |
307 | cgit_print_docstart(ctx); | 309 | cgit_print_docstart(ctx); |
308 | cgit_print_pageheader(ctx); | 310 | cgit_print_pageheader(ctx); |
309 | cgit_print_error("Invalid request"); | 311 | cgit_print_error("Invalid request"); |
310 | cgit_print_docend(); | 312 | cgit_print_docend(); |
311 | return; | 313 | return; |
312 | } | 314 | } |
313 | 315 | ||
314 | if (cmd->want_repo && !ctx->repo) { | 316 | if (cmd->want_repo && !ctx->repo) { |
315 | cgit_print_http_headers(ctx); | 317 | cgit_print_http_headers(ctx); |
316 | cgit_print_docstart(ctx); | 318 | cgit_print_docstart(ctx); |
317 | cgit_print_pageheader(ctx); | 319 | cgit_print_pageheader(ctx); |
318 | cgit_print_error(fmt("No repository selected")); | 320 | cgit_print_error(fmt("No repository selected")); |
319 | cgit_print_docend(); | 321 | cgit_print_docend(); |
320 | return; | 322 | return; |
321 | } | 323 | } |
322 | 324 | ||
323 | if (ctx->repo && prepare_repo_cmd(ctx)) | 325 | if (ctx->repo && prepare_repo_cmd(ctx)) |
324 | return; | 326 | return; |
325 | 327 | ||
326 | if (cmd->want_layout) { | 328 | if (cmd->want_layout) { |
327 | cgit_print_http_headers(ctx); | 329 | cgit_print_http_headers(ctx); |
328 | cgit_print_docstart(ctx); | 330 | cgit_print_docstart(ctx); |
329 | cgit_print_pageheader(ctx); | 331 | cgit_print_pageheader(ctx); |
330 | } | 332 | } |
331 | 333 | ||
332 | cmd->fn(ctx); | 334 | cmd->fn(ctx); |
333 | 335 | ||
334 | if (cmd->want_layout) | 336 | if (cmd->want_layout) |
335 | cgit_print_docend(); | 337 | cgit_print_docend(); |
336 | } | 338 | } |
337 | 339 | ||
338 | int cmp_repos(const void *a, const void *b) | 340 | int cmp_repos(const void *a, const void *b) |
339 | { | 341 | { |
340 | const struct cgit_repo *ra = a, *rb = b; | 342 | const struct cgit_repo *ra = a, *rb = b; |
341 | return strcmp(ra->url, rb->url); | 343 | return strcmp(ra->url, rb->url); |
342 | } | 344 | } |
343 | 345 | ||
344 | void print_repo(struct cgit_repo *repo) | 346 | void print_repo(struct cgit_repo *repo) |
345 | { | 347 | { |
346 | printf("repo.url=%s\n", repo->url); | 348 | printf("repo.url=%s\n", repo->url); |
347 | printf("repo.name=%s\n", repo->name); | 349 | printf("repo.name=%s\n", repo->name); |
348 | printf("repo.path=%s\n", repo->path); | 350 | printf("repo.path=%s\n", repo->path); |
349 | if (repo->owner) | 351 | if (repo->owner) |
350 | printf("repo.owner=%s\n", repo->owner); | 352 | printf("repo.owner=%s\n", repo->owner); |
351 | if (repo->desc) | 353 | if (repo->desc) |
352 | printf("repo.desc=%s\n", repo->desc); | 354 | printf("repo.desc=%s\n", repo->desc); |
353 | if (repo->readme) | 355 | if (repo->readme) |
354 | printf("repo.readme=%s\n", repo->readme); | 356 | printf("repo.readme=%s\n", repo->readme); |
355 | printf("\n"); | 357 | printf("\n"); |
356 | } | 358 | } |
357 | 359 | ||
358 | void print_repolist(struct cgit_repolist *list) | 360 | void print_repolist(struct cgit_repolist *list) |
359 | { | 361 | { |
360 | int i; | 362 | int i; |
361 | 363 | ||
362 | for(i = 0; i < list->count; i++) | 364 | for(i = 0; i < list->count; i++) |
363 | print_repo(&list->repos[i]); | 365 | print_repo(&list->repos[i]); |
364 | } | 366 | } |
365 | 367 | ||
366 | 368 | ||
367 | static void cgit_parse_args(int argc, const char **argv) | 369 | static void cgit_parse_args(int argc, const char **argv) |
368 | { | 370 | { |
369 | int i; | 371 | int i; |
370 | int scan = 0; | 372 | int scan = 0; |
371 | 373 | ||
372 | for (i = 1; i < argc; i++) { | 374 | for (i = 1; i < argc; i++) { |
373 | if (!strncmp(argv[i], "--cache=", 8)) { | 375 | if (!strncmp(argv[i], "--cache=", 8)) { |
374 | ctx.cfg.cache_root = xstrdup(argv[i]+8); | 376 | ctx.cfg.cache_root = xstrdup(argv[i]+8); |
375 | } | 377 | } |
376 | if (!strcmp(argv[i], "--nocache")) { | 378 | if (!strcmp(argv[i], "--nocache")) { |
377 | ctx.cfg.nocache = 1; | 379 | ctx.cfg.nocache = 1; |
378 | } | 380 | } |
379 | if (!strncmp(argv[i], "--query=", 8)) { | 381 | if (!strncmp(argv[i], "--query=", 8)) { |
380 | ctx.qry.raw = xstrdup(argv[i]+8); | 382 | ctx.qry.raw = xstrdup(argv[i]+8); |
381 | } | 383 | } |
382 | if (!strncmp(argv[i], "--repo=", 7)) { | 384 | if (!strncmp(argv[i], "--repo=", 7)) { |
383 | ctx.qry.repo = xstrdup(argv[i]+7); | 385 | ctx.qry.repo = xstrdup(argv[i]+7); |
384 | } | 386 | } |
385 | if (!strncmp(argv[i], "--page=", 7)) { | 387 | if (!strncmp(argv[i], "--page=", 7)) { |
386 | ctx.qry.page = xstrdup(argv[i]+7); | 388 | ctx.qry.page = xstrdup(argv[i]+7); |
387 | } | 389 | } |
388 | if (!strncmp(argv[i], "--head=", 7)) { | 390 | if (!strncmp(argv[i], "--head=", 7)) { |
389 | ctx.qry.head = xstrdup(argv[i]+7); | 391 | ctx.qry.head = xstrdup(argv[i]+7); |
390 | ctx.qry.has_symref = 1; | 392 | ctx.qry.has_symref = 1; |
391 | } | 393 | } |
392 | if (!strncmp(argv[i], "--sha1=", 7)) { | 394 | if (!strncmp(argv[i], "--sha1=", 7)) { |
393 | ctx.qry.sha1 = xstrdup(argv[i]+7); | 395 | ctx.qry.sha1 = xstrdup(argv[i]+7); |
394 | ctx.qry.has_sha1 = 1; | 396 | ctx.qry.has_sha1 = 1; |
395 | } | 397 | } |
396 | if (!strncmp(argv[i], "--ofs=", 6)) { | 398 | if (!strncmp(argv[i], "--ofs=", 6)) { |
397 | ctx.qry.ofs = atoi(argv[i]+6); | 399 | ctx.qry.ofs = atoi(argv[i]+6); |
398 | } | 400 | } |
399 | if (!strncmp(argv[i], "--scan-tree=", 12)) { | 401 | if (!strncmp(argv[i], "--scan-tree=", 12)) { |
400 | scan++; | 402 | scan++; |
401 | scan_tree(argv[i] + 12); | 403 | scan_tree(argv[i] + 12); |
402 | } | 404 | } |
403 | } | 405 | } |
404 | if (scan) { | 406 | if (scan) { |
405 | qsort(cgit_repolist.repos, cgit_repolist.count, | 407 | qsort(cgit_repolist.repos, cgit_repolist.count, |
406 | sizeof(struct cgit_repo), cmp_repos); | 408 | sizeof(struct cgit_repo), cmp_repos); |
407 | print_repolist(&cgit_repolist); | 409 | print_repolist(&cgit_repolist); |
408 | exit(0); | 410 | exit(0); |
409 | } | 411 | } |
410 | } | 412 | } |
411 | 413 | ||
412 | static int calc_ttl() | 414 | static int calc_ttl() |
413 | { | 415 | { |
414 | if (!ctx.repo) | 416 | if (!ctx.repo) |
415 | return ctx.cfg.cache_root_ttl; | 417 | return ctx.cfg.cache_root_ttl; |
416 | 418 | ||
417 | if (!ctx.qry.page) | 419 | if (!ctx.qry.page) |
418 | return ctx.cfg.cache_repo_ttl; | 420 | return ctx.cfg.cache_repo_ttl; |
419 | 421 | ||
420 | if (ctx.qry.has_symref) | 422 | if (ctx.qry.has_symref) |
421 | return ctx.cfg.cache_dynamic_ttl; | 423 | return ctx.cfg.cache_dynamic_ttl; |
422 | 424 | ||
423 | if (ctx.qry.has_sha1) | 425 | if (ctx.qry.has_sha1) |
424 | return ctx.cfg.cache_static_ttl; | 426 | return ctx.cfg.cache_static_ttl; |
425 | 427 | ||
426 | return ctx.cfg.cache_repo_ttl; | 428 | return ctx.cfg.cache_repo_ttl; |
427 | } | 429 | } |
428 | 430 | ||
429 | int main(int argc, const char **argv) | 431 | int main(int argc, const char **argv) |
430 | { | 432 | { |
431 | const char *cgit_config_env = getenv("CGIT_CONFIG"); | 433 | const char *cgit_config_env = getenv("CGIT_CONFIG"); |
432 | const char *path; | 434 | const char *path; |
433 | char *qry; | 435 | char *qry; |
434 | int err, ttl; | 436 | int err, ttl; |
435 | 437 | ||
436 | prepare_context(&ctx); | 438 | prepare_context(&ctx); |
437 | cgit_repolist.length = 0; | 439 | cgit_repolist.length = 0; |
438 | cgit_repolist.count = 0; | 440 | cgit_repolist.count = 0; |
439 | cgit_repolist.repos = NULL; | 441 | cgit_repolist.repos = NULL; |
440 | 442 | ||
441 | if (getenv("SCRIPT_NAME")) | 443 | if (getenv("SCRIPT_NAME")) |
442 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); | 444 | ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME")); |
443 | if (getenv("QUERY_STRING")) | 445 | if (getenv("QUERY_STRING")) |
444 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); | 446 | ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); |
445 | cgit_parse_args(argc, argv); | 447 | cgit_parse_args(argc, argv); |
446 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, | 448 | parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG, |
447 | config_cb); | 449 | config_cb); |
448 | ctx.repo = NULL; | 450 | ctx.repo = NULL; |
449 | http_parse_querystring(ctx.qry.raw, querystring_cb); | 451 | http_parse_querystring(ctx.qry.raw, querystring_cb); |
450 | 452 | ||
451 | /* If virtual-root isn't specified in cgitrc, lets pretend | 453 | /* If virtual-root isn't specified in cgitrc, lets pretend |
452 | * that virtual-root equals SCRIPT_NAME. | 454 | * that virtual-root equals SCRIPT_NAME. |
453 | */ | 455 | */ |
454 | if (!ctx.cfg.virtual_root) | 456 | if (!ctx.cfg.virtual_root) |
455 | ctx.cfg.virtual_root = ctx.cfg.script_name; | 457 | ctx.cfg.virtual_root = ctx.cfg.script_name; |
456 | 458 | ||
457 | /* If no url parameter is specified on the querystring, lets | 459 | /* If no url parameter is specified on the querystring, lets |
458 | * use PATH_INFO as url. This allows cgit to work with virtual | 460 | * use PATH_INFO as url. This allows cgit to work with virtual |
459 | * urls without the need for rewriterules in the webserver (as | 461 | * urls without the need for rewriterules in the webserver (as |
460 | * long as PATH_INFO is included in the cache lookup key). | 462 | * long as PATH_INFO is included in the cache lookup key). |
461 | */ | 463 | */ |
462 | path = getenv("PATH_INFO"); | 464 | path = getenv("PATH_INFO"); |
463 | if (!ctx.qry.url && path) { | 465 | if (!ctx.qry.url && path) { |
464 | if (path[0] == '/') | 466 | if (path[0] == '/') |
465 | path++; | 467 | path++; |
466 | ctx.qry.url = xstrdup(path); | 468 | ctx.qry.url = xstrdup(path); |
467 | if (ctx.qry.raw) { | 469 | if (ctx.qry.raw) { |
468 | qry = ctx.qry.raw; | 470 | qry = ctx.qry.raw; |
469 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); | 471 | ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry)); |
470 | free(qry); | 472 | free(qry); |
471 | } else | 473 | } else |
472 | ctx.qry.raw = ctx.qry.url; | 474 | ctx.qry.raw = ctx.qry.url; |
473 | cgit_parse_url(ctx.qry.url); | 475 | cgit_parse_url(ctx.qry.url); |
474 | } | 476 | } |
475 | 477 | ||
476 | ttl = calc_ttl(); | 478 | ttl = calc_ttl(); |
477 | ctx.page.expires += ttl*60; | 479 | ctx.page.expires += ttl*60; |
478 | if (ctx.cfg.nocache) | 480 | if (ctx.cfg.nocache) |
479 | ctx.cfg.cache_size = 0; | 481 | ctx.cfg.cache_size = 0; |
480 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, | 482 | err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root, |
481 | ctx.qry.raw, ttl, process_request, &ctx); | 483 | ctx.qry.raw, ttl, process_request, &ctx); |
482 | if (err) | 484 | if (err) |
483 | cgit_print_error(fmt("Error processing page: %s (%d)", | 485 | cgit_print_error(fmt("Error processing page: %s (%d)", |
484 | strerror(err), err)); | 486 | strerror(err), err)); |
485 | return err; | 487 | return err; |
486 | } | 488 | } |
@@ -1,246 +1,247 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff-interface.h> | 18 | #include <xdiff-interface.h> |
19 | #include <xdiff/xdiff.h> | 19 | #include <xdiff/xdiff.h> |
20 | #include <utf8.h> | 20 | #include <utf8.h> |
21 | 21 | ||
22 | 22 | ||
23 | /* | 23 | /* |
24 | * Dateformats used on misc. pages | 24 | * Dateformats used on misc. pages |
25 | */ | 25 | */ |
26 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 26 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
27 | #define FMT_SHORTDATE "%Y-%m-%d" | 27 | #define FMT_SHORTDATE "%Y-%m-%d" |
28 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 28 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
29 | 29 | ||
30 | 30 | ||
31 | /* | 31 | /* |
32 | * Limits used for relative dates | 32 | * Limits used for relative dates |
33 | */ | 33 | */ |
34 | #define TM_MIN 60 | 34 | #define TM_MIN 60 |
35 | #define TM_HOUR (TM_MIN * 60) | 35 | #define TM_HOUR (TM_MIN * 60) |
36 | #define TM_DAY (TM_HOUR * 24) | 36 | #define TM_DAY (TM_HOUR * 24) |
37 | #define TM_WEEK (TM_DAY * 7) | 37 | #define TM_WEEK (TM_DAY * 7) |
38 | #define TM_YEAR (TM_DAY * 365) | 38 | #define TM_YEAR (TM_DAY * 365) |
39 | #define TM_MONTH (TM_YEAR / 12.0) | 39 | #define TM_MONTH (TM_YEAR / 12.0) |
40 | 40 | ||
41 | 41 | ||
42 | /* | 42 | /* |
43 | * Default encoding | 43 | * Default encoding |
44 | */ | 44 | */ |
45 | #define PAGE_ENCODING "UTF-8" | 45 | #define PAGE_ENCODING "UTF-8" |
46 | 46 | ||
47 | typedef void (*configfn)(const char *name, const char *value); | 47 | typedef void (*configfn)(const char *name, const char *value); |
48 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 48 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
49 | typedef void (*linediff_fn)(char *line, int len); | 49 | typedef void (*linediff_fn)(char *line, int len); |
50 | 50 | ||
51 | struct cgit_repo { | 51 | struct cgit_repo { |
52 | char *url; | 52 | char *url; |
53 | char *name; | 53 | char *name; |
54 | char *path; | 54 | char *path; |
55 | char *desc; | 55 | char *desc; |
56 | char *owner; | 56 | char *owner; |
57 | char *defbranch; | 57 | char *defbranch; |
58 | char *group; | 58 | char *group; |
59 | char *module_link; | 59 | char *module_link; |
60 | char *readme; | 60 | char *readme; |
61 | char *clone_url; | 61 | char *clone_url; |
62 | int snapshots; | 62 | int snapshots; |
63 | int enable_log_filecount; | 63 | int enable_log_filecount; |
64 | int enable_log_linecount; | 64 | int enable_log_linecount; |
65 | int max_stats; | 65 | int max_stats; |
66 | time_t mtime; | 66 | time_t mtime; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | struct cgit_repolist { | 69 | struct cgit_repolist { |
70 | int length; | 70 | int length; |
71 | int count; | 71 | int count; |
72 | struct cgit_repo *repos; | 72 | struct cgit_repo *repos; |
73 | }; | 73 | }; |
74 | 74 | ||
75 | struct commitinfo { | 75 | struct commitinfo { |
76 | struct commit *commit; | 76 | struct commit *commit; |
77 | char *author; | 77 | char *author; |
78 | char *author_email; | 78 | char *author_email; |
79 | unsigned long author_date; | 79 | unsigned long author_date; |
80 | char *committer; | 80 | char *committer; |
81 | char *committer_email; | 81 | char *committer_email; |
82 | unsigned long committer_date; | 82 | unsigned long committer_date; |
83 | char *subject; | 83 | char *subject; |
84 | char *msg; | 84 | char *msg; |
85 | char *msg_encoding; | 85 | char *msg_encoding; |
86 | }; | 86 | }; |
87 | 87 | ||
88 | struct taginfo { | 88 | struct taginfo { |
89 | char *tagger; | 89 | char *tagger; |
90 | char *tagger_email; | 90 | char *tagger_email; |
91 | unsigned long tagger_date; | 91 | unsigned long tagger_date; |
92 | char *msg; | 92 | char *msg; |
93 | }; | 93 | }; |
94 | 94 | ||
95 | struct refinfo { | 95 | struct refinfo { |
96 | const char *refname; | 96 | const char *refname; |
97 | struct object *object; | 97 | struct object *object; |
98 | union { | 98 | union { |
99 | struct taginfo *tag; | 99 | struct taginfo *tag; |
100 | struct commitinfo *commit; | 100 | struct commitinfo *commit; |
101 | }; | 101 | }; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | struct reflist { | 104 | struct reflist { |
105 | struct refinfo **refs; | 105 | struct refinfo **refs; |
106 | int alloc; | 106 | int alloc; |
107 | int count; | 107 | int count; |
108 | }; | 108 | }; |
109 | 109 | ||
110 | struct cgit_query { | 110 | struct cgit_query { |
111 | int has_symref; | 111 | int has_symref; |
112 | int has_sha1; | 112 | int has_sha1; |
113 | char *raw; | 113 | char *raw; |
114 | char *repo; | 114 | char *repo; |
115 | char *page; | 115 | char *page; |
116 | char *search; | 116 | char *search; |
117 | char *grep; | 117 | char *grep; |
118 | char *head; | 118 | char *head; |
119 | char *sha1; | 119 | char *sha1; |
120 | char *sha2; | 120 | char *sha2; |
121 | char *path; | 121 | char *path; |
122 | char *name; | 122 | char *name; |
123 | char *mimetype; | 123 | char *mimetype; |
124 | char *url; | 124 | char *url; |
125 | char *period; | 125 | char *period; |
126 | int ofs; | 126 | int ofs; |
127 | int nohead; | 127 | int nohead; |
128 | char *sort; | 128 | char *sort; |
129 | int showmsg; | 129 | int showmsg; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | struct cgit_config { | 132 | struct cgit_config { |
133 | char *agefile; | 133 | char *agefile; |
134 | char *cache_root; | 134 | char *cache_root; |
135 | char *clone_prefix; | 135 | char *clone_prefix; |
136 | char *css; | 136 | char *css; |
137 | char *favicon; | 137 | char *favicon; |
138 | char *footer; | 138 | char *footer; |
139 | char *head_include; | ||
139 | char *header; | 140 | char *header; |
140 | char *index_header; | 141 | char *index_header; |
141 | char *index_info; | 142 | char *index_info; |
142 | char *logo; | 143 | char *logo; |
143 | char *logo_link; | 144 | char *logo_link; |
144 | char *module_link; | 145 | char *module_link; |
145 | char *repo_group; | 146 | char *repo_group; |
146 | char *robots; | 147 | char *robots; |
147 | char *root_title; | 148 | char *root_title; |
148 | char *root_desc; | 149 | char *root_desc; |
149 | char *root_readme; | 150 | char *root_readme; |
150 | char *script_name; | 151 | char *script_name; |
151 | char *virtual_root; | 152 | char *virtual_root; |
152 | int cache_size; | 153 | int cache_size; |
153 | int cache_dynamic_ttl; | 154 | int cache_dynamic_ttl; |
154 | int cache_max_create_time; | 155 | int cache_max_create_time; |
155 | int cache_repo_ttl; | 156 | int cache_repo_ttl; |
156 | int cache_root_ttl; | 157 | int cache_root_ttl; |
157 | int cache_static_ttl; | 158 | int cache_static_ttl; |
158 | int enable_index_links; | 159 | int enable_index_links; |
159 | int enable_log_filecount; | 160 | int enable_log_filecount; |
160 | int enable_log_linecount; | 161 | int enable_log_linecount; |
161 | int local_time; | 162 | int local_time; |
162 | int max_repo_count; | 163 | int max_repo_count; |
163 | int max_commit_count; | 164 | int max_commit_count; |
164 | int max_lock_attempts; | 165 | int max_lock_attempts; |
165 | int max_msg_len; | 166 | int max_msg_len; |
166 | int max_repodesc_len; | 167 | int max_repodesc_len; |
167 | int max_stats; | 168 | int max_stats; |
168 | int nocache; | 169 | int nocache; |
169 | int renamelimit; | 170 | int renamelimit; |
170 | int snapshots; | 171 | int snapshots; |
171 | int summary_branches; | 172 | int summary_branches; |
172 | int summary_log; | 173 | int summary_log; |
173 | int summary_tags; | 174 | int summary_tags; |
174 | }; | 175 | }; |
175 | 176 | ||
176 | struct cgit_page { | 177 | struct cgit_page { |
177 | time_t modified; | 178 | time_t modified; |
178 | time_t expires; | 179 | time_t expires; |
179 | size_t size; | 180 | size_t size; |
180 | char *mimetype; | 181 | char *mimetype; |
181 | char *charset; | 182 | char *charset; |
182 | char *filename; | 183 | char *filename; |
183 | char *title; | 184 | char *title; |
184 | }; | 185 | }; |
185 | 186 | ||
186 | struct cgit_context { | 187 | struct cgit_context { |
187 | struct cgit_query qry; | 188 | struct cgit_query qry; |
188 | struct cgit_config cfg; | 189 | struct cgit_config cfg; |
189 | struct cgit_repo *repo; | 190 | struct cgit_repo *repo; |
190 | struct cgit_page page; | 191 | struct cgit_page page; |
191 | }; | 192 | }; |
192 | 193 | ||
193 | struct cgit_snapshot_format { | 194 | struct cgit_snapshot_format { |
194 | const char *suffix; | 195 | const char *suffix; |
195 | const char *mimetype; | 196 | const char *mimetype; |
196 | write_archive_fn_t write_func; | 197 | write_archive_fn_t write_func; |
197 | int bit; | 198 | int bit; |
198 | }; | 199 | }; |
199 | 200 | ||
200 | extern const char *cgit_version; | 201 | extern const char *cgit_version; |
201 | 202 | ||
202 | extern struct cgit_repolist cgit_repolist; | 203 | extern struct cgit_repolist cgit_repolist; |
203 | extern struct cgit_context ctx; | 204 | extern struct cgit_context ctx; |
204 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; | 205 | extern const struct cgit_snapshot_format cgit_snapshot_formats[]; |
205 | 206 | ||
206 | extern struct cgit_repo *cgit_add_repo(const char *url); | 207 | extern struct cgit_repo *cgit_add_repo(const char *url); |
207 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); | 208 | extern struct cgit_repo *cgit_get_repoinfo(const char *url); |
208 | extern void cgit_repo_config_cb(const char *name, const char *value); | 209 | extern void cgit_repo_config_cb(const char *name, const char *value); |
209 | 210 | ||
210 | extern int chk_zero(int result, char *msg); | 211 | extern int chk_zero(int result, char *msg); |
211 | extern int chk_positive(int result, char *msg); | 212 | extern int chk_positive(int result, char *msg); |
212 | extern int chk_non_negative(int result, char *msg); | 213 | extern int chk_non_negative(int result, char *msg); |
213 | 214 | ||
214 | extern char *trim_end(const char *str, char c); | 215 | extern char *trim_end(const char *str, char c); |
215 | extern char *strlpart(char *txt, int maxlen); | 216 | extern char *strlpart(char *txt, int maxlen); |
216 | extern char *strrpart(char *txt, int maxlen); | 217 | extern char *strrpart(char *txt, int maxlen); |
217 | 218 | ||
218 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); | 219 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
219 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, | 220 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
220 | int flags, void *cb_data); | 221 | int flags, void *cb_data); |
221 | 222 | ||
222 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 223 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
223 | 224 | ||
224 | extern int cgit_diff_files(const unsigned char *old_sha1, | 225 | extern int cgit_diff_files(const unsigned char *old_sha1, |
225 | const unsigned char *new_sha1, | 226 | const unsigned char *new_sha1, |
226 | unsigned long *old_size, unsigned long *new_size, | 227 | unsigned long *old_size, unsigned long *new_size, |
227 | int *binary, linediff_fn fn); | 228 | int *binary, linediff_fn fn); |
228 | 229 | ||
229 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 230 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
230 | const unsigned char *new_sha1, | 231 | const unsigned char *new_sha1, |
231 | filepair_fn fn, const char *prefix); | 232 | filepair_fn fn, const char *prefix); |
232 | 233 | ||
233 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 234 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
234 | 235 | ||
235 | extern char *fmt(const char *format,...); | 236 | extern char *fmt(const char *format,...); |
236 | 237 | ||
237 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 238 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
238 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 239 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
239 | extern void cgit_parse_url(const char *url); | 240 | extern void cgit_parse_url(const char *url); |
240 | 241 | ||
241 | extern const char *cgit_repobasename(const char *reponame); | 242 | extern const char *cgit_repobasename(const char *reponame); |
242 | 243 | ||
243 | extern int cgit_parse_snapshots_mask(const char *str); | 244 | extern int cgit_parse_snapshots_mask(const char *str); |
244 | 245 | ||
245 | 246 | ||
246 | #endif /* CGIT_H */ | 247 | #endif /* CGIT_H */ |
diff --git a/ui-shared.c b/ui-shared.c index de77bbf..fea2c40 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -1,739 +1,741 @@ | |||
1 | /* ui-shared.c: common web output functions | 1 | /* ui-shared.c: common web output functions |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 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 "cmd.h" | 10 | #include "cmd.h" |
11 | #include "html.h" | 11 | #include "html.h" |
12 | 12 | ||
13 | const char cgit_doctype[] = | 13 | const char cgit_doctype[] = |
14 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" | 14 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" |
15 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; | 15 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; |
16 | 16 | ||
17 | static char *http_date(time_t t) | 17 | static char *http_date(time_t t) |
18 | { | 18 | { |
19 | static char day[][4] = | 19 | static char day[][4] = |
20 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; | 20 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; |
21 | static char month[][4] = | 21 | static char month[][4] = |
22 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", | 22 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", |
23 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; | 23 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; |
24 | struct tm *tm = gmtime(&t); | 24 | struct tm *tm = gmtime(&t); |
25 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], | 25 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], |
26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 26 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |
27 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 27 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
28 | } | 28 | } |
29 | 29 | ||
30 | void cgit_print_error(char *msg) | 30 | void cgit_print_error(char *msg) |
31 | { | 31 | { |
32 | html("<div class='error'>"); | 32 | html("<div class='error'>"); |
33 | html_txt(msg); | 33 | html_txt(msg); |
34 | html("</div>\n"); | 34 | html("</div>\n"); |
35 | } | 35 | } |
36 | 36 | ||
37 | char *cgit_hosturl() | 37 | char *cgit_hosturl() |
38 | { | 38 | { |
39 | char *host, *port; | 39 | char *host, *port; |
40 | 40 | ||
41 | host = getenv("HTTP_HOST"); | 41 | host = getenv("HTTP_HOST"); |
42 | if (host) { | 42 | if (host) { |
43 | host = xstrdup(host); | 43 | host = xstrdup(host); |
44 | } else { | 44 | } else { |
45 | host = getenv("SERVER_NAME"); | 45 | host = getenv("SERVER_NAME"); |
46 | if (!host) | 46 | if (!host) |
47 | return NULL; | 47 | return NULL; |
48 | port = getenv("SERVER_PORT"); | 48 | port = getenv("SERVER_PORT"); |
49 | if (port && atoi(port) != 80) | 49 | if (port && atoi(port) != 80) |
50 | host = xstrdup(fmt("%s:%d", host, atoi(port))); | 50 | host = xstrdup(fmt("%s:%d", host, atoi(port))); |
51 | else | 51 | else |
52 | host = xstrdup(host); | 52 | host = xstrdup(host); |
53 | } | 53 | } |
54 | return host; | 54 | return host; |
55 | } | 55 | } |
56 | 56 | ||
57 | char *cgit_rooturl() | 57 | char *cgit_rooturl() |
58 | { | 58 | { |
59 | if (ctx.cfg.virtual_root) | 59 | if (ctx.cfg.virtual_root) |
60 | return fmt("%s/", ctx.cfg.virtual_root); | 60 | return fmt("%s/", ctx.cfg.virtual_root); |
61 | else | 61 | else |
62 | return ctx.cfg.script_name; | 62 | return ctx.cfg.script_name; |
63 | } | 63 | } |
64 | 64 | ||
65 | char *cgit_repourl(const char *reponame) | 65 | char *cgit_repourl(const char *reponame) |
66 | { | 66 | { |
67 | if (ctx.cfg.virtual_root) { | 67 | if (ctx.cfg.virtual_root) { |
68 | return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); | 68 | return fmt("%s/%s/", ctx.cfg.virtual_root, reponame); |
69 | } else { | 69 | } else { |
70 | return fmt("?r=%s", reponame); | 70 | return fmt("?r=%s", reponame); |
71 | } | 71 | } |
72 | } | 72 | } |
73 | 73 | ||
74 | char *cgit_fileurl(const char *reponame, const char *pagename, | 74 | char *cgit_fileurl(const char *reponame, const char *pagename, |
75 | const char *filename, const char *query) | 75 | const char *filename, const char *query) |
76 | { | 76 | { |
77 | char *tmp; | 77 | char *tmp; |
78 | char *delim; | 78 | char *delim; |
79 | 79 | ||
80 | if (ctx.cfg.virtual_root) { | 80 | if (ctx.cfg.virtual_root) { |
81 | tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, | 81 | tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame, |
82 | pagename, (filename ? filename:"")); | 82 | pagename, (filename ? filename:"")); |
83 | delim = "?"; | 83 | delim = "?"; |
84 | } else { | 84 | } else { |
85 | tmp = fmt("?url=%s/%s/%s", reponame, pagename, | 85 | tmp = fmt("?url=%s/%s/%s", reponame, pagename, |
86 | (filename ? filename : "")); | 86 | (filename ? filename : "")); |
87 | delim = "&"; | 87 | delim = "&"; |
88 | } | 88 | } |
89 | if (query) | 89 | if (query) |
90 | tmp = fmt("%s%s%s", tmp, delim, query); | 90 | tmp = fmt("%s%s%s", tmp, delim, query); |
91 | return tmp; | 91 | return tmp; |
92 | } | 92 | } |
93 | 93 | ||
94 | char *cgit_pageurl(const char *reponame, const char *pagename, | 94 | char *cgit_pageurl(const char *reponame, const char *pagename, |
95 | const char *query) | 95 | const char *query) |
96 | { | 96 | { |
97 | return cgit_fileurl(reponame,pagename,0,query); | 97 | return cgit_fileurl(reponame,pagename,0,query); |
98 | } | 98 | } |
99 | 99 | ||
100 | const char *cgit_repobasename(const char *reponame) | 100 | const char *cgit_repobasename(const char *reponame) |
101 | { | 101 | { |
102 | /* I assume we don't need to store more than one repo basename */ | 102 | /* I assume we don't need to store more than one repo basename */ |
103 | static char rvbuf[1024]; | 103 | static char rvbuf[1024]; |
104 | int p; | 104 | int p; |
105 | const char *rv; | 105 | const char *rv; |
106 | strncpy(rvbuf,reponame,sizeof(rvbuf)); | 106 | strncpy(rvbuf,reponame,sizeof(rvbuf)); |
107 | if(rvbuf[sizeof(rvbuf)-1]) | 107 | if(rvbuf[sizeof(rvbuf)-1]) |
108 | die("cgit_repobasename: truncated repository name '%s'", reponame); | 108 | die("cgit_repobasename: truncated repository name '%s'", reponame); |
109 | p = strlen(rvbuf)-1; | 109 | p = strlen(rvbuf)-1; |
110 | /* strip trailing slashes */ | 110 | /* strip trailing slashes */ |
111 | while(p && rvbuf[p]=='/') rvbuf[p--]=0; | 111 | while(p && rvbuf[p]=='/') rvbuf[p--]=0; |
112 | /* strip trailing .git */ | 112 | /* strip trailing .git */ |
113 | if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { | 113 | if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { |
114 | p -= 3; rvbuf[p--] = 0; | 114 | p -= 3; rvbuf[p--] = 0; |
115 | } | 115 | } |
116 | /* strip more trailing slashes if any */ | 116 | /* strip more trailing slashes if any */ |
117 | while( p && rvbuf[p]=='/') rvbuf[p--]=0; | 117 | while( p && rvbuf[p]=='/') rvbuf[p--]=0; |
118 | /* find last slash in the remaining string */ | 118 | /* find last slash in the remaining string */ |
119 | rv = strrchr(rvbuf,'/'); | 119 | rv = strrchr(rvbuf,'/'); |
120 | if(rv) | 120 | if(rv) |
121 | return ++rv; | 121 | return ++rv; |
122 | return rvbuf; | 122 | return rvbuf; |
123 | } | 123 | } |
124 | 124 | ||
125 | char *cgit_currurl() | 125 | char *cgit_currurl() |
126 | { | 126 | { |
127 | if (!ctx.cfg.virtual_root) | 127 | if (!ctx.cfg.virtual_root) |
128 | return ctx.cfg.script_name; | 128 | return ctx.cfg.script_name; |
129 | else if (ctx.qry.page) | 129 | else if (ctx.qry.page) |
130 | return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); | 130 | return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page); |
131 | else if (ctx.qry.repo) | 131 | else if (ctx.qry.repo) |
132 | return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); | 132 | return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo); |
133 | else | 133 | else |
134 | return fmt("%s/", ctx.cfg.virtual_root); | 134 | return fmt("%s/", ctx.cfg.virtual_root); |
135 | } | 135 | } |
136 | 136 | ||
137 | static void site_url(char *page, char *search, int ofs) | 137 | static void site_url(char *page, char *search, int ofs) |
138 | { | 138 | { |
139 | char *delim = "?"; | 139 | char *delim = "?"; |
140 | 140 | ||
141 | if (ctx.cfg.virtual_root) { | 141 | if (ctx.cfg.virtual_root) { |
142 | html_attr(ctx.cfg.virtual_root); | 142 | html_attr(ctx.cfg.virtual_root); |
143 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | 143 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') |
144 | html("/"); | 144 | html("/"); |
145 | } else | 145 | } else |
146 | html(ctx.cfg.script_name); | 146 | html(ctx.cfg.script_name); |
147 | 147 | ||
148 | if (page) { | 148 | if (page) { |
149 | htmlf("?p=%s", page); | 149 | htmlf("?p=%s", page); |
150 | delim = "&"; | 150 | delim = "&"; |
151 | } | 151 | } |
152 | if (search) { | 152 | if (search) { |
153 | html(delim); | 153 | html(delim); |
154 | html("q="); | 154 | html("q="); |
155 | html_attr(search); | 155 | html_attr(search); |
156 | delim = "&"; | 156 | delim = "&"; |
157 | } | 157 | } |
158 | if (ofs) { | 158 | if (ofs) { |
159 | html(delim); | 159 | html(delim); |
160 | htmlf("ofs=%d", ofs); | 160 | htmlf("ofs=%d", ofs); |
161 | } | 161 | } |
162 | } | 162 | } |
163 | 163 | ||
164 | static void site_link(char *page, char *name, char *title, char *class, | 164 | static void site_link(char *page, char *name, char *title, char *class, |
165 | char *search, int ofs) | 165 | char *search, int ofs) |
166 | { | 166 | { |
167 | html("<a"); | 167 | html("<a"); |
168 | if (title) { | 168 | if (title) { |
169 | html(" title='"); | 169 | html(" title='"); |
170 | html_attr(title); | 170 | html_attr(title); |
171 | html("'"); | 171 | html("'"); |
172 | } | 172 | } |
173 | if (class) { | 173 | if (class) { |
174 | html(" class='"); | 174 | html(" class='"); |
175 | html_attr(class); | 175 | html_attr(class); |
176 | html("'"); | 176 | html("'"); |
177 | } | 177 | } |
178 | html(" href='"); | 178 | html(" href='"); |
179 | site_url(page, search, ofs); | 179 | site_url(page, search, ofs); |
180 | html("'>"); | 180 | html("'>"); |
181 | html_txt(name); | 181 | html_txt(name); |
182 | html("</a>"); | 182 | html("</a>"); |
183 | } | 183 | } |
184 | 184 | ||
185 | void cgit_index_link(char *name, char *title, char *class, char *pattern, | 185 | void cgit_index_link(char *name, char *title, char *class, char *pattern, |
186 | int ofs) | 186 | int ofs) |
187 | { | 187 | { |
188 | site_link(NULL, name, title, class, pattern, ofs); | 188 | site_link(NULL, name, title, class, pattern, ofs); |
189 | } | 189 | } |
190 | 190 | ||
191 | static char *repolink(char *title, char *class, char *page, char *head, | 191 | static char *repolink(char *title, char *class, char *page, char *head, |
192 | char *path) | 192 | char *path) |
193 | { | 193 | { |
194 | char *delim = "?"; | 194 | char *delim = "?"; |
195 | 195 | ||
196 | html("<a"); | 196 | html("<a"); |
197 | if (title) { | 197 | if (title) { |
198 | html(" title='"); | 198 | html(" title='"); |
199 | html_attr(title); | 199 | html_attr(title); |
200 | html("'"); | 200 | html("'"); |
201 | } | 201 | } |
202 | if (class) { | 202 | if (class) { |
203 | html(" class='"); | 203 | html(" class='"); |
204 | html_attr(class); | 204 | html_attr(class); |
205 | html("'"); | 205 | html("'"); |
206 | } | 206 | } |
207 | html(" href='"); | 207 | html(" href='"); |
208 | if (ctx.cfg.virtual_root) { | 208 | if (ctx.cfg.virtual_root) { |
209 | html_url_path(ctx.cfg.virtual_root); | 209 | html_url_path(ctx.cfg.virtual_root); |
210 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') | 210 | if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/') |
211 | html("/"); | 211 | html("/"); |
212 | html_url_path(ctx.repo->url); | 212 | html_url_path(ctx.repo->url); |
213 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 213 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
214 | html("/"); | 214 | html("/"); |
215 | if (page) { | 215 | if (page) { |
216 | html_url_path(page); | 216 | html_url_path(page); |
217 | html("/"); | 217 | html("/"); |
218 | if (path) | 218 | if (path) |
219 | html_url_path(path); | 219 | html_url_path(path); |
220 | } | 220 | } |
221 | } else { | 221 | } else { |
222 | html(ctx.cfg.script_name); | 222 | html(ctx.cfg.script_name); |
223 | html("?url="); | 223 | html("?url="); |
224 | html_url_arg(ctx.repo->url); | 224 | html_url_arg(ctx.repo->url); |
225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
226 | html("/"); | 226 | html("/"); |
227 | if (page) { | 227 | if (page) { |
228 | html_url_arg(page); | 228 | html_url_arg(page); |
229 | html("/"); | 229 | html("/"); |
230 | if (path) | 230 | if (path) |
231 | html_url_arg(path); | 231 | html_url_arg(path); |
232 | } | 232 | } |
233 | delim = "&"; | 233 | delim = "&"; |
234 | } | 234 | } |
235 | if (head && strcmp(head, ctx.repo->defbranch)) { | 235 | if (head && strcmp(head, ctx.repo->defbranch)) { |
236 | html(delim); | 236 | html(delim); |
237 | html("h="); | 237 | html("h="); |
238 | html_url_arg(head); | 238 | html_url_arg(head); |
239 | delim = "&"; | 239 | delim = "&"; |
240 | } | 240 | } |
241 | return fmt("%s", delim); | 241 | return fmt("%s", delim); |
242 | } | 242 | } |
243 | 243 | ||
244 | static void reporevlink(char *page, char *name, char *title, char *class, | 244 | static void reporevlink(char *page, char *name, char *title, char *class, |
245 | char *head, char *rev, char *path) | 245 | char *head, char *rev, char *path) |
246 | { | 246 | { |
247 | char *delim; | 247 | char *delim; |
248 | 248 | ||
249 | delim = repolink(title, class, page, head, path); | 249 | delim = repolink(title, class, page, head, path); |
250 | if (rev && strcmp(rev, ctx.qry.head)) { | 250 | if (rev && strcmp(rev, ctx.qry.head)) { |
251 | html(delim); | 251 | html(delim); |
252 | html("id="); | 252 | html("id="); |
253 | html_url_arg(rev); | 253 | html_url_arg(rev); |
254 | } | 254 | } |
255 | html("'>"); | 255 | html("'>"); |
256 | html_txt(name); | 256 | html_txt(name); |
257 | html("</a>"); | 257 | html("</a>"); |
258 | } | 258 | } |
259 | 259 | ||
260 | void cgit_summary_link(char *name, char *title, char *class, char *head) | 260 | void cgit_summary_link(char *name, char *title, char *class, char *head) |
261 | { | 261 | { |
262 | reporevlink(NULL, name, title, class, head, NULL, NULL); | 262 | reporevlink(NULL, name, title, class, head, NULL, NULL); |
263 | } | 263 | } |
264 | 264 | ||
265 | void cgit_tag_link(char *name, char *title, char *class, char *head, | 265 | void cgit_tag_link(char *name, char *title, char *class, char *head, |
266 | char *rev) | 266 | char *rev) |
267 | { | 267 | { |
268 | reporevlink("tag", name, title, class, head, rev, NULL); | 268 | reporevlink("tag", name, title, class, head, rev, NULL); |
269 | } | 269 | } |
270 | 270 | ||
271 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 271 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
272 | char *rev, char *path) | 272 | char *rev, char *path) |
273 | { | 273 | { |
274 | reporevlink("tree", name, title, class, head, rev, path); | 274 | reporevlink("tree", name, title, class, head, rev, path); |
275 | } | 275 | } |
276 | 276 | ||
277 | void cgit_plain_link(char *name, char *title, char *class, char *head, | 277 | void cgit_plain_link(char *name, char *title, char *class, char *head, |
278 | char *rev, char *path) | 278 | char *rev, char *path) |
279 | { | 279 | { |
280 | reporevlink("plain", name, title, class, head, rev, path); | 280 | reporevlink("plain", name, title, class, head, rev, path); |
281 | } | 281 | } |
282 | 282 | ||
283 | void cgit_log_link(char *name, char *title, char *class, char *head, | 283 | void cgit_log_link(char *name, char *title, char *class, char *head, |
284 | char *rev, char *path, int ofs, char *grep, char *pattern, | 284 | char *rev, char *path, int ofs, char *grep, char *pattern, |
285 | int showmsg) | 285 | int showmsg) |
286 | { | 286 | { |
287 | char *delim; | 287 | char *delim; |
288 | 288 | ||
289 | delim = repolink(title, class, "log", head, path); | 289 | delim = repolink(title, class, "log", head, path); |
290 | if (rev && strcmp(rev, ctx.qry.head)) { | 290 | if (rev && strcmp(rev, ctx.qry.head)) { |
291 | html(delim); | 291 | html(delim); |
292 | html("id="); | 292 | html("id="); |
293 | html_url_arg(rev); | 293 | html_url_arg(rev); |
294 | delim = "&"; | 294 | delim = "&"; |
295 | } | 295 | } |
296 | if (grep && pattern) { | 296 | if (grep && pattern) { |
297 | html(delim); | 297 | html(delim); |
298 | html("qt="); | 298 | html("qt="); |
299 | html_url_arg(grep); | 299 | html_url_arg(grep); |
300 | delim = "&"; | 300 | delim = "&"; |
301 | html(delim); | 301 | html(delim); |
302 | html("q="); | 302 | html("q="); |
303 | html_url_arg(pattern); | 303 | html_url_arg(pattern); |
304 | } | 304 | } |
305 | if (ofs > 0) { | 305 | if (ofs > 0) { |
306 | html(delim); | 306 | html(delim); |
307 | html("ofs="); | 307 | html("ofs="); |
308 | htmlf("%d", ofs); | 308 | htmlf("%d", ofs); |
309 | delim = "&"; | 309 | delim = "&"; |
310 | } | 310 | } |
311 | if (showmsg) { | 311 | if (showmsg) { |
312 | html(delim); | 312 | html(delim); |
313 | html("showmsg=1"); | 313 | html("showmsg=1"); |
314 | } | 314 | } |
315 | html("'>"); | 315 | html("'>"); |
316 | html_txt(name); | 316 | html_txt(name); |
317 | html("</a>"); | 317 | html("</a>"); |
318 | } | 318 | } |
319 | 319 | ||
320 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 320 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
321 | char *rev) | 321 | char *rev) |
322 | { | 322 | { |
323 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 323 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
324 | name[ctx.cfg.max_msg_len] = '\0'; | 324 | name[ctx.cfg.max_msg_len] = '\0'; |
325 | name[ctx.cfg.max_msg_len - 1] = '.'; | 325 | name[ctx.cfg.max_msg_len - 1] = '.'; |
326 | name[ctx.cfg.max_msg_len - 2] = '.'; | 326 | name[ctx.cfg.max_msg_len - 2] = '.'; |
327 | name[ctx.cfg.max_msg_len - 3] = '.'; | 327 | name[ctx.cfg.max_msg_len - 3] = '.'; |
328 | } | 328 | } |
329 | reporevlink("commit", name, title, class, head, rev, NULL); | 329 | reporevlink("commit", name, title, class, head, rev, NULL); |
330 | } | 330 | } |
331 | 331 | ||
332 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 332 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
333 | char *rev, char *path) | 333 | char *rev, char *path) |
334 | { | 334 | { |
335 | reporevlink("refs", name, title, class, head, rev, path); | 335 | reporevlink("refs", name, title, class, head, rev, path); |
336 | } | 336 | } |
337 | 337 | ||
338 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 338 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
339 | char *rev, char *archivename) | 339 | char *rev, char *archivename) |
340 | { | 340 | { |
341 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 341 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
342 | } | 342 | } |
343 | 343 | ||
344 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 344 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
345 | char *new_rev, char *old_rev, char *path) | 345 | char *new_rev, char *old_rev, char *path) |
346 | { | 346 | { |
347 | char *delim; | 347 | char *delim; |
348 | 348 | ||
349 | delim = repolink(title, class, "diff", head, path); | 349 | delim = repolink(title, class, "diff", head, path); |
350 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 350 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
351 | html(delim); | 351 | html(delim); |
352 | html("id="); | 352 | html("id="); |
353 | html_url_arg(new_rev); | 353 | html_url_arg(new_rev); |
354 | delim = "&"; | 354 | delim = "&"; |
355 | } | 355 | } |
356 | if (old_rev) { | 356 | if (old_rev) { |
357 | html(delim); | 357 | html(delim); |
358 | html("id2="); | 358 | html("id2="); |
359 | html_url_arg(old_rev); | 359 | html_url_arg(old_rev); |
360 | } | 360 | } |
361 | html("'>"); | 361 | html("'>"); |
362 | html_txt(name); | 362 | html_txt(name); |
363 | html("</a>"); | 363 | html("</a>"); |
364 | } | 364 | } |
365 | 365 | ||
366 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 366 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
367 | char *rev) | 367 | char *rev) |
368 | { | 368 | { |
369 | reporevlink("patch", name, title, class, head, rev, NULL); | 369 | reporevlink("patch", name, title, class, head, rev, NULL); |
370 | } | 370 | } |
371 | 371 | ||
372 | void cgit_stats_link(char *name, char *title, char *class, char *head, | 372 | void cgit_stats_link(char *name, char *title, char *class, char *head, |
373 | char *path) | 373 | char *path) |
374 | { | 374 | { |
375 | reporevlink("stats", name, title, class, head, NULL, path); | 375 | reporevlink("stats", name, title, class, head, NULL, path); |
376 | } | 376 | } |
377 | 377 | ||
378 | void cgit_object_link(struct object *obj) | 378 | void cgit_object_link(struct object *obj) |
379 | { | 379 | { |
380 | char *page, *shortrev, *fullrev, *name; | 380 | char *page, *shortrev, *fullrev, *name; |
381 | 381 | ||
382 | fullrev = sha1_to_hex(obj->sha1); | 382 | fullrev = sha1_to_hex(obj->sha1); |
383 | shortrev = xstrdup(fullrev); | 383 | shortrev = xstrdup(fullrev); |
384 | shortrev[10] = '\0'; | 384 | shortrev[10] = '\0'; |
385 | if (obj->type == OBJ_COMMIT) { | 385 | if (obj->type == OBJ_COMMIT) { |
386 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, | 386 | cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, |
387 | ctx.qry.head, fullrev); | 387 | ctx.qry.head, fullrev); |
388 | return; | 388 | return; |
389 | } else if (obj->type == OBJ_TREE) | 389 | } else if (obj->type == OBJ_TREE) |
390 | page = "tree"; | 390 | page = "tree"; |
391 | else if (obj->type == OBJ_TAG) | 391 | else if (obj->type == OBJ_TAG) |
392 | page = "tag"; | 392 | page = "tag"; |
393 | else | 393 | else |
394 | page = "blob"; | 394 | page = "blob"; |
395 | name = fmt("%s %s...", typename(obj->type), shortrev); | 395 | name = fmt("%s %s...", typename(obj->type), shortrev); |
396 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); | 396 | reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); |
397 | } | 397 | } |
398 | 398 | ||
399 | void cgit_print_date(time_t secs, char *format, int local_time) | 399 | void cgit_print_date(time_t secs, char *format, int local_time) |
400 | { | 400 | { |
401 | char buf[64]; | 401 | char buf[64]; |
402 | struct tm *time; | 402 | struct tm *time; |
403 | 403 | ||
404 | if (!secs) | 404 | if (!secs) |
405 | return; | 405 | return; |
406 | if(local_time) | 406 | if(local_time) |
407 | time = localtime(&secs); | 407 | time = localtime(&secs); |
408 | else | 408 | else |
409 | time = gmtime(&secs); | 409 | time = gmtime(&secs); |
410 | strftime(buf, sizeof(buf)-1, format, time); | 410 | strftime(buf, sizeof(buf)-1, format, time); |
411 | html_txt(buf); | 411 | html_txt(buf); |
412 | } | 412 | } |
413 | 413 | ||
414 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 414 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
415 | { | 415 | { |
416 | time_t now, secs; | 416 | time_t now, secs; |
417 | 417 | ||
418 | if (!t) | 418 | if (!t) |
419 | return; | 419 | return; |
420 | time(&now); | 420 | time(&now); |
421 | secs = now - t; | 421 | secs = now - t; |
422 | 422 | ||
423 | if (secs > max_relative && max_relative >= 0) { | 423 | if (secs > max_relative && max_relative >= 0) { |
424 | cgit_print_date(t, format, ctx.cfg.local_time); | 424 | cgit_print_date(t, format, ctx.cfg.local_time); |
425 | return; | 425 | return; |
426 | } | 426 | } |
427 | 427 | ||
428 | if (secs < TM_HOUR * 2) { | 428 | if (secs < TM_HOUR * 2) { |
429 | htmlf("<span class='age-mins'>%.0f min.</span>", | 429 | htmlf("<span class='age-mins'>%.0f min.</span>", |
430 | secs * 1.0 / TM_MIN); | 430 | secs * 1.0 / TM_MIN); |
431 | return; | 431 | return; |
432 | } | 432 | } |
433 | if (secs < TM_DAY * 2) { | 433 | if (secs < TM_DAY * 2) { |
434 | htmlf("<span class='age-hours'>%.0f hours</span>", | 434 | htmlf("<span class='age-hours'>%.0f hours</span>", |
435 | secs * 1.0 / TM_HOUR); | 435 | secs * 1.0 / TM_HOUR); |
436 | return; | 436 | return; |
437 | } | 437 | } |
438 | if (secs < TM_WEEK * 2) { | 438 | if (secs < TM_WEEK * 2) { |
439 | htmlf("<span class='age-days'>%.0f days</span>", | 439 | htmlf("<span class='age-days'>%.0f days</span>", |
440 | secs * 1.0 / TM_DAY); | 440 | secs * 1.0 / TM_DAY); |
441 | return; | 441 | return; |
442 | } | 442 | } |
443 | if (secs < TM_MONTH * 2) { | 443 | if (secs < TM_MONTH * 2) { |
444 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 444 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
445 | secs * 1.0 / TM_WEEK); | 445 | secs * 1.0 / TM_WEEK); |
446 | return; | 446 | return; |
447 | } | 447 | } |
448 | if (secs < TM_YEAR * 2) { | 448 | if (secs < TM_YEAR * 2) { |
449 | htmlf("<span class='age-months'>%.0f months</span>", | 449 | htmlf("<span class='age-months'>%.0f months</span>", |
450 | secs * 1.0 / TM_MONTH); | 450 | secs * 1.0 / TM_MONTH); |
451 | return; | 451 | return; |
452 | } | 452 | } |
453 | htmlf("<span class='age-years'>%.0f years</span>", | 453 | htmlf("<span class='age-years'>%.0f years</span>", |
454 | secs * 1.0 / TM_YEAR); | 454 | secs * 1.0 / TM_YEAR); |
455 | } | 455 | } |
456 | 456 | ||
457 | void cgit_print_http_headers(struct cgit_context *ctx) | 457 | void cgit_print_http_headers(struct cgit_context *ctx) |
458 | { | 458 | { |
459 | if (ctx->page.mimetype && ctx->page.charset) | 459 | if (ctx->page.mimetype && ctx->page.charset) |
460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 460 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
461 | ctx->page.charset); | 461 | ctx->page.charset); |
462 | else if (ctx->page.mimetype) | 462 | else if (ctx->page.mimetype) |
463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 463 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
464 | if (ctx->page.size) | 464 | if (ctx->page.size) |
465 | htmlf("Content-Length: %ld\n", ctx->page.size); | 465 | htmlf("Content-Length: %ld\n", ctx->page.size); |
466 | if (ctx->page.filename) | 466 | if (ctx->page.filename) |
467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 467 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
468 | ctx->page.filename); | 468 | ctx->page.filename); |
469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 469 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 470 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
471 | html("\n"); | 471 | html("\n"); |
472 | } | 472 | } |
473 | 473 | ||
474 | void cgit_print_docstart(struct cgit_context *ctx) | 474 | void cgit_print_docstart(struct cgit_context *ctx) |
475 | { | 475 | { |
476 | char *host = cgit_hosturl(); | 476 | char *host = cgit_hosturl(); |
477 | html(cgit_doctype); | 477 | html(cgit_doctype); |
478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); | 478 | html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n"); |
479 | html("<head>\n"); | 479 | html("<head>\n"); |
480 | html("<title>"); | 480 | html("<title>"); |
481 | html_txt(ctx->page.title); | 481 | html_txt(ctx->page.title); |
482 | html("</title>\n"); | 482 | html("</title>\n"); |
483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 483 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
484 | if (ctx->cfg.robots && *ctx->cfg.robots) | 484 | if (ctx->cfg.robots && *ctx->cfg.robots) |
485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); | 485 | htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots); |
486 | html("<link rel='stylesheet' type='text/css' href='"); | 486 | html("<link rel='stylesheet' type='text/css' href='"); |
487 | html_attr(ctx->cfg.css); | 487 | html_attr(ctx->cfg.css); |
488 | html("'/>\n"); | 488 | html("'/>\n"); |
489 | if (ctx->cfg.favicon) { | 489 | if (ctx->cfg.favicon) { |
490 | html("<link rel='shortcut icon' href='"); | 490 | html("<link rel='shortcut icon' href='"); |
491 | html_attr(ctx->cfg.favicon); | 491 | html_attr(ctx->cfg.favicon); |
492 | html("'/>\n"); | 492 | html("'/>\n"); |
493 | } | 493 | } |
494 | if (host && ctx->repo) { | 494 | if (host && ctx->repo) { |
495 | html("<link rel='alternate' title='Atom feed' href='http://"); | 495 | html("<link rel='alternate' title='Atom feed' href='http://"); |
496 | html_attr(cgit_hosturl()); | 496 | html_attr(cgit_hosturl()); |
497 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, | 497 | html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, |
498 | fmt("h=%s", ctx->qry.head))); | 498 | fmt("h=%s", ctx->qry.head))); |
499 | html("' type='application/atom+xml'/>"); | 499 | html("' type='application/atom+xml'/>\n"); |
500 | } | 500 | } |
501 | if (ctx->cfg.head_include) | ||
502 | html_include(ctx->cfg.head_include); | ||
501 | html("</head>\n"); | 503 | html("</head>\n"); |
502 | html("<body>\n"); | 504 | html("<body>\n"); |
503 | if (ctx->cfg.header) | 505 | if (ctx->cfg.header) |
504 | html_include(ctx->cfg.header); | 506 | html_include(ctx->cfg.header); |
505 | } | 507 | } |
506 | 508 | ||
507 | void cgit_print_docend() | 509 | void cgit_print_docend() |
508 | { | 510 | { |
509 | html("</div>"); | 511 | html("</div>"); |
510 | if (ctx.cfg.footer) | 512 | if (ctx.cfg.footer) |
511 | html_include(ctx.cfg.footer); | 513 | html_include(ctx.cfg.footer); |
512 | else { | 514 | else { |
513 | htmlf("<div class='footer'>generated by cgit %s at ", | 515 | htmlf("<div class='footer'>generated by cgit %s at ", |
514 | cgit_version); | 516 | cgit_version); |
515 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); | 517 | cgit_print_date(time(NULL), FMT_LONGDATE, ctx.cfg.local_time); |
516 | html("</div>\n"); | 518 | html("</div>\n"); |
517 | } | 519 | } |
518 | html("</body>\n</html>\n"); | 520 | html("</body>\n</html>\n"); |
519 | } | 521 | } |
520 | 522 | ||
521 | int print_branch_option(const char *refname, const unsigned char *sha1, | 523 | int print_branch_option(const char *refname, const unsigned char *sha1, |
522 | int flags, void *cb_data) | 524 | int flags, void *cb_data) |
523 | { | 525 | { |
524 | char *name = (char *)refname; | 526 | char *name = (char *)refname; |
525 | html_option(name, name, ctx.qry.head); | 527 | html_option(name, name, ctx.qry.head); |
526 | return 0; | 528 | return 0; |
527 | } | 529 | } |
528 | 530 | ||
529 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 531 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
530 | int flags, void *cb_data) | 532 | int flags, void *cb_data) |
531 | { | 533 | { |
532 | struct tag *tag; | 534 | struct tag *tag; |
533 | struct taginfo *info; | 535 | struct taginfo *info; |
534 | struct object *obj; | 536 | struct object *obj; |
535 | char buf[256], *url; | 537 | char buf[256], *url; |
536 | unsigned char fileid[20]; | 538 | unsigned char fileid[20]; |
537 | int *header = (int *)cb_data; | 539 | int *header = (int *)cb_data; |
538 | 540 | ||
539 | if (prefixcmp(refname, "refs/archives")) | 541 | if (prefixcmp(refname, "refs/archives")) |
540 | return 0; | 542 | return 0; |
541 | strncpy(buf, refname+14, sizeof(buf)); | 543 | strncpy(buf, refname+14, sizeof(buf)); |
542 | obj = parse_object(sha1); | 544 | obj = parse_object(sha1); |
543 | if (!obj) | 545 | if (!obj) |
544 | return 1; | 546 | return 1; |
545 | if (obj->type == OBJ_TAG) { | 547 | if (obj->type == OBJ_TAG) { |
546 | tag = lookup_tag(sha1); | 548 | tag = lookup_tag(sha1); |
547 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 549 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
548 | return 0; | 550 | return 0; |
549 | hashcpy(fileid, tag->tagged->sha1); | 551 | hashcpy(fileid, tag->tagged->sha1); |
550 | } else if (obj->type != OBJ_BLOB) { | 552 | } else if (obj->type != OBJ_BLOB) { |
551 | return 0; | 553 | return 0; |
552 | } else { | 554 | } else { |
553 | hashcpy(fileid, sha1); | 555 | hashcpy(fileid, sha1); |
554 | } | 556 | } |
555 | if (!*header) { | 557 | if (!*header) { |
556 | html("<h1>download</h1>\n"); | 558 | html("<h1>download</h1>\n"); |
557 | *header = 1; | 559 | *header = 1; |
558 | } | 560 | } |
559 | url = cgit_pageurl(ctx.qry.repo, "blob", | 561 | url = cgit_pageurl(ctx.qry.repo, "blob", |
560 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 562 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
561 | buf)); | 563 | buf)); |
562 | html_link_open(url, NULL, "menu"); | 564 | html_link_open(url, NULL, "menu"); |
563 | html_txt(strlpart(buf, 20)); | 565 | html_txt(strlpart(buf, 20)); |
564 | html_link_close(); | 566 | html_link_close(); |
565 | return 0; | 567 | return 0; |
566 | } | 568 | } |
567 | 569 | ||
568 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) | 570 | void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) |
569 | { | 571 | { |
570 | char *url; | 572 | char *url; |
571 | 573 | ||
572 | if (!ctx.cfg.virtual_root) { | 574 | if (!ctx.cfg.virtual_root) { |
573 | url = fmt("%s/%s", ctx.qry.repo, page); | 575 | url = fmt("%s/%s", ctx.qry.repo, page); |
574 | if (ctx.qry.path) | 576 | if (ctx.qry.path) |
575 | url = fmt("%s/%s", url, ctx.qry.path); | 577 | url = fmt("%s/%s", url, ctx.qry.path); |
576 | html_hidden("url", url); | 578 | html_hidden("url", url); |
577 | } | 579 | } |
578 | 580 | ||
579 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && | 581 | if (incl_head && ctx.qry.head && ctx.repo->defbranch && |
580 | strcmp(ctx.qry.head, ctx.repo->defbranch)) | 582 | strcmp(ctx.qry.head, ctx.repo->defbranch)) |
581 | html_hidden("h", ctx.qry.head); | 583 | html_hidden("h", ctx.qry.head); |
582 | 584 | ||
583 | if (ctx.qry.sha1) | 585 | if (ctx.qry.sha1) |
584 | html_hidden("id", ctx.qry.sha1); | 586 | html_hidden("id", ctx.qry.sha1); |
585 | if (ctx.qry.sha2) | 587 | if (ctx.qry.sha2) |
586 | html_hidden("id2", ctx.qry.sha2); | 588 | html_hidden("id2", ctx.qry.sha2); |
587 | if (ctx.qry.showmsg) | 589 | if (ctx.qry.showmsg) |
588 | html_hidden("showmsg", "1"); | 590 | html_hidden("showmsg", "1"); |
589 | 591 | ||
590 | if (incl_search) { | 592 | if (incl_search) { |
591 | if (ctx.qry.grep) | 593 | if (ctx.qry.grep) |
592 | html_hidden("qt", ctx.qry.grep); | 594 | html_hidden("qt", ctx.qry.grep); |
593 | if (ctx.qry.search) | 595 | if (ctx.qry.search) |
594 | html_hidden("q", ctx.qry.search); | 596 | html_hidden("q", ctx.qry.search); |
595 | } | 597 | } |
596 | } | 598 | } |
597 | 599 | ||
598 | const char *fallback_cmd = "repolist"; | 600 | const char *fallback_cmd = "repolist"; |
599 | 601 | ||
600 | char *hc(struct cgit_cmd *cmd, const char *page) | 602 | char *hc(struct cgit_cmd *cmd, const char *page) |
601 | { | 603 | { |
602 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); | 604 | return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); |
603 | } | 605 | } |
604 | 606 | ||
605 | void cgit_print_pageheader(struct cgit_context *ctx) | 607 | void cgit_print_pageheader(struct cgit_context *ctx) |
606 | { | 608 | { |
607 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); | 609 | struct cgit_cmd *cmd = cgit_get_cmd(ctx); |
608 | 610 | ||
609 | if (!cmd && ctx->repo) | 611 | if (!cmd && ctx->repo) |
610 | fallback_cmd = "summary"; | 612 | fallback_cmd = "summary"; |
611 | 613 | ||
612 | html("<table id='header'>\n"); | 614 | html("<table id='header'>\n"); |
613 | html("<tr>\n"); | 615 | html("<tr>\n"); |
614 | html("<td class='logo' rowspan='2'><a href='"); | 616 | html("<td class='logo' rowspan='2'><a href='"); |
615 | if (ctx->cfg.logo_link) | 617 | if (ctx->cfg.logo_link) |
616 | html_attr(ctx->cfg.logo_link); | 618 | html_attr(ctx->cfg.logo_link); |
617 | else | 619 | else |
618 | html_attr(cgit_rooturl()); | 620 | html_attr(cgit_rooturl()); |
619 | html("'><img src='"); | 621 | html("'><img src='"); |
620 | html_attr(ctx->cfg.logo); | 622 | html_attr(ctx->cfg.logo); |
621 | html("' alt='cgit logo'/></a></td>\n"); | 623 | html("' alt='cgit logo'/></a></td>\n"); |
622 | 624 | ||
623 | html("<td class='main'>"); | 625 | html("<td class='main'>"); |
624 | if (ctx->repo) { | 626 | if (ctx->repo) { |
625 | cgit_index_link("index", NULL, NULL, NULL, 0); | 627 | cgit_index_link("index", NULL, NULL, NULL, 0); |
626 | html(" : "); | 628 | html(" : "); |
627 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); | 629 | cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL); |
628 | html("</td><td class='form'>"); | 630 | html("</td><td class='form'>"); |
629 | html("<form method='get' action=''>\n"); | 631 | html("<form method='get' action=''>\n"); |
630 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); | 632 | cgit_add_hidden_formfields(0, 1, ctx->qry.page); |
631 | html("<select name='h' onchange='this.form.submit();'>\n"); | 633 | html("<select name='h' onchange='this.form.submit();'>\n"); |
632 | for_each_branch_ref(print_branch_option, ctx->qry.head); | 634 | for_each_branch_ref(print_branch_option, ctx->qry.head); |
633 | html("</select> "); | 635 | html("</select> "); |
634 | html("<input type='submit' name='' value='switch'/>"); | 636 | html("<input type='submit' name='' value='switch'/>"); |
635 | html("</form>"); | 637 | html("</form>"); |
636 | } else | 638 | } else |
637 | html_txt(ctx->cfg.root_title); | 639 | html_txt(ctx->cfg.root_title); |
638 | html("</td></tr>\n"); | 640 | html("</td></tr>\n"); |
639 | 641 | ||
640 | html("<tr><td class='sub'>"); | 642 | html("<tr><td class='sub'>"); |
641 | if (ctx->repo) { | 643 | if (ctx->repo) { |
642 | html_txt(ctx->repo->desc); | 644 | html_txt(ctx->repo->desc); |
643 | html("</td><td class='sub right'>"); | 645 | html("</td><td class='sub right'>"); |
644 | html_txt(ctx->repo->owner); | 646 | html_txt(ctx->repo->owner); |
645 | } else { | 647 | } else { |
646 | if (ctx->cfg.root_desc) | 648 | if (ctx->cfg.root_desc) |
647 | html_txt(ctx->cfg.root_desc); | 649 | html_txt(ctx->cfg.root_desc); |
648 | else if (ctx->cfg.index_info) | 650 | else if (ctx->cfg.index_info) |
649 | html_include(ctx->cfg.index_info); | 651 | html_include(ctx->cfg.index_info); |
650 | } | 652 | } |
651 | html("</td></tr></table>\n"); | 653 | html("</td></tr></table>\n"); |
652 | 654 | ||
653 | html("<table class='tabs'><tr><td>\n"); | 655 | html("<table class='tabs'><tr><td>\n"); |
654 | if (ctx->repo) { | 656 | if (ctx->repo) { |
655 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), | 657 | cgit_summary_link("summary", NULL, hc(cmd, "summary"), |
656 | ctx->qry.head); | 658 | ctx->qry.head); |
657 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, | 659 | cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, |
658 | ctx->qry.sha1, NULL); | 660 | ctx->qry.sha1, NULL); |
659 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, | 661 | cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, |
660 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); | 662 | NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); |
661 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, | 663 | cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, |
662 | ctx->qry.sha1, NULL); | 664 | ctx->qry.sha1, NULL); |
663 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), | 665 | cgit_commit_link("commit", NULL, hc(cmd, "commit"), |
664 | ctx->qry.head, ctx->qry.sha1); | 666 | ctx->qry.head, ctx->qry.sha1); |
665 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, | 667 | cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, |
666 | ctx->qry.sha1, ctx->qry.sha2, NULL); | 668 | ctx->qry.sha1, ctx->qry.sha2, NULL); |
667 | if (ctx->repo->max_stats) | 669 | if (ctx->repo->max_stats) |
668 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), | 670 | cgit_stats_link("stats", NULL, hc(cmd, "stats"), |
669 | ctx->qry.head, NULL); | 671 | ctx->qry.head, NULL); |
670 | if (ctx->repo->readme) | 672 | if (ctx->repo->readme) |
671 | reporevlink("about", "about", NULL, | 673 | reporevlink("about", "about", NULL, |
672 | hc(cmd, "about"), ctx->qry.head, NULL, | 674 | hc(cmd, "about"), ctx->qry.head, NULL, |
673 | NULL); | 675 | NULL); |
674 | html("</td><td class='form'>"); | 676 | html("</td><td class='form'>"); |
675 | html("<form class='right' method='get' action='"); | 677 | html("<form class='right' method='get' action='"); |
676 | if (ctx->cfg.virtual_root) | 678 | if (ctx->cfg.virtual_root) |
677 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", | 679 | html_url_path(cgit_fileurl(ctx->qry.repo, "log", |
678 | ctx->qry.path, NULL)); | 680 | ctx->qry.path, NULL)); |
679 | html("'>\n"); | 681 | html("'>\n"); |
680 | cgit_add_hidden_formfields(1, 0, "log"); | 682 | cgit_add_hidden_formfields(1, 0, "log"); |
681 | html("<select name='qt'>\n"); | 683 | html("<select name='qt'>\n"); |
682 | html_option("grep", "log msg", ctx->qry.grep); | 684 | html_option("grep", "log msg", ctx->qry.grep); |
683 | html_option("author", "author", ctx->qry.grep); | 685 | html_option("author", "author", ctx->qry.grep); |
684 | html_option("committer", "committer", ctx->qry.grep); | 686 | html_option("committer", "committer", ctx->qry.grep); |
685 | html("</select>\n"); | 687 | html("</select>\n"); |
686 | html("<input class='txt' type='text' size='10' name='q' value='"); | 688 | html("<input class='txt' type='text' size='10' name='q' value='"); |
687 | html_attr(ctx->qry.search); | 689 | html_attr(ctx->qry.search); |
688 | html("'/>\n"); | 690 | html("'/>\n"); |
689 | html("<input type='submit' value='search'/>\n"); | 691 | html("<input type='submit' value='search'/>\n"); |
690 | html("</form>\n"); | 692 | html("</form>\n"); |
691 | } else { | 693 | } else { |
692 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); | 694 | site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); |
693 | if (ctx->cfg.root_readme) | 695 | if (ctx->cfg.root_readme) |
694 | site_link("about", "about", NULL, hc(cmd, "about"), | 696 | site_link("about", "about", NULL, hc(cmd, "about"), |
695 | NULL, 0); | 697 | NULL, 0); |
696 | html("</td><td class='form'>"); | 698 | html("</td><td class='form'>"); |
697 | html("<form method='get' action='"); | 699 | html("<form method='get' action='"); |
698 | html_attr(cgit_rooturl()); | 700 | html_attr(cgit_rooturl()); |
699 | html("'>\n"); | 701 | html("'>\n"); |
700 | html("<input type='text' name='q' size='10' value='"); | 702 | html("<input type='text' name='q' size='10' value='"); |
701 | html_attr(ctx->qry.search); | 703 | html_attr(ctx->qry.search); |
702 | html("'/>\n"); | 704 | html("'/>\n"); |
703 | html("<input type='submit' value='search'/>\n"); | 705 | html("<input type='submit' value='search'/>\n"); |
704 | html("</form>"); | 706 | html("</form>"); |
705 | } | 707 | } |
706 | html("</td></tr></table>\n"); | 708 | html("</td></tr></table>\n"); |
707 | html("<div class='content'>"); | 709 | html("<div class='content'>"); |
708 | } | 710 | } |
709 | 711 | ||
710 | void cgit_print_filemode(unsigned short mode) | 712 | void cgit_print_filemode(unsigned short mode) |
711 | { | 713 | { |
712 | if (S_ISDIR(mode)) | 714 | if (S_ISDIR(mode)) |
713 | html("d"); | 715 | html("d"); |
714 | else if (S_ISLNK(mode)) | 716 | else if (S_ISLNK(mode)) |
715 | html("l"); | 717 | html("l"); |
716 | else if (S_ISGITLINK(mode)) | 718 | else if (S_ISGITLINK(mode)) |
717 | html("m"); | 719 | html("m"); |
718 | else | 720 | else |
719 | html("-"); | 721 | html("-"); |
720 | html_fileperm(mode >> 6); | 722 | html_fileperm(mode >> 6); |
721 | html_fileperm(mode >> 3); | 723 | html_fileperm(mode >> 3); |
722 | html_fileperm(mode); | 724 | html_fileperm(mode); |
723 | } | 725 | } |
724 | 726 | ||
725 | void cgit_print_snapshot_links(const char *repo, const char *head, | 727 | void cgit_print_snapshot_links(const char *repo, const char *head, |
726 | const char *hex, int snapshots) | 728 | const char *hex, int snapshots) |
727 | { | 729 | { |
728 | const struct cgit_snapshot_format* f; | 730 | const struct cgit_snapshot_format* f; |
729 | char *filename; | 731 | char *filename; |
730 | 732 | ||
731 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 733 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
732 | if (!(snapshots & f->bit)) | 734 | if (!(snapshots & f->bit)) |
733 | continue; | 735 | continue; |
734 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 736 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
735 | f->suffix); | 737 | f->suffix); |
736 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); | 738 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
737 | html("<br/>"); | 739 | html("<br/>"); |
738 | } | 740 | } |
739 | } | 741 | } |