-rw-r--r-- | ui-shared.c | 6 | ||||
-rw-r--r-- | ui-shared.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ui-shared.c b/ui-shared.c index a959224..9b120ae 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -73,384 +73,390 @@ char *cgit_repourl(const char *reponame) | |||
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, | ||
266 | char *rev) | ||
267 | { | ||
268 | reporevlink("tag", name, title, class, head, rev, NULL); | ||
269 | } | ||
270 | |||
265 | 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, |
266 | char *rev, char *path) | 272 | char *rev, char *path) |
267 | { | 273 | { |
268 | reporevlink("tree", name, title, class, head, rev, path); | 274 | reporevlink("tree", name, title, class, head, rev, path); |
269 | } | 275 | } |
270 | 276 | ||
271 | 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, |
272 | char *rev, char *path) | 278 | char *rev, char *path) |
273 | { | 279 | { |
274 | reporevlink("plain", name, title, class, head, rev, path); | 280 | reporevlink("plain", name, title, class, head, rev, path); |
275 | } | 281 | } |
276 | 282 | ||
277 | 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, |
278 | char *rev, char *path, int ofs, char *grep, char *pattern) | 284 | char *rev, char *path, int ofs, char *grep, char *pattern) |
279 | { | 285 | { |
280 | char *delim; | 286 | char *delim; |
281 | 287 | ||
282 | delim = repolink(title, class, "log", head, path); | 288 | delim = repolink(title, class, "log", head, path); |
283 | if (rev && strcmp(rev, ctx.qry.head)) { | 289 | if (rev && strcmp(rev, ctx.qry.head)) { |
284 | html(delim); | 290 | html(delim); |
285 | html("id="); | 291 | html("id="); |
286 | html_url_arg(rev); | 292 | html_url_arg(rev); |
287 | delim = "&"; | 293 | delim = "&"; |
288 | } | 294 | } |
289 | if (grep && pattern) { | 295 | if (grep && pattern) { |
290 | html(delim); | 296 | html(delim); |
291 | html("qt="); | 297 | html("qt="); |
292 | html_url_arg(grep); | 298 | html_url_arg(grep); |
293 | delim = "&"; | 299 | delim = "&"; |
294 | html(delim); | 300 | html(delim); |
295 | html("q="); | 301 | html("q="); |
296 | html_url_arg(pattern); | 302 | html_url_arg(pattern); |
297 | } | 303 | } |
298 | if (ofs > 0) { | 304 | if (ofs > 0) { |
299 | html(delim); | 305 | html(delim); |
300 | html("ofs="); | 306 | html("ofs="); |
301 | htmlf("%d", ofs); | 307 | htmlf("%d", ofs); |
302 | } | 308 | } |
303 | html("'>"); | 309 | html("'>"); |
304 | html_txt(name); | 310 | html_txt(name); |
305 | html("</a>"); | 311 | html("</a>"); |
306 | } | 312 | } |
307 | 313 | ||
308 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 314 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
309 | char *rev) | 315 | char *rev) |
310 | { | 316 | { |
311 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { | 317 | if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) { |
312 | name[ctx.cfg.max_msg_len] = '\0'; | 318 | name[ctx.cfg.max_msg_len] = '\0'; |
313 | name[ctx.cfg.max_msg_len - 1] = '.'; | 319 | name[ctx.cfg.max_msg_len - 1] = '.'; |
314 | name[ctx.cfg.max_msg_len - 2] = '.'; | 320 | name[ctx.cfg.max_msg_len - 2] = '.'; |
315 | name[ctx.cfg.max_msg_len - 3] = '.'; | 321 | name[ctx.cfg.max_msg_len - 3] = '.'; |
316 | } | 322 | } |
317 | reporevlink("commit", name, title, class, head, rev, NULL); | 323 | reporevlink("commit", name, title, class, head, rev, NULL); |
318 | } | 324 | } |
319 | 325 | ||
320 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 326 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
321 | char *rev, char *path) | 327 | char *rev, char *path) |
322 | { | 328 | { |
323 | reporevlink("refs", name, title, class, head, rev, path); | 329 | reporevlink("refs", name, title, class, head, rev, path); |
324 | } | 330 | } |
325 | 331 | ||
326 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 332 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
327 | char *rev, char *archivename) | 333 | char *rev, char *archivename) |
328 | { | 334 | { |
329 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 335 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
330 | } | 336 | } |
331 | 337 | ||
332 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 338 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
333 | char *new_rev, char *old_rev, char *path) | 339 | char *new_rev, char *old_rev, char *path) |
334 | { | 340 | { |
335 | char *delim; | 341 | char *delim; |
336 | 342 | ||
337 | delim = repolink(title, class, "diff", head, path); | 343 | delim = repolink(title, class, "diff", head, path); |
338 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { | 344 | if (new_rev && strcmp(new_rev, ctx.qry.head)) { |
339 | html(delim); | 345 | html(delim); |
340 | html("id="); | 346 | html("id="); |
341 | html_url_arg(new_rev); | 347 | html_url_arg(new_rev); |
342 | delim = "&"; | 348 | delim = "&"; |
343 | } | 349 | } |
344 | if (old_rev) { | 350 | if (old_rev) { |
345 | html(delim); | 351 | html(delim); |
346 | html("id2="); | 352 | html("id2="); |
347 | html_url_arg(old_rev); | 353 | html_url_arg(old_rev); |
348 | } | 354 | } |
349 | html("'>"); | 355 | html("'>"); |
350 | html_txt(name); | 356 | html_txt(name); |
351 | html("</a>"); | 357 | html("</a>"); |
352 | } | 358 | } |
353 | 359 | ||
354 | void cgit_patch_link(char *name, char *title, char *class, char *head, | 360 | void cgit_patch_link(char *name, char *title, char *class, char *head, |
355 | char *rev) | 361 | char *rev) |
356 | { | 362 | { |
357 | reporevlink("patch", name, title, class, head, rev, NULL); | 363 | reporevlink("patch", name, title, class, head, rev, NULL); |
358 | } | 364 | } |
359 | 365 | ||
360 | void cgit_object_link(struct object *obj) | 366 | void cgit_object_link(struct object *obj) |
361 | { | 367 | { |
362 | char *page, *rev, *name; | 368 | char *page, *rev, *name; |
363 | 369 | ||
364 | if (obj->type == OBJ_COMMIT) { | 370 | if (obj->type == OBJ_COMMIT) { |
365 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 371 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
366 | ctx.qry.head, sha1_to_hex(obj->sha1)); | 372 | ctx.qry.head, sha1_to_hex(obj->sha1)); |
367 | return; | 373 | return; |
368 | } else if (obj->type == OBJ_TREE) | 374 | } else if (obj->type == OBJ_TREE) |
369 | page = "tree"; | 375 | page = "tree"; |
370 | else if (obj->type == OBJ_TAG) | 376 | else if (obj->type == OBJ_TAG) |
371 | page = "tag"; | 377 | page = "tag"; |
372 | else | 378 | else |
373 | page = "blob"; | 379 | page = "blob"; |
374 | rev = sha1_to_hex(obj->sha1); | 380 | rev = sha1_to_hex(obj->sha1); |
375 | name = fmt("%s %s", typename(obj->type), rev); | 381 | name = fmt("%s %s", typename(obj->type), rev); |
376 | reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); | 382 | reporevlink(page, name, NULL, NULL, ctx.qry.head, rev, NULL); |
377 | } | 383 | } |
378 | 384 | ||
379 | void cgit_print_date(time_t secs, char *format, int local_time) | 385 | void cgit_print_date(time_t secs, char *format, int local_time) |
380 | { | 386 | { |
381 | char buf[64]; | 387 | char buf[64]; |
382 | struct tm *time; | 388 | struct tm *time; |
383 | 389 | ||
384 | if (!secs) | 390 | if (!secs) |
385 | return; | 391 | return; |
386 | if(local_time) | 392 | if(local_time) |
387 | time = localtime(&secs); | 393 | time = localtime(&secs); |
388 | else | 394 | else |
389 | time = gmtime(&secs); | 395 | time = gmtime(&secs); |
390 | strftime(buf, sizeof(buf)-1, format, time); | 396 | strftime(buf, sizeof(buf)-1, format, time); |
391 | html_txt(buf); | 397 | html_txt(buf); |
392 | } | 398 | } |
393 | 399 | ||
394 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 400 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
395 | { | 401 | { |
396 | time_t now, secs; | 402 | time_t now, secs; |
397 | 403 | ||
398 | if (!t) | 404 | if (!t) |
399 | return; | 405 | return; |
400 | time(&now); | 406 | time(&now); |
401 | secs = now - t; | 407 | secs = now - t; |
402 | 408 | ||
403 | if (secs > max_relative && max_relative >= 0) { | 409 | if (secs > max_relative && max_relative >= 0) { |
404 | cgit_print_date(t, format, ctx.cfg.local_time); | 410 | cgit_print_date(t, format, ctx.cfg.local_time); |
405 | return; | 411 | return; |
406 | } | 412 | } |
407 | 413 | ||
408 | if (secs < TM_HOUR * 2) { | 414 | if (secs < TM_HOUR * 2) { |
409 | htmlf("<span class='age-mins'>%.0f min.</span>", | 415 | htmlf("<span class='age-mins'>%.0f min.</span>", |
410 | secs * 1.0 / TM_MIN); | 416 | secs * 1.0 / TM_MIN); |
411 | return; | 417 | return; |
412 | } | 418 | } |
413 | if (secs < TM_DAY * 2) { | 419 | if (secs < TM_DAY * 2) { |
414 | htmlf("<span class='age-hours'>%.0f hours</span>", | 420 | htmlf("<span class='age-hours'>%.0f hours</span>", |
415 | secs * 1.0 / TM_HOUR); | 421 | secs * 1.0 / TM_HOUR); |
416 | return; | 422 | return; |
417 | } | 423 | } |
418 | if (secs < TM_WEEK * 2) { | 424 | if (secs < TM_WEEK * 2) { |
419 | htmlf("<span class='age-days'>%.0f days</span>", | 425 | htmlf("<span class='age-days'>%.0f days</span>", |
420 | secs * 1.0 / TM_DAY); | 426 | secs * 1.0 / TM_DAY); |
421 | return; | 427 | return; |
422 | } | 428 | } |
423 | if (secs < TM_MONTH * 2) { | 429 | if (secs < TM_MONTH * 2) { |
424 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 430 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
425 | secs * 1.0 / TM_WEEK); | 431 | secs * 1.0 / TM_WEEK); |
426 | return; | 432 | return; |
427 | } | 433 | } |
428 | if (secs < TM_YEAR * 2) { | 434 | if (secs < TM_YEAR * 2) { |
429 | htmlf("<span class='age-months'>%.0f months</span>", | 435 | htmlf("<span class='age-months'>%.0f months</span>", |
430 | secs * 1.0 / TM_MONTH); | 436 | secs * 1.0 / TM_MONTH); |
431 | return; | 437 | return; |
432 | } | 438 | } |
433 | htmlf("<span class='age-years'>%.0f years</span>", | 439 | htmlf("<span class='age-years'>%.0f years</span>", |
434 | secs * 1.0 / TM_YEAR); | 440 | secs * 1.0 / TM_YEAR); |
435 | } | 441 | } |
436 | 442 | ||
437 | void cgit_print_http_headers(struct cgit_context *ctx) | 443 | void cgit_print_http_headers(struct cgit_context *ctx) |
438 | { | 444 | { |
439 | if (ctx->page.mimetype && ctx->page.charset) | 445 | if (ctx->page.mimetype && ctx->page.charset) |
440 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, | 446 | htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype, |
441 | ctx->page.charset); | 447 | ctx->page.charset); |
442 | else if (ctx->page.mimetype) | 448 | else if (ctx->page.mimetype) |
443 | htmlf("Content-Type: %s\n", ctx->page.mimetype); | 449 | htmlf("Content-Type: %s\n", ctx->page.mimetype); |
444 | if (ctx->page.size) | 450 | if (ctx->page.size) |
445 | htmlf("Content-Length: %ld\n", ctx->page.size); | 451 | htmlf("Content-Length: %ld\n", ctx->page.size); |
446 | if (ctx->page.filename) | 452 | if (ctx->page.filename) |
447 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", | 453 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", |
448 | ctx->page.filename); | 454 | ctx->page.filename); |
449 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); | 455 | htmlf("Last-Modified: %s\n", http_date(ctx->page.modified)); |
450 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); | 456 | htmlf("Expires: %s\n", http_date(ctx->page.expires)); |
451 | html("\n"); | 457 | html("\n"); |
452 | } | 458 | } |
453 | 459 | ||
454 | void cgit_print_docstart(struct cgit_context *ctx) | 460 | void cgit_print_docstart(struct cgit_context *ctx) |
455 | { | 461 | { |
456 | char *host = cgit_hosturl(); | 462 | char *host = cgit_hosturl(); |
diff --git a/ui-shared.h b/ui-shared.h index 0cd5ed1..3c8a6d0 100644 --- a/ui-shared.h +++ b/ui-shared.h | |||
@@ -1,44 +1,46 @@ | |||
1 | #ifndef UI_SHARED_H | 1 | #ifndef UI_SHARED_H |
2 | #define UI_SHARED_H | 2 | #define UI_SHARED_H |
3 | 3 | ||
4 | extern char *cgit_hosturl(); | 4 | extern char *cgit_hosturl(); |
5 | extern char *cgit_repourl(const char *reponame); | 5 | extern char *cgit_repourl(const char *reponame); |
6 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 6 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
7 | const char *filename, const char *query); | 7 | const char *filename, const char *query); |
8 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 8 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
9 | const char *query); | 9 | const char *query); |
10 | 10 | ||
11 | extern void cgit_index_link(char *name, char *title, char *class, | 11 | extern void cgit_index_link(char *name, char *title, char *class, |
12 | char *pattern, int ofs); | 12 | char *pattern, int ofs); |
13 | extern void cgit_summary_link(char *name, char *title, char *class, char *head); | 13 | extern void cgit_summary_link(char *name, char *title, char *class, char *head); |
14 | extern void cgit_tag_link(char *name, char *title, char *class, char *head, | ||
15 | char *rev); | ||
14 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 16 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
15 | char *rev, char *path); | 17 | char *rev, char *path); |
16 | extern void cgit_plain_link(char *name, char *title, char *class, char *head, | 18 | extern void cgit_plain_link(char *name, char *title, char *class, char *head, |
17 | char *rev, char *path); | 19 | char *rev, char *path); |
18 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 20 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
19 | char *rev, char *path, int ofs, char *grep, | 21 | char *rev, char *path, int ofs, char *grep, |
20 | char *pattern); | 22 | char *pattern); |
21 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 23 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
22 | char *rev); | 24 | char *rev); |
23 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, | 25 | extern void cgit_patch_link(char *name, char *title, char *class, char *head, |
24 | char *rev); | 26 | char *rev); |
25 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | 27 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, |
26 | char *rev, char *path); | 28 | char *rev, char *path); |
27 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 29 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
28 | char *head, char *rev, char *archivename); | 30 | char *head, char *rev, char *archivename); |
29 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 31 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
30 | char *new_rev, char *old_rev, char *path); | 32 | char *new_rev, char *old_rev, char *path); |
31 | extern void cgit_object_link(struct object *obj); | 33 | extern void cgit_object_link(struct object *obj); |
32 | 34 | ||
33 | extern void cgit_print_error(char *msg); | 35 | extern void cgit_print_error(char *msg); |
34 | extern void cgit_print_date(time_t secs, char *format, int local_time); | 36 | extern void cgit_print_date(time_t secs, char *format, int local_time); |
35 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 37 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
36 | extern void cgit_print_http_headers(struct cgit_context *ctx); | 38 | extern void cgit_print_http_headers(struct cgit_context *ctx); |
37 | extern void cgit_print_docstart(struct cgit_context *ctx); | 39 | extern void cgit_print_docstart(struct cgit_context *ctx); |
38 | extern void cgit_print_docend(); | 40 | extern void cgit_print_docend(); |
39 | extern void cgit_print_pageheader(struct cgit_context *ctx); | 41 | extern void cgit_print_pageheader(struct cgit_context *ctx); |
40 | extern void cgit_print_filemode(unsigned short mode); | 42 | extern void cgit_print_filemode(unsigned short mode); |
41 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 43 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
42 | const char *hex, int snapshots); | 44 | const char *hex, int snapshots); |
43 | 45 | ||
44 | #endif /* UI_SHARED_H */ | 46 | #endif /* UI_SHARED_H */ |