-rw-r--r-- | parsing.c | 6 | ||||
-rw-r--r-- | ui-shared.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -1,307 +1,307 @@ | |||
1 | /* config.c: parsing of config files | 1 | /* config.c: parsing of config files |
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 | 10 | ||
11 | int next_char(FILE *f) | 11 | int next_char(FILE *f) |
12 | { | 12 | { |
13 | int c = fgetc(f); | 13 | int c = fgetc(f); |
14 | if (c=='\r') { | 14 | if (c=='\r') { |
15 | c = fgetc(f); | 15 | c = fgetc(f); |
16 | if (c!='\n') { | 16 | if (c!='\n') { |
17 | ungetc(c, f); | 17 | ungetc(c, f); |
18 | c = '\r'; | 18 | c = '\r'; |
19 | } | 19 | } |
20 | } | 20 | } |
21 | return c; | 21 | return c; |
22 | } | 22 | } |
23 | 23 | ||
24 | void skip_line(FILE *f) | 24 | void skip_line(FILE *f) |
25 | { | 25 | { |
26 | int c; | 26 | int c; |
27 | 27 | ||
28 | while((c=next_char(f)) && c!='\n' && c!=EOF) | 28 | while((c=next_char(f)) && c!='\n' && c!=EOF) |
29 | ; | 29 | ; |
30 | } | 30 | } |
31 | 31 | ||
32 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) | 32 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) |
33 | { | 33 | { |
34 | int i = 0, isname = 0; | 34 | int i = 0, isname = 0; |
35 | 35 | ||
36 | *value = NULL; | 36 | *value = NULL; |
37 | while(i<bufsize-1) { | 37 | while(i<bufsize-1) { |
38 | int c = next_char(f); | 38 | int c = next_char(f); |
39 | if (!isname && (c=='#' || c==';')) { | 39 | if (!isname && (c=='#' || c==';')) { |
40 | skip_line(f); | 40 | skip_line(f); |
41 | continue; | 41 | continue; |
42 | } | 42 | } |
43 | if (!isname && isspace(c)) | 43 | if (!isname && isspace(c)) |
44 | continue; | 44 | continue; |
45 | 45 | ||
46 | if (c=='=' && !*value) { | 46 | if (c=='=' && !*value) { |
47 | line[i] = 0; | 47 | line[i] = 0; |
48 | *value = &line[i+1]; | 48 | *value = &line[i+1]; |
49 | } else if (c=='\n' && !isname) { | 49 | } else if (c=='\n' && !isname) { |
50 | i = 0; | 50 | i = 0; |
51 | continue; | 51 | continue; |
52 | } else if (c=='\n' || c==EOF) { | 52 | } else if (c=='\n' || c==EOF) { |
53 | line[i] = 0; | 53 | line[i] = 0; |
54 | break; | 54 | break; |
55 | } else { | 55 | } else { |
56 | line[i]=c; | 56 | line[i]=c; |
57 | } | 57 | } |
58 | isname = 1; | 58 | isname = 1; |
59 | i++; | 59 | i++; |
60 | } | 60 | } |
61 | line[i+1] = 0; | 61 | line[i+1] = 0; |
62 | return i; | 62 | return i; |
63 | } | 63 | } |
64 | 64 | ||
65 | int cgit_read_config(const char *filename, configfn fn) | 65 | int cgit_read_config(const char *filename, configfn fn) |
66 | { | 66 | { |
67 | static int nesting; | 67 | static int nesting; |
68 | int len; | 68 | int len; |
69 | char line[256]; | 69 | char line[256]; |
70 | const char *value; | 70 | const char *value; |
71 | FILE *f; | 71 | FILE *f; |
72 | 72 | ||
73 | /* cancel deeply nested include-commands */ | 73 | /* cancel deeply nested include-commands */ |
74 | if (nesting > 8) | 74 | if (nesting > 8) |
75 | return -1; | 75 | return -1; |
76 | if (!(f = fopen(filename, "r"))) | 76 | if (!(f = fopen(filename, "r"))) |
77 | return -1; | 77 | return -1; |
78 | nesting++; | 78 | nesting++; |
79 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) | 79 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) |
80 | (*fn)(line, value); | 80 | (*fn)(line, value); |
81 | nesting--; | 81 | nesting--; |
82 | fclose(f); | 82 | fclose(f); |
83 | return 0; | 83 | return 0; |
84 | } | 84 | } |
85 | 85 | ||
86 | char *convert_query_hexchar(char *txt) | 86 | char *convert_query_hexchar(char *txt) |
87 | { | 87 | { |
88 | int d1, d2; | 88 | int d1, d2; |
89 | if (strlen(txt) < 3) { | 89 | if (strlen(txt) < 3) { |
90 | *txt = '\0'; | 90 | *txt = '\0'; |
91 | return txt-1; | 91 | return txt-1; |
92 | } | 92 | } |
93 | d1 = hextoint(*(txt+1)); | 93 | d1 = hextoint(*(txt+1)); |
94 | d2 = hextoint(*(txt+2)); | 94 | d2 = hextoint(*(txt+2)); |
95 | if (d1<0 || d2<0) { | 95 | if (d1<0 || d2<0) { |
96 | strcpy(txt, txt+3); | 96 | strcpy(txt, txt+3); |
97 | return txt-1; | 97 | return txt-1; |
98 | } else { | 98 | } else { |
99 | *txt = d1 * 16 + d2; | 99 | *txt = d1 * 16 + d2; |
100 | strcpy(txt+1, txt+3); | 100 | strcpy(txt+1, txt+3); |
101 | return txt; | 101 | return txt; |
102 | } | 102 | } |
103 | } | 103 | } |
104 | 104 | ||
105 | int cgit_parse_query(char *txt, configfn fn) | 105 | int cgit_parse_query(char *txt, configfn fn) |
106 | { | 106 | { |
107 | char *t, *value = NULL, c; | 107 | char *t, *value = NULL, c; |
108 | 108 | ||
109 | if (!txt) | 109 | if (!txt) |
110 | return 0; | 110 | return 0; |
111 | 111 | ||
112 | t = txt = xstrdup(txt); | 112 | t = txt = xstrdup(txt); |
113 | 113 | ||
114 | while((c=*t) != '\0') { | 114 | while((c=*t) != '\0') { |
115 | if (c=='=') { | 115 | if (c=='=') { |
116 | *t = '\0'; | 116 | *t = '\0'; |
117 | value = t+1; | 117 | value = t+1; |
118 | } else if (c=='+') { | 118 | } else if (c=='+') { |
119 | *t = ' '; | 119 | *t = ' '; |
120 | } else if (c=='%') { | 120 | } else if (c=='%') { |
121 | t = convert_query_hexchar(t); | 121 | t = convert_query_hexchar(t); |
122 | } else if (c=='&') { | 122 | } else if (c=='&') { |
123 | *t = '\0'; | 123 | *t = '\0'; |
124 | (*fn)(txt, value); | 124 | (*fn)(txt, value); |
125 | txt = t+1; | 125 | txt = t+1; |
126 | value = NULL; | 126 | value = NULL; |
127 | } | 127 | } |
128 | t++; | 128 | t++; |
129 | } | 129 | } |
130 | if (t!=txt) | 130 | if (t!=txt) |
131 | (*fn)(txt, value); | 131 | (*fn)(txt, value); |
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | /* | 135 | /* |
136 | * url syntax: [repo ['/' cmd [ '/' path]]] | 136 | * url syntax: [repo ['/' cmd [ '/' path]]] |
137 | * repo: any valid repo url, may contain '/' | 137 | * repo: any valid repo url, may contain '/' |
138 | * cmd: log | commit | diff | tree | view | blob | snapshot | 138 | * cmd: log | commit | diff | tree | view | blob | snapshot |
139 | * path: any valid path, may contain '/' | 139 | * path: any valid path, may contain '/' |
140 | * | 140 | * |
141 | */ | 141 | */ |
142 | void cgit_parse_url(const char *url) | 142 | void cgit_parse_url(const char *url) |
143 | { | 143 | { |
144 | char *cmd, *p; | 144 | char *cmd, *p; |
145 | 145 | ||
146 | cgit_repo = NULL; | 146 | cgit_repo = NULL; |
147 | if (!url || url[0] == '\0') | 147 | if (!url || url[0] == '\0') |
148 | return; | 148 | return; |
149 | 149 | ||
150 | cgit_repo = cgit_get_repoinfo(url); | 150 | cgit_repo = cgit_get_repoinfo(url); |
151 | if (cgit_repo) { | 151 | if (cgit_repo) { |
152 | cgit_query_repo = cgit_repo->url; | 152 | cgit_query_repo = cgit_repo->url; |
153 | return; | 153 | return; |
154 | } | 154 | } |
155 | 155 | ||
156 | cmd = strchr(url, '/'); | 156 | cmd = strchr(url, '/'); |
157 | while (!cgit_repo && cmd) { | 157 | while (!cgit_repo && cmd) { |
158 | cmd[0] = '\0'; | 158 | cmd[0] = '\0'; |
159 | cgit_repo = cgit_get_repoinfo(url); | 159 | cgit_repo = cgit_get_repoinfo(url); |
160 | if (cgit_repo == NULL) { | 160 | if (cgit_repo == NULL) { |
161 | cmd[0] = '/'; | 161 | cmd[0] = '/'; |
162 | cmd = strchr(cmd + 1, '/'); | 162 | cmd = strchr(cmd + 1, '/'); |
163 | continue; | 163 | continue; |
164 | } | 164 | } |
165 | 165 | ||
166 | cgit_query_repo = cgit_repo->url; | 166 | cgit_query_repo = cgit_repo->url; |
167 | p = strchr(cmd + 1, '/'); | 167 | p = strchr(cmd + 1, '/'); |
168 | if (p) { | 168 | if (p) { |
169 | p[0] = '\0'; | 169 | p[0] = '\0'; |
170 | if (p[1]) | 170 | if (p[1]) |
171 | cgit_query_path = trim_end(p + 1, '/'); | 171 | cgit_query_path = trim_end(p + 1, '/'); |
172 | } | 172 | } |
173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); | 173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); |
174 | cgit_query_page = xstrdup(cmd + 1); | 174 | cgit_query_page = xstrdup(cmd + 1); |
175 | return; | 175 | return; |
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | char *substr(const char *head, const char *tail) | 179 | char *substr(const char *head, const char *tail) |
180 | { | 180 | { |
181 | char *buf; | 181 | char *buf; |
182 | 182 | ||
183 | buf = xmalloc(tail - head + 1); | 183 | buf = xmalloc(tail - head + 1); |
184 | strncpy(buf, head, tail - head); | 184 | strncpy(buf, head, tail - head); |
185 | buf[tail - head] = '\0'; | 185 | buf[tail - head] = '\0'; |
186 | return buf; | 186 | return buf; |
187 | } | 187 | } |
188 | 188 | ||
189 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 189 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
190 | { | 190 | { |
191 | struct commitinfo *ret; | 191 | struct commitinfo *ret; |
192 | char *p = commit->buffer, *t = commit->buffer; | 192 | char *p = commit->buffer, *t = commit->buffer; |
193 | 193 | ||
194 | ret = xmalloc(sizeof(*ret)); | 194 | ret = xmalloc(sizeof(*ret)); |
195 | ret->commit = commit; | 195 | ret->commit = commit; |
196 | ret->author = NULL; | 196 | ret->author = NULL; |
197 | ret->author_email = NULL; | 197 | ret->author_email = NULL; |
198 | ret->committer = NULL; | 198 | ret->committer = NULL; |
199 | ret->committer_email = NULL; | 199 | ret->committer_email = NULL; |
200 | ret->subject = NULL; | 200 | ret->subject = NULL; |
201 | ret->msg = NULL; | 201 | ret->msg = NULL; |
202 | 202 | ||
203 | if (p == NULL) | 203 | if (p == NULL) |
204 | return ret; | 204 | return ret; |
205 | 205 | ||
206 | if (strncmp(p, "tree ", 5)) | 206 | if (strncmp(p, "tree ", 5)) |
207 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 207 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
208 | else | 208 | else |
209 | p += 46; // "tree " + hex[40] + "\n" | 209 | p += 46; // "tree " + hex[40] + "\n" |
210 | 210 | ||
211 | while (!strncmp(p, "parent ", 7)) | 211 | while (!strncmp(p, "parent ", 7)) |
212 | p += 48; // "parent " + hex[40] + "\n" | 212 | p += 48; // "parent " + hex[40] + "\n" |
213 | 213 | ||
214 | if (!strncmp(p, "author ", 7)) { | 214 | if (!strncmp(p, "author ", 7)) { |
215 | p += 7; | 215 | p += 7; |
216 | t = strchr(p, '<') - 1; | 216 | t = strchr(p, '<') - 1; |
217 | ret->author = substr(p, t); | 217 | ret->author = substr(p, t); |
218 | p = t; | 218 | p = t; |
219 | t = strchr(t, '>') + 1; | 219 | t = strchr(t, '>') + 1; |
220 | ret->author_email = substr(p, t); | 220 | ret->author_email = substr(p, t); |
221 | ret->author_date = atol(++t); | 221 | ret->author_date = atol(t+1); |
222 | p = strchr(t, '\n') + 1; | 222 | p = strchr(t, '\n') + 1; |
223 | } | 223 | } |
224 | 224 | ||
225 | if (!strncmp(p, "committer ", 9)) { | 225 | if (!strncmp(p, "committer ", 9)) { |
226 | p += 9; | 226 | p += 9; |
227 | t = strchr(p, '<') - 1; | 227 | t = strchr(p, '<') - 1; |
228 | ret->committer = substr(p, t); | 228 | ret->committer = substr(p, t); |
229 | p = t; | 229 | p = t; |
230 | t = strchr(t, '>') + 1; | 230 | t = strchr(t, '>') + 1; |
231 | ret->committer_email = substr(p, t); | 231 | ret->committer_email = substr(p, t); |
232 | ret->committer_date = atol(++t); | 232 | ret->committer_date = atol(t+1); |
233 | p = strchr(t, '\n') + 1; | 233 | p = strchr(t, '\n') + 1; |
234 | } | 234 | } |
235 | 235 | ||
236 | while (*p && (*p != '\n')) | 236 | while (*p && (*p != '\n')) |
237 | p = strchr(p, '\n') + 1; // skip unknown header fields | 237 | p = strchr(p, '\n') + 1; // skip unknown header fields |
238 | 238 | ||
239 | while (*p == '\n') | 239 | while (*p == '\n') |
240 | p = strchr(p, '\n') + 1; | 240 | p = strchr(p, '\n') + 1; |
241 | 241 | ||
242 | t = strchr(p, '\n'); | 242 | t = strchr(p, '\n'); |
243 | if (t) { | 243 | if (t) { |
244 | if (*t == '\0') | 244 | if (*t == '\0') |
245 | ret->subject = "** empty **"; | 245 | ret->subject = "** empty **"; |
246 | else | 246 | else |
247 | ret->subject = substr(p, t); | 247 | ret->subject = substr(p, t); |
248 | p = t + 1; | 248 | p = t + 1; |
249 | 249 | ||
250 | while (*p == '\n') | 250 | while (*p == '\n') |
251 | p = strchr(p, '\n') + 1; | 251 | p = strchr(p, '\n') + 1; |
252 | ret->msg = xstrdup(p); | 252 | ret->msg = xstrdup(p); |
253 | } else | 253 | } else |
254 | ret->subject = substr(p, p+strlen(p)); | 254 | ret->subject = substr(p, p+strlen(p)); |
255 | 255 | ||
256 | return ret; | 256 | return ret; |
257 | } | 257 | } |
258 | 258 | ||
259 | 259 | ||
260 | struct taginfo *cgit_parse_tag(struct tag *tag) | 260 | struct taginfo *cgit_parse_tag(struct tag *tag) |
261 | { | 261 | { |
262 | void *data; | 262 | void *data; |
263 | enum object_type type; | 263 | enum object_type type; |
264 | unsigned long size; | 264 | unsigned long size; |
265 | char *p, *t; | 265 | char *p, *t; |
266 | struct taginfo *ret; | 266 | struct taginfo *ret; |
267 | 267 | ||
268 | data = read_sha1_file(tag->object.sha1, &type, &size); | 268 | data = read_sha1_file(tag->object.sha1, &type, &size); |
269 | if (!data || type != OBJ_TAG) { | 269 | if (!data || type != OBJ_TAG) { |
270 | free(data); | 270 | free(data); |
271 | return 0; | 271 | return 0; |
272 | } | 272 | } |
273 | 273 | ||
274 | ret = xmalloc(sizeof(*ret)); | 274 | ret = xmalloc(sizeof(*ret)); |
275 | ret->tagger = NULL; | 275 | ret->tagger = NULL; |
276 | ret->tagger_email = NULL; | 276 | ret->tagger_email = NULL; |
277 | ret->tagger_date = 0; | 277 | ret->tagger_date = 0; |
278 | ret->msg = NULL; | 278 | ret->msg = NULL; |
279 | 279 | ||
280 | p = data; | 280 | p = data; |
281 | 281 | ||
282 | while (p && *p) { | 282 | while (p && *p) { |
283 | if (*p == '\n') | 283 | if (*p == '\n') |
284 | break; | 284 | break; |
285 | 285 | ||
286 | if (!strncmp(p, "tagger ", 7)) { | 286 | if (!strncmp(p, "tagger ", 7)) { |
287 | p += 7; | 287 | p += 7; |
288 | t = strchr(p, '<') - 1; | 288 | t = strchr(p, '<') - 1; |
289 | ret->tagger = substr(p, t); | 289 | ret->tagger = substr(p, t); |
290 | p = t; | 290 | p = t; |
291 | t = strchr(t, '>') + 1; | 291 | t = strchr(t, '>') + 1; |
292 | ret->tagger_email = substr(p, t); | 292 | ret->tagger_email = substr(p, t); |
293 | ret->tagger_date = atol(++t); | 293 | ret->tagger_date = atol(t+1); |
294 | } | 294 | } |
295 | p = strchr(p, '\n') + 1; | 295 | p = strchr(p, '\n') + 1; |
296 | } | 296 | } |
297 | 297 | ||
298 | while (p && *p && (*p != '\n')) | 298 | while (p && *p && (*p != '\n')) |
299 | p = strchr(p, '\n') + 1; // skip unknown tag fields | 299 | p = strchr(p, '\n') + 1; // skip unknown tag fields |
300 | 300 | ||
301 | while (p && (*p == '\n')) | 301 | while (p && (*p == '\n')) |
302 | p = strchr(p, '\n') + 1; | 302 | p = strchr(p, '\n') + 1; |
303 | if (p && *p) | 303 | if (p && *p) |
304 | ret->msg = xstrdup(p); | 304 | ret->msg = xstrdup(p); |
305 | free(data); | 305 | free(data); |
306 | return ret; | 306 | return ret; |
307 | } | 307 | } |
diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..4944dfd 100644 --- a/ui-shared.c +++ b/ui-shared.c | |||
@@ -1,537 +1,541 @@ | |||
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 | 10 | ||
11 | const char cgit_doctype[] = | 11 | const char cgit_doctype[] = |
12 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" | 12 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" |
13 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; | 13 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; |
14 | 14 | ||
15 | static char *http_date(time_t t) | 15 | static char *http_date(time_t t) |
16 | { | 16 | { |
17 | static char day[][4] = | 17 | static char day[][4] = |
18 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; | 18 | {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; |
19 | static char month[][4] = | 19 | static char month[][4] = |
20 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", | 20 | {"Jan", "Feb", "Mar", "Apr", "May", "Jun", |
21 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; | 21 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; |
22 | struct tm *tm = gmtime(&t); | 22 | struct tm *tm = gmtime(&t); |
23 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], | 23 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], |
24 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 24 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |
25 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 25 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
26 | } | 26 | } |
27 | 27 | ||
28 | static long ttl_seconds(long ttl) | 28 | static long ttl_seconds(long ttl) |
29 | { | 29 | { |
30 | if (ttl<0) | 30 | if (ttl<0) |
31 | return 60 * 60 * 24 * 365; | 31 | return 60 * 60 * 24 * 365; |
32 | else | 32 | else |
33 | return ttl * 60; | 33 | return ttl * 60; |
34 | } | 34 | } |
35 | 35 | ||
36 | void cgit_print_error(char *msg) | 36 | void cgit_print_error(char *msg) |
37 | { | 37 | { |
38 | html("<div class='error'>"); | 38 | html("<div class='error'>"); |
39 | html_txt(msg); | 39 | html_txt(msg); |
40 | html("</div>\n"); | 40 | html("</div>\n"); |
41 | } | 41 | } |
42 | 42 | ||
43 | char *cgit_rooturl() | 43 | char *cgit_rooturl() |
44 | { | 44 | { |
45 | if (cgit_virtual_root) | 45 | if (cgit_virtual_root) |
46 | return fmt("%s/", cgit_virtual_root); | 46 | return fmt("%s/", cgit_virtual_root); |
47 | else | 47 | else |
48 | return cgit_script_name; | 48 | return cgit_script_name; |
49 | } | 49 | } |
50 | 50 | ||
51 | char *cgit_repourl(const char *reponame) | 51 | char *cgit_repourl(const char *reponame) |
52 | { | 52 | { |
53 | if (cgit_virtual_root) { | 53 | if (cgit_virtual_root) { |
54 | return fmt("%s/%s/", cgit_virtual_root, reponame); | 54 | return fmt("%s/%s/", cgit_virtual_root, reponame); |
55 | } else { | 55 | } else { |
56 | return fmt("?r=%s", reponame); | 56 | return fmt("?r=%s", reponame); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | char *cgit_fileurl(const char *reponame, const char *pagename, | 60 | char *cgit_fileurl(const char *reponame, const char *pagename, |
61 | const char *filename, const char *query) | 61 | const char *filename, const char *query) |
62 | { | 62 | { |
63 | char *tmp; | 63 | char *tmp; |
64 | char *delim; | 64 | char *delim; |
65 | 65 | ||
66 | if (cgit_virtual_root) { | 66 | if (cgit_virtual_root) { |
67 | tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame, | 67 | tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame, |
68 | pagename, (filename ? filename:"")); | 68 | pagename, (filename ? filename:"")); |
69 | delim = "?"; | 69 | delim = "?"; |
70 | } else { | 70 | } else { |
71 | tmp = fmt("?url=%s/%s/%s", reponame, pagename, | 71 | tmp = fmt("?url=%s/%s/%s", reponame, pagename, |
72 | (filename ? filename : "")); | 72 | (filename ? filename : "")); |
73 | delim = "&"; | 73 | delim = "&"; |
74 | } | 74 | } |
75 | if (query) | 75 | if (query) |
76 | tmp = fmt("%s%s%s", tmp, delim, query); | 76 | tmp = fmt("%s%s%s", tmp, delim, query); |
77 | return tmp; | 77 | return tmp; |
78 | } | 78 | } |
79 | 79 | ||
80 | char *cgit_pageurl(const char *reponame, const char *pagename, | 80 | char *cgit_pageurl(const char *reponame, const char *pagename, |
81 | const char *query) | 81 | const char *query) |
82 | { | 82 | { |
83 | return cgit_fileurl(reponame,pagename,0,query); | 83 | return cgit_fileurl(reponame,pagename,0,query); |
84 | } | 84 | } |
85 | 85 | ||
86 | const char *cgit_repobasename(const char *reponame) | 86 | const char *cgit_repobasename(const char *reponame) |
87 | { | 87 | { |
88 | /* I assume we don't need to store more than one repo basename */ | 88 | /* I assume we don't need to store more than one repo basename */ |
89 | static char rvbuf[1024]; | 89 | static char rvbuf[1024]; |
90 | int p; | 90 | int p; |
91 | const char *rv; | 91 | const char *rv; |
92 | strncpy(rvbuf,reponame,sizeof(rvbuf)); | 92 | strncpy(rvbuf,reponame,sizeof(rvbuf)); |
93 | if(rvbuf[sizeof(rvbuf)-1]) | 93 | if(rvbuf[sizeof(rvbuf)-1]) |
94 | die("cgit_repobasename: truncated repository name '%s'", reponame); | 94 | die("cgit_repobasename: truncated repository name '%s'", reponame); |
95 | p = strlen(rvbuf)-1; | 95 | p = strlen(rvbuf)-1; |
96 | /* strip trailing slashes */ | 96 | /* strip trailing slashes */ |
97 | while(p && rvbuf[p]=='/') rvbuf[p--]=0; | 97 | while(p && rvbuf[p]=='/') rvbuf[p--]=0; |
98 | /* strip trailing .git */ | 98 | /* strip trailing .git */ |
99 | if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { | 99 | if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) { |
100 | p -= 3; rvbuf[p--] = 0; | 100 | p -= 3; rvbuf[p--] = 0; |
101 | } | 101 | } |
102 | /* strip more trailing slashes if any */ | 102 | /* strip more trailing slashes if any */ |
103 | while( p && rvbuf[p]=='/') rvbuf[p--]=0; | 103 | while( p && rvbuf[p]=='/') rvbuf[p--]=0; |
104 | /* find last slash in the remaining string */ | 104 | /* find last slash in the remaining string */ |
105 | rv = strrchr(rvbuf,'/'); | 105 | rv = strrchr(rvbuf,'/'); |
106 | if(rv) | 106 | if(rv) |
107 | return ++rv; | 107 | return ++rv; |
108 | return rvbuf; | 108 | return rvbuf; |
109 | } | 109 | } |
110 | 110 | ||
111 | char *cgit_currurl() | 111 | char *cgit_currurl() |
112 | { | 112 | { |
113 | if (!cgit_virtual_root) | 113 | if (!cgit_virtual_root) |
114 | return cgit_script_name; | 114 | return cgit_script_name; |
115 | else if (cgit_query_page) | 115 | else if (cgit_query_page) |
116 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); | 116 | return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page); |
117 | else if (cgit_query_repo) | 117 | else if (cgit_query_repo) |
118 | return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); | 118 | return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo); |
119 | else | 119 | else |
120 | return fmt("%s/", cgit_virtual_root); | 120 | return fmt("%s/", cgit_virtual_root); |
121 | } | 121 | } |
122 | 122 | ||
123 | static char *repolink(char *title, char *class, char *page, char *head, | 123 | static char *repolink(char *title, char *class, char *page, char *head, |
124 | char *path) | 124 | char *path) |
125 | { | 125 | { |
126 | char *delim = "?"; | 126 | char *delim = "?"; |
127 | 127 | ||
128 | html("<a"); | 128 | html("<a"); |
129 | if (title) { | 129 | if (title) { |
130 | html(" title='"); | 130 | html(" title='"); |
131 | html_attr(title); | 131 | html_attr(title); |
132 | html("'"); | 132 | html("'"); |
133 | } | 133 | } |
134 | if (class) { | 134 | if (class) { |
135 | html(" class='"); | 135 | html(" class='"); |
136 | html_attr(class); | 136 | html_attr(class); |
137 | html("'"); | 137 | html("'"); |
138 | } | 138 | } |
139 | html(" href='"); | 139 | html(" href='"); |
140 | if (cgit_virtual_root) { | 140 | if (cgit_virtual_root) { |
141 | html_attr(cgit_virtual_root); | 141 | html_attr(cgit_virtual_root); |
142 | if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') | 142 | if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/') |
143 | html("/"); | 143 | html("/"); |
144 | html_attr(cgit_repo->url); | 144 | html_attr(cgit_repo->url); |
145 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 145 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
146 | html("/"); | 146 | html("/"); |
147 | if (page) { | 147 | if (page) { |
148 | html(page); | 148 | html(page); |
149 | html("/"); | 149 | html("/"); |
150 | if (path) | 150 | if (path) |
151 | html_attr(path); | 151 | html_attr(path); |
152 | } | 152 | } |
153 | } else { | 153 | } else { |
154 | html(cgit_script_name); | 154 | html(cgit_script_name); |
155 | html("?url="); | 155 | html("?url="); |
156 | html_attr(cgit_repo->url); | 156 | html_attr(cgit_repo->url); |
157 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') | 157 | if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/') |
158 | html("/"); | 158 | html("/"); |
159 | if (page) { | 159 | if (page) { |
160 | html(page); | 160 | html(page); |
161 | html("/"); | 161 | html("/"); |
162 | if (path) | 162 | if (path) |
163 | html_attr(path); | 163 | html_attr(path); |
164 | } | 164 | } |
165 | delim = "&"; | 165 | delim = "&"; |
166 | } | 166 | } |
167 | if (head && strcmp(head, cgit_repo->defbranch)) { | 167 | if (head && strcmp(head, cgit_repo->defbranch)) { |
168 | html(delim); | 168 | html(delim); |
169 | html("h="); | 169 | html("h="); |
170 | html_attr(head); | 170 | html_attr(head); |
171 | delim = "&"; | 171 | delim = "&"; |
172 | } | 172 | } |
173 | return fmt("%s", delim); | 173 | return fmt("%s", delim); |
174 | } | 174 | } |
175 | 175 | ||
176 | static void reporevlink(char *page, char *name, char *title, char *class, | 176 | static void reporevlink(char *page, char *name, char *title, char *class, |
177 | char *head, char *rev, char *path) | 177 | char *head, char *rev, char *path) |
178 | { | 178 | { |
179 | char *delim; | 179 | char *delim; |
180 | 180 | ||
181 | delim = repolink(title, class, page, head, path); | 181 | delim = repolink(title, class, page, head, path); |
182 | if (rev && strcmp(rev, cgit_query_head)) { | 182 | if (rev && strcmp(rev, cgit_query_head)) { |
183 | html(delim); | 183 | html(delim); |
184 | html("id="); | 184 | html("id="); |
185 | html_attr(rev); | 185 | html_attr(rev); |
186 | } | 186 | } |
187 | html("'>"); | 187 | html("'>"); |
188 | html_txt(name); | 188 | html_txt(name); |
189 | html("</a>"); | 189 | html("</a>"); |
190 | } | 190 | } |
191 | 191 | ||
192 | void cgit_tree_link(char *name, char *title, char *class, char *head, | 192 | void cgit_tree_link(char *name, char *title, char *class, char *head, |
193 | char *rev, char *path) | 193 | char *rev, char *path) |
194 | { | 194 | { |
195 | reporevlink("tree", name, title, class, head, rev, path); | 195 | reporevlink("tree", name, title, class, head, rev, path); |
196 | } | 196 | } |
197 | 197 | ||
198 | void cgit_log_link(char *name, char *title, char *class, char *head, | 198 | void cgit_log_link(char *name, char *title, char *class, char *head, |
199 | char *rev, char *path, int ofs, char *grep, char *pattern) | 199 | char *rev, char *path, int ofs, char *grep, char *pattern) |
200 | { | 200 | { |
201 | char *delim; | 201 | char *delim; |
202 | 202 | ||
203 | delim = repolink(title, class, "log", head, path); | 203 | delim = repolink(title, class, "log", head, path); |
204 | if (rev && strcmp(rev, cgit_query_head)) { | 204 | if (rev && strcmp(rev, cgit_query_head)) { |
205 | html(delim); | 205 | html(delim); |
206 | html("id="); | 206 | html("id="); |
207 | html_attr(rev); | 207 | html_attr(rev); |
208 | delim = "&"; | 208 | delim = "&"; |
209 | } | 209 | } |
210 | if (grep && pattern) { | 210 | if (grep && pattern) { |
211 | html(delim); | 211 | html(delim); |
212 | html("qt="); | 212 | html("qt="); |
213 | html_attr(grep); | 213 | html_attr(grep); |
214 | delim = "&"; | 214 | delim = "&"; |
215 | html(delim); | 215 | html(delim); |
216 | html("q="); | 216 | html("q="); |
217 | html_attr(pattern); | 217 | html_attr(pattern); |
218 | } | 218 | } |
219 | if (ofs > 0) { | 219 | if (ofs > 0) { |
220 | html(delim); | 220 | html(delim); |
221 | html("ofs="); | 221 | html("ofs="); |
222 | htmlf("%d", ofs); | 222 | htmlf("%d", ofs); |
223 | } | 223 | } |
224 | html("'>"); | 224 | html("'>"); |
225 | html_txt(name); | 225 | html_txt(name); |
226 | html("</a>"); | 226 | html("</a>"); |
227 | } | 227 | } |
228 | 228 | ||
229 | void cgit_commit_link(char *name, char *title, char *class, char *head, | 229 | void cgit_commit_link(char *name, char *title, char *class, char *head, |
230 | char *rev) | 230 | char *rev) |
231 | { | 231 | { |
232 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { | 232 | if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) { |
233 | name[cgit_max_msg_len] = '\0'; | 233 | name[cgit_max_msg_len] = '\0'; |
234 | name[cgit_max_msg_len - 1] = '.'; | 234 | name[cgit_max_msg_len - 1] = '.'; |
235 | name[cgit_max_msg_len - 2] = '.'; | 235 | name[cgit_max_msg_len - 2] = '.'; |
236 | name[cgit_max_msg_len - 3] = '.'; | 236 | name[cgit_max_msg_len - 3] = '.'; |
237 | } | 237 | } |
238 | reporevlink("commit", name, title, class, head, rev, NULL); | 238 | reporevlink("commit", name, title, class, head, rev, NULL); |
239 | } | 239 | } |
240 | 240 | ||
241 | void cgit_refs_link(char *name, char *title, char *class, char *head, | 241 | void cgit_refs_link(char *name, char *title, char *class, char *head, |
242 | char *rev, char *path) | 242 | char *rev, char *path) |
243 | { | 243 | { |
244 | reporevlink("refs", name, title, class, head, rev, path); | 244 | reporevlink("refs", name, title, class, head, rev, path); |
245 | } | 245 | } |
246 | 246 | ||
247 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, | 247 | void cgit_snapshot_link(char *name, char *title, char *class, char *head, |
248 | char *rev, char *archivename) | 248 | char *rev, char *archivename) |
249 | { | 249 | { |
250 | reporevlink("snapshot", name, title, class, head, rev, archivename); | 250 | reporevlink("snapshot", name, title, class, head, rev, archivename); |
251 | } | 251 | } |
252 | 252 | ||
253 | void cgit_diff_link(char *name, char *title, char *class, char *head, | 253 | void cgit_diff_link(char *name, char *title, char *class, char *head, |
254 | char *new_rev, char *old_rev, char *path) | 254 | char *new_rev, char *old_rev, char *path) |
255 | { | 255 | { |
256 | char *delim; | 256 | char *delim; |
257 | 257 | ||
258 | delim = repolink(title, class, "diff", head, path); | 258 | delim = repolink(title, class, "diff", head, path); |
259 | if (new_rev && strcmp(new_rev, cgit_query_head)) { | 259 | if (new_rev && strcmp(new_rev, cgit_query_head)) { |
260 | html(delim); | 260 | html(delim); |
261 | html("id="); | 261 | html("id="); |
262 | html_attr(new_rev); | 262 | html_attr(new_rev); |
263 | delim = "&"; | 263 | delim = "&"; |
264 | } | 264 | } |
265 | if (old_rev) { | 265 | if (old_rev) { |
266 | html(delim); | 266 | html(delim); |
267 | html("id2="); | 267 | html("id2="); |
268 | html_attr(old_rev); | 268 | html_attr(old_rev); |
269 | } | 269 | } |
270 | html("'>"); | 270 | html("'>"); |
271 | html_txt(name); | 271 | html_txt(name); |
272 | html("</a>"); | 272 | html("</a>"); |
273 | } | 273 | } |
274 | 274 | ||
275 | void cgit_object_link(struct object *obj) | 275 | void cgit_object_link(struct object *obj) |
276 | { | 276 | { |
277 | char *page, *arg, *url; | 277 | char *page, *arg, *url; |
278 | 278 | ||
279 | if (obj->type == OBJ_COMMIT) { | 279 | if (obj->type == OBJ_COMMIT) { |
280 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, | 280 | cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL, |
281 | cgit_query_head, sha1_to_hex(obj->sha1)); | 281 | cgit_query_head, sha1_to_hex(obj->sha1)); |
282 | return; | 282 | return; |
283 | } else if (obj->type == OBJ_TREE) { | 283 | } else if (obj->type == OBJ_TREE) { |
284 | page = "tree"; | 284 | page = "tree"; |
285 | arg = "id"; | 285 | arg = "id"; |
286 | } else if (obj->type == OBJ_TAG) { | 286 | } else if (obj->type == OBJ_TAG) { |
287 | page = "tag"; | 287 | page = "tag"; |
288 | arg = "id"; | 288 | arg = "id"; |
289 | } else { | 289 | } else { |
290 | page = "blob"; | 290 | page = "blob"; |
291 | arg = "id"; | 291 | arg = "id"; |
292 | } | 292 | } |
293 | 293 | ||
294 | url = cgit_pageurl(cgit_query_repo, page, | 294 | url = cgit_pageurl(cgit_query_repo, page, |
295 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); | 295 | fmt("%s=%s", arg, sha1_to_hex(obj->sha1))); |
296 | html_link_open(url, NULL, NULL); | 296 | html_link_open(url, NULL, NULL); |
297 | htmlf("%s %s", typename(obj->type), | 297 | htmlf("%s %s", typename(obj->type), |
298 | sha1_to_hex(obj->sha1)); | 298 | sha1_to_hex(obj->sha1)); |
299 | html_link_close(); | 299 | html_link_close(); |
300 | } | 300 | } |
301 | 301 | ||
302 | void cgit_print_date(time_t secs, char *format) | 302 | void cgit_print_date(time_t secs, char *format) |
303 | { | 303 | { |
304 | char buf[64]; | 304 | char buf[64]; |
305 | struct tm *time; | 305 | struct tm *time; |
306 | 306 | ||
307 | if (!secs) | ||
308 | return; | ||
307 | time = gmtime(&secs); | 309 | time = gmtime(&secs); |
308 | strftime(buf, sizeof(buf)-1, format, time); | 310 | strftime(buf, sizeof(buf)-1, format, time); |
309 | html_txt(buf); | 311 | html_txt(buf); |
310 | } | 312 | } |
311 | 313 | ||
312 | void cgit_print_age(time_t t, time_t max_relative, char *format) | 314 | void cgit_print_age(time_t t, time_t max_relative, char *format) |
313 | { | 315 | { |
314 | time_t now, secs; | 316 | time_t now, secs; |
315 | 317 | ||
318 | if (!t) | ||
319 | return; | ||
316 | time(&now); | 320 | time(&now); |
317 | secs = now - t; | 321 | secs = now - t; |
318 | 322 | ||
319 | if (secs > max_relative && max_relative >= 0) { | 323 | if (secs > max_relative && max_relative >= 0) { |
320 | cgit_print_date(t, format); | 324 | cgit_print_date(t, format); |
321 | return; | 325 | return; |
322 | } | 326 | } |
323 | 327 | ||
324 | if (secs < TM_HOUR * 2) { | 328 | if (secs < TM_HOUR * 2) { |
325 | htmlf("<span class='age-mins'>%.0f min.</span>", | 329 | htmlf("<span class='age-mins'>%.0f min.</span>", |
326 | secs * 1.0 / TM_MIN); | 330 | secs * 1.0 / TM_MIN); |
327 | return; | 331 | return; |
328 | } | 332 | } |
329 | if (secs < TM_DAY * 2) { | 333 | if (secs < TM_DAY * 2) { |
330 | htmlf("<span class='age-hours'>%.0f hours</span>", | 334 | htmlf("<span class='age-hours'>%.0f hours</span>", |
331 | secs * 1.0 / TM_HOUR); | 335 | secs * 1.0 / TM_HOUR); |
332 | return; | 336 | return; |
333 | } | 337 | } |
334 | if (secs < TM_WEEK * 2) { | 338 | if (secs < TM_WEEK * 2) { |
335 | htmlf("<span class='age-days'>%.0f days</span>", | 339 | htmlf("<span class='age-days'>%.0f days</span>", |
336 | secs * 1.0 / TM_DAY); | 340 | secs * 1.0 / TM_DAY); |
337 | return; | 341 | return; |
338 | } | 342 | } |
339 | if (secs < TM_MONTH * 2) { | 343 | if (secs < TM_MONTH * 2) { |
340 | htmlf("<span class='age-weeks'>%.0f weeks</span>", | 344 | htmlf("<span class='age-weeks'>%.0f weeks</span>", |
341 | secs * 1.0 / TM_WEEK); | 345 | secs * 1.0 / TM_WEEK); |
342 | return; | 346 | return; |
343 | } | 347 | } |
344 | if (secs < TM_YEAR * 2) { | 348 | if (secs < TM_YEAR * 2) { |
345 | htmlf("<span class='age-months'>%.0f months</span>", | 349 | htmlf("<span class='age-months'>%.0f months</span>", |
346 | secs * 1.0 / TM_MONTH); | 350 | secs * 1.0 / TM_MONTH); |
347 | return; | 351 | return; |
348 | } | 352 | } |
349 | htmlf("<span class='age-years'>%.0f years</span>", | 353 | htmlf("<span class='age-years'>%.0f years</span>", |
350 | secs * 1.0 / TM_YEAR); | 354 | secs * 1.0 / TM_YEAR); |
351 | } | 355 | } |
352 | 356 | ||
353 | void cgit_print_docstart(char *title, struct cacheitem *item) | 357 | void cgit_print_docstart(char *title, struct cacheitem *item) |
354 | { | 358 | { |
355 | html("Content-Type: text/html; charset=utf-8\n"); | 359 | html("Content-Type: text/html; charset=utf-8\n"); |
356 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 360 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
357 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 361 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
358 | ttl_seconds(item->ttl))); | 362 | ttl_seconds(item->ttl))); |
359 | html("\n"); | 363 | html("\n"); |
360 | html(cgit_doctype); | 364 | html(cgit_doctype); |
361 | html("<html>\n"); | 365 | html("<html>\n"); |
362 | html("<head>\n"); | 366 | html("<head>\n"); |
363 | html("<title>"); | 367 | html("<title>"); |
364 | html_txt(title); | 368 | html_txt(title); |
365 | html("</title>\n"); | 369 | html("</title>\n"); |
366 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); | 370 | htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version); |
367 | html("<link rel='stylesheet' type='text/css' href='"); | 371 | html("<link rel='stylesheet' type='text/css' href='"); |
368 | html_attr(cgit_css); | 372 | html_attr(cgit_css); |
369 | html("'/>\n"); | 373 | html("'/>\n"); |
370 | html("</head>\n"); | 374 | html("</head>\n"); |
371 | html("<body>\n"); | 375 | html("<body>\n"); |
372 | } | 376 | } |
373 | 377 | ||
374 | void cgit_print_docend() | 378 | void cgit_print_docend() |
375 | { | 379 | { |
376 | html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); | 380 | html("</td>\n</tr>\n<table>\n</body>\n</html>\n"); |
377 | } | 381 | } |
378 | 382 | ||
379 | int print_branch_option(const char *refname, const unsigned char *sha1, | 383 | int print_branch_option(const char *refname, const unsigned char *sha1, |
380 | int flags, void *cb_data) | 384 | int flags, void *cb_data) |
381 | { | 385 | { |
382 | char *name = (char *)refname; | 386 | char *name = (char *)refname; |
383 | html_option(name, name, cgit_query_head); | 387 | html_option(name, name, cgit_query_head); |
384 | return 0; | 388 | return 0; |
385 | } | 389 | } |
386 | 390 | ||
387 | int print_archive_ref(const char *refname, const unsigned char *sha1, | 391 | int print_archive_ref(const char *refname, const unsigned char *sha1, |
388 | int flags, void *cb_data) | 392 | int flags, void *cb_data) |
389 | { | 393 | { |
390 | struct tag *tag; | 394 | struct tag *tag; |
391 | struct taginfo *info; | 395 | struct taginfo *info; |
392 | struct object *obj; | 396 | struct object *obj; |
393 | char buf[256], *url; | 397 | char buf[256], *url; |
394 | unsigned char fileid[20]; | 398 | unsigned char fileid[20]; |
395 | int *header = (int *)cb_data; | 399 | int *header = (int *)cb_data; |
396 | 400 | ||
397 | if (prefixcmp(refname, "refs/archives")) | 401 | if (prefixcmp(refname, "refs/archives")) |
398 | return 0; | 402 | return 0; |
399 | strncpy(buf, refname+14, sizeof(buf)); | 403 | strncpy(buf, refname+14, sizeof(buf)); |
400 | obj = parse_object(sha1); | 404 | obj = parse_object(sha1); |
401 | if (!obj) | 405 | if (!obj) |
402 | return 1; | 406 | return 1; |
403 | if (obj->type == OBJ_TAG) { | 407 | if (obj->type == OBJ_TAG) { |
404 | tag = lookup_tag(sha1); | 408 | tag = lookup_tag(sha1); |
405 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) | 409 | if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) |
406 | return 0; | 410 | return 0; |
407 | hashcpy(fileid, tag->tagged->sha1); | 411 | hashcpy(fileid, tag->tagged->sha1); |
408 | } else if (obj->type != OBJ_BLOB) { | 412 | } else if (obj->type != OBJ_BLOB) { |
409 | return 0; | 413 | return 0; |
410 | } else { | 414 | } else { |
411 | hashcpy(fileid, sha1); | 415 | hashcpy(fileid, sha1); |
412 | } | 416 | } |
413 | if (!*header) { | 417 | if (!*header) { |
414 | html("<p><h1>download</h1>"); | 418 | html("<p><h1>download</h1>"); |
415 | *header = 1; | 419 | *header = 1; |
416 | } | 420 | } |
417 | url = cgit_pageurl(cgit_query_repo, "blob", | 421 | url = cgit_pageurl(cgit_query_repo, "blob", |
418 | fmt("id=%s&path=%s", sha1_to_hex(fileid), | 422 | fmt("id=%s&path=%s", sha1_to_hex(fileid), |
419 | buf)); | 423 | buf)); |
420 | html_link_open(url, NULL, "menu"); | 424 | html_link_open(url, NULL, "menu"); |
421 | html_txt(strlpart(buf, 20)); | 425 | html_txt(strlpart(buf, 20)); |
422 | html_link_close(); | 426 | html_link_close(); |
423 | return 0; | 427 | return 0; |
424 | } | 428 | } |
425 | 429 | ||
426 | void add_hidden_formfields(int incl_head, int incl_search, char *page) | 430 | void add_hidden_formfields(int incl_head, int incl_search, char *page) |
427 | { | 431 | { |
428 | char *url; | 432 | char *url; |
429 | 433 | ||
430 | if (!cgit_virtual_root) { | 434 | if (!cgit_virtual_root) { |
431 | url = fmt("%s/%s", cgit_query_repo, page); | 435 | url = fmt("%s/%s", cgit_query_repo, page); |
432 | if (cgit_query_path) | 436 | if (cgit_query_path) |
433 | url = fmt("%s/%s", url, cgit_query_path); | 437 | url = fmt("%s/%s", url, cgit_query_path); |
434 | html_hidden("url", url); | 438 | html_hidden("url", url); |
435 | } | 439 | } |
436 | 440 | ||
437 | if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) | 441 | if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch)) |
438 | html_hidden("h", cgit_query_head); | 442 | html_hidden("h", cgit_query_head); |
439 | 443 | ||
440 | if (cgit_query_sha1) | 444 | if (cgit_query_sha1) |
441 | html_hidden("id", cgit_query_sha1); | 445 | html_hidden("id", cgit_query_sha1); |
442 | if (cgit_query_sha2) | 446 | if (cgit_query_sha2) |
443 | html_hidden("id2", cgit_query_sha2); | 447 | html_hidden("id2", cgit_query_sha2); |
444 | 448 | ||
445 | if (incl_search) { | 449 | if (incl_search) { |
446 | if (cgit_query_grep) | 450 | if (cgit_query_grep) |
447 | html_hidden("qt", cgit_query_grep); | 451 | html_hidden("qt", cgit_query_grep); |
448 | if (cgit_query_search) | 452 | if (cgit_query_search) |
449 | html_hidden("q", cgit_query_search); | 453 | html_hidden("q", cgit_query_search); |
450 | } | 454 | } |
451 | } | 455 | } |
452 | 456 | ||
453 | void cgit_print_pageheader(char *title, int show_search) | 457 | void cgit_print_pageheader(char *title, int show_search) |
454 | { | 458 | { |
455 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; | 459 | static const char *default_info = "This is cgit, a fast webinterface for git repositories"; |
456 | int header = 0; | 460 | int header = 0; |
457 | 461 | ||
458 | html("<div id='sidebar'>\n"); | 462 | html("<div id='sidebar'>\n"); |
459 | html("<a href='"); | 463 | html("<a href='"); |
460 | html_attr(cgit_rooturl()); | 464 | html_attr(cgit_rooturl()); |
461 | htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", | 465 | htmlf("'><div id='logo'><img src='%s' alt='cgit'/></div></a>\n", |
462 | cgit_logo); | 466 | cgit_logo); |
463 | html("<div class='infobox'>"); | 467 | html("<div class='infobox'>"); |
464 | if (cgit_query_repo) { | 468 | if (cgit_query_repo) { |
465 | html("<h1>"); | 469 | html("<h1>"); |
466 | html_txt(strrpart(cgit_repo->name, 20)); | 470 | html_txt(strrpart(cgit_repo->name, 20)); |
467 | html("</h1>\n"); | 471 | html("</h1>\n"); |
468 | html_txt(cgit_repo->desc); | 472 | html_txt(cgit_repo->desc); |
469 | if (cgit_repo->owner) { | 473 | if (cgit_repo->owner) { |
470 | html("<p>\n<h1>owner</h1>\n"); | 474 | html("<p>\n<h1>owner</h1>\n"); |
471 | html_txt(cgit_repo->owner); | 475 | html_txt(cgit_repo->owner); |
472 | } | 476 | } |
473 | html("<p>\n<h1>navigate</h1>\n"); | 477 | html("<p>\n<h1>navigate</h1>\n"); |
474 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, | 478 | reporevlink(NULL, "summary", NULL, "menu", cgit_query_head, |
475 | NULL, NULL); | 479 | NULL, NULL); |
476 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, | 480 | cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL, |
477 | 0, NULL, NULL); | 481 | 0, NULL, NULL); |
478 | cgit_tree_link("tree", NULL, "menu", cgit_query_head, | 482 | cgit_tree_link("tree", NULL, "menu", cgit_query_head, |
479 | cgit_query_sha1, NULL); | 483 | cgit_query_sha1, NULL); |
480 | cgit_commit_link("commit", NULL, "menu", cgit_query_head, | 484 | cgit_commit_link("commit", NULL, "menu", cgit_query_head, |
481 | cgit_query_sha1); | 485 | cgit_query_sha1); |
482 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, | 486 | cgit_diff_link("diff", NULL, "menu", cgit_query_head, |
483 | cgit_query_sha1, cgit_query_sha2, NULL); | 487 | cgit_query_sha1, cgit_query_sha2, NULL); |
484 | 488 | ||
485 | for_each_ref(print_archive_ref, &header); | 489 | for_each_ref(print_archive_ref, &header); |
486 | 490 | ||
487 | html("<p>\n<h1>branch</h1>\n"); | 491 | html("<p>\n<h1>branch</h1>\n"); |
488 | html("<form method='get' action=''>\n"); | 492 | html("<form method='get' action=''>\n"); |
489 | add_hidden_formfields(0, 1, cgit_query_page); | 493 | add_hidden_formfields(0, 1, cgit_query_page); |
490 | html("<table class='grid'><tr><td id='branch-dropdown-cell'>"); | 494 | html("<table class='grid'><tr><td id='branch-dropdown-cell'>"); |
491 | html("<select name='h' onchange='this.form.submit();'>\n"); | 495 | html("<select name='h' onchange='this.form.submit();'>\n"); |
492 | for_each_branch_ref(print_branch_option, cgit_query_head); | 496 | for_each_branch_ref(print_branch_option, cgit_query_head); |
493 | html("</select>\n"); | 497 | html("</select>\n"); |
494 | html("</td><td>"); | 498 | html("</td><td>"); |
495 | html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n"); | 499 | html("<noscript><input type='submit' id='switch-btn' value='..'></noscript>\n"); |
496 | html("</td></tr></table>"); | 500 | html("</td></tr></table>"); |
497 | html("</form>\n"); | 501 | html("</form>\n"); |
498 | 502 | ||
499 | html("<p>\n<h1>search</h1>\n"); | 503 | html("<p>\n<h1>search</h1>\n"); |
500 | html("<form method='get' action='"); | 504 | html("<form method='get' action='"); |
501 | if (cgit_virtual_root) | 505 | if (cgit_virtual_root) |
502 | html_attr(cgit_fileurl(cgit_query_repo, "log", | 506 | html_attr(cgit_fileurl(cgit_query_repo, "log", |
503 | cgit_query_path, NULL)); | 507 | cgit_query_path, NULL)); |
504 | html("'>\n"); | 508 | html("'>\n"); |
505 | add_hidden_formfields(1, 0, "log"); | 509 | add_hidden_formfields(1, 0, "log"); |
506 | html("<select name='qt'>\n"); | 510 | html("<select name='qt'>\n"); |
507 | html_option("grep", "log msg", cgit_query_grep); | 511 | html_option("grep", "log msg", cgit_query_grep); |
508 | html_option("author", "author", cgit_query_grep); | 512 | html_option("author", "author", cgit_query_grep); |
509 | html_option("committer", "committer", cgit_query_grep); | 513 | html_option("committer", "committer", cgit_query_grep); |
510 | html("</select>\n"); | 514 | html("</select>\n"); |
511 | html("<input class='txt' type='text' name='q' value='"); | 515 | html("<input class='txt' type='text' name='q' value='"); |
512 | html_attr(cgit_query_search); | 516 | html_attr(cgit_query_search); |
513 | html("'/>\n"); | 517 | html("'/>\n"); |
514 | html("</form>\n"); | 518 | html("</form>\n"); |
515 | } else { | 519 | } else { |
516 | if (!cgit_index_info || html_include(cgit_index_info)) | 520 | if (!cgit_index_info || html_include(cgit_index_info)) |
517 | html(default_info); | 521 | html(default_info); |
518 | } | 522 | } |
519 | 523 | ||
520 | html("</div>\n"); | 524 | html("</div>\n"); |
521 | 525 | ||
522 | html("</div>\n<table class='grid'><tr><td id='content'>\n"); | 526 | html("</div>\n<table class='grid'><tr><td id='content'>\n"); |
523 | } | 527 | } |
524 | 528 | ||
525 | 529 | ||
526 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, | 530 | void cgit_print_snapshot_start(const char *mimetype, const char *filename, |
527 | struct cacheitem *item) | 531 | struct cacheitem *item) |
528 | { | 532 | { |
529 | htmlf("Content-Type: %s\n", mimetype); | 533 | htmlf("Content-Type: %s\n", mimetype); |
530 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); | 534 | htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename); |
531 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); | 535 | htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime)); |
532 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + | 536 | htmlf("Expires: %s\n", http_date(item->st.st_mtime + |
533 | ttl_seconds(item->ttl))); | 537 | ttl_seconds(item->ttl))); |
534 | html("\n"); | 538 | html("\n"); |
535 | } | 539 | } |
536 | 540 | ||
537 | /* vim:set sw=8: */ | 541 | /* vim:set sw=8: */ |