|
diff --git a/parsing.c b/parsing.c index 0412a9c..16b4db7 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -173,128 +173,136 @@ void cgit_parse_url(const char *url) |
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 | ret->msg_encoding = NULL; |
202 | ret->msg_encoding = NULL; |
203 | |
203 | |
204 | if (p == NULL) |
204 | if (p == NULL) |
205 | return ret; |
205 | return ret; |
206 | |
206 | |
207 | if (strncmp(p, "tree ", 5)) |
207 | if (strncmp(p, "tree ", 5)) |
208 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
208 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
209 | else |
209 | else |
210 | p += 46; // "tree " + hex[40] + "\n" |
210 | p += 46; // "tree " + hex[40] + "\n" |
211 | |
211 | |
212 | while (!strncmp(p, "parent ", 7)) |
212 | while (!strncmp(p, "parent ", 7)) |
213 | p += 48; // "parent " + hex[40] + "\n" |
213 | p += 48; // "parent " + hex[40] + "\n" |
214 | |
214 | |
215 | if (!strncmp(p, "author ", 7)) { |
215 | if (!strncmp(p, "author ", 7)) { |
216 | p += 7; |
216 | p += 7; |
217 | t = strchr(p, '<') - 1; |
217 | t = strchr(p, '<') - 1; |
218 | ret->author = substr(p, t); |
218 | ret->author = substr(p, t); |
219 | p = t; |
219 | p = t; |
220 | t = strchr(t, '>') + 1; |
220 | t = strchr(t, '>') + 1; |
221 | ret->author_email = substr(p, t); |
221 | ret->author_email = substr(p, t); |
222 | ret->author_date = atol(++t); |
222 | ret->author_date = atol(++t); |
223 | p = strchr(t, '\n') + 1; |
223 | p = strchr(t, '\n') + 1; |
224 | } |
224 | } |
225 | |
225 | |
226 | if (!strncmp(p, "committer ", 9)) { |
226 | if (!strncmp(p, "committer ", 9)) { |
227 | p += 9; |
227 | p += 9; |
228 | t = strchr(p, '<') - 1; |
228 | t = strchr(p, '<') - 1; |
229 | ret->committer = substr(p, t); |
229 | ret->committer = substr(p, t); |
230 | p = t; |
230 | p = t; |
231 | t = strchr(t, '>') + 1; |
231 | t = strchr(t, '>') + 1; |
232 | ret->committer_email = substr(p, t); |
232 | ret->committer_email = substr(p, t); |
233 | ret->committer_date = atol(++t); |
233 | ret->committer_date = atol(++t); |
234 | p = strchr(t, '\n') + 1; |
234 | p = strchr(t, '\n') + 1; |
235 | } |
235 | } |
236 | |
236 | |
| |
237 | if (!strncmp(p, "encoding ", 9)) { |
| |
238 | p += 9; |
| |
239 | t = strchr(p, '\n') + 1; |
| |
240 | ret->msg_encoding = substr(p, t); |
| |
241 | p = t; |
| |
242 | } else |
| |
243 | ret->msg_encoding = xstrdup(PAGE_ENCODING); |
| |
244 | |
237 | while (*p && (*p != '\n')) |
245 | while (*p && (*p != '\n')) |
238 | p = strchr(p, '\n') + 1; // skip unknown header fields |
246 | p = strchr(p, '\n') + 1; // skip unknown header fields |
239 | |
247 | |
240 | while (*p == '\n') |
248 | while (*p == '\n') |
241 | p = strchr(p, '\n') + 1; |
249 | p = strchr(p, '\n') + 1; |
242 | |
250 | |
243 | t = strchr(p, '\n'); |
251 | t = strchr(p, '\n'); |
244 | if (t) { |
252 | if (t) { |
245 | if (*t == '\0') |
253 | if (*t == '\0') |
246 | ret->subject = "** empty **"; |
254 | ret->subject = "** empty **"; |
247 | else |
255 | else |
248 | ret->subject = substr(p, t); |
256 | ret->subject = substr(p, t); |
249 | p = t + 1; |
257 | p = t + 1; |
250 | |
258 | |
251 | while (*p == '\n') |
259 | while (*p == '\n') |
252 | p = strchr(p, '\n') + 1; |
260 | p = strchr(p, '\n') + 1; |
253 | ret->msg = xstrdup(p); |
261 | ret->msg = xstrdup(p); |
254 | } else |
262 | } else |
255 | ret->subject = substr(p, p+strlen(p)); |
263 | ret->subject = substr(p, p+strlen(p)); |
256 | |
264 | |
257 | return ret; |
265 | return ret; |
258 | } |
266 | } |
259 | |
267 | |
260 | |
268 | |
261 | struct taginfo *cgit_parse_tag(struct tag *tag) |
269 | struct taginfo *cgit_parse_tag(struct tag *tag) |
262 | { |
270 | { |
263 | void *data; |
271 | void *data; |
264 | enum object_type type; |
272 | enum object_type type; |
265 | unsigned long size; |
273 | unsigned long size; |
266 | char *p, *t; |
274 | char *p, *t; |
267 | struct taginfo *ret; |
275 | struct taginfo *ret; |
268 | |
276 | |
269 | data = read_sha1_file(tag->object.sha1, &type, &size); |
277 | data = read_sha1_file(tag->object.sha1, &type, &size); |
270 | if (!data || type != OBJ_TAG) { |
278 | if (!data || type != OBJ_TAG) { |
271 | free(data); |
279 | free(data); |
272 | return 0; |
280 | return 0; |
273 | } |
281 | } |
274 | |
282 | |
275 | ret = xmalloc(sizeof(*ret)); |
283 | ret = xmalloc(sizeof(*ret)); |
276 | ret->tagger = NULL; |
284 | ret->tagger = NULL; |
277 | ret->tagger_email = NULL; |
285 | ret->tagger_email = NULL; |
278 | ret->tagger_date = 0; |
286 | ret->tagger_date = 0; |
279 | ret->msg = NULL; |
287 | ret->msg = NULL; |
280 | |
288 | |
281 | p = data; |
289 | p = data; |
282 | |
290 | |
283 | while (p && *p) { |
291 | while (p && *p) { |
284 | if (*p == '\n') |
292 | if (*p == '\n') |
285 | break; |
293 | break; |
286 | |
294 | |
287 | if (!strncmp(p, "tagger ", 7)) { |
295 | if (!strncmp(p, "tagger ", 7)) { |
288 | p += 7; |
296 | p += 7; |
289 | t = strchr(p, '<') - 1; |
297 | t = strchr(p, '<') - 1; |
290 | ret->tagger = substr(p, t); |
298 | ret->tagger = substr(p, t); |
291 | p = t; |
299 | p = t; |
292 | t = strchr(t, '>') + 1; |
300 | t = strchr(t, '>') + 1; |
293 | ret->tagger_email = substr(p, t); |
301 | ret->tagger_email = substr(p, t); |
294 | ret->tagger_date = atol(++t); |
302 | ret->tagger_date = atol(++t); |
295 | } |
303 | } |
296 | p = strchr(p, '\n') + 1; |
304 | p = strchr(p, '\n') + 1; |
297 | } |
305 | } |
298 | |
306 | |
299 | while (p && *p && (*p != '\n')) |
307 | while (p && *p && (*p != '\n')) |
300 | p = strchr(p, '\n') + 1; // skip unknown tag fields |
308 | p = strchr(p, '\n') + 1; // skip unknown tag fields |
|