|
diff --git a/parsing.c b/parsing.c index e8c7ab9..5093b8b 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -174,159 +174,159 @@ void cgit_parse_url(const char *url) |
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+1); |
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+1); |
234 | p = strchr(t, '\n') + 1; |
234 | p = strchr(t, '\n') + 1; |
235 | } |
235 | } |
236 | |
236 | |
237 | if (!strncmp(p, "encoding ", 9)) { |
237 | if (!strncmp(p, "encoding ", 9)) { |
238 | p += 9; |
238 | p += 9; |
239 | t = strchr(p, '\n') + 1; |
239 | t = strchr(p, '\n') + 1; |
240 | ret->msg_encoding = substr(p, t); |
240 | ret->msg_encoding = substr(p, t); |
241 | p = t; |
241 | p = t; |
242 | } else |
242 | } else |
243 | ret->msg_encoding = xstrdup(PAGE_ENCODING); |
243 | ret->msg_encoding = xstrdup(PAGE_ENCODING); |
244 | |
244 | |
245 | while (*p && (*p != '\n')) |
245 | while (*p && (*p != '\n')) |
246 | p = strchr(p, '\n') + 1; // skip unknown header fields |
246 | p = strchr(p, '\n') + 1; // skip unknown header fields |
247 | |
247 | |
248 | while (*p == '\n') |
248 | while (*p == '\n') |
249 | p = strchr(p, '\n') + 1; |
249 | p = strchr(p, '\n') + 1; |
250 | |
250 | |
251 | t = strchr(p, '\n'); |
251 | t = strchr(p, '\n'); |
252 | if (t) { |
252 | if (t) { |
253 | if (*t == '\0') |
253 | if (*t == '\0') |
254 | ret->subject = "** empty **"; |
254 | ret->subject = "** empty **"; |
255 | else |
255 | else |
256 | ret->subject = substr(p, t); |
256 | ret->subject = substr(p, t); |
257 | p = t + 1; |
257 | p = t + 1; |
258 | |
258 | |
259 | while (*p == '\n') |
259 | while (*p == '\n') |
260 | p = strchr(p, '\n') + 1; |
260 | p = strchr(p, '\n') + 1; |
261 | ret->msg = xstrdup(p); |
261 | ret->msg = xstrdup(p); |
262 | } else |
262 | } else |
263 | ret->subject = substr(p, p+strlen(p)); |
263 | ret->subject = substr(p, p+strlen(p)); |
264 | |
264 | |
265 | if(strcmp(ret->msg_encoding, PAGE_ENCODING)) { |
265 | if(strcmp(ret->msg_encoding, PAGE_ENCODING)) { |
266 | t = reencode_string(ret->subject, PAGE_ENCODING, |
266 | t = reencode_string(ret->subject, PAGE_ENCODING, |
267 | ret->msg_encoding); |
267 | ret->msg_encoding); |
268 | if(t) { |
268 | if(t) { |
269 | free(ret->subject); |
269 | free(ret->subject); |
270 | ret->subject = t; |
270 | ret->subject = t; |
271 | } |
271 | } |
272 | |
272 | |
273 | t = reencode_string(ret->msg, PAGE_ENCODING, |
273 | t = reencode_string(ret->msg, PAGE_ENCODING, |
274 | ret->msg_encoding); |
274 | ret->msg_encoding); |
275 | if(t) { |
275 | if(t) { |
276 | free(ret->msg); |
276 | free(ret->msg); |
277 | ret->msg = t; |
277 | ret->msg = t; |
278 | } |
278 | } |
279 | } |
279 | } |
280 | |
280 | |
281 | return ret; |
281 | return ret; |
282 | } |
282 | } |
283 | |
283 | |
284 | |
284 | |
285 | struct taginfo *cgit_parse_tag(struct tag *tag) |
285 | struct taginfo *cgit_parse_tag(struct tag *tag) |
286 | { |
286 | { |
287 | void *data; |
287 | void *data; |
288 | enum object_type type; |
288 | enum object_type type; |
289 | unsigned long size; |
289 | unsigned long size; |
290 | char *p, *t; |
290 | char *p, *t; |
291 | struct taginfo *ret; |
291 | struct taginfo *ret; |
292 | |
292 | |
293 | data = read_sha1_file(tag->object.sha1, &type, &size); |
293 | data = read_sha1_file(tag->object.sha1, &type, &size); |
294 | if (!data || type != OBJ_TAG) { |
294 | if (!data || type != OBJ_TAG) { |
295 | free(data); |
295 | free(data); |
296 | return 0; |
296 | return 0; |
297 | } |
297 | } |
298 | |
298 | |
299 | ret = xmalloc(sizeof(*ret)); |
299 | ret = xmalloc(sizeof(*ret)); |
300 | ret->tagger = NULL; |
300 | ret->tagger = NULL; |
301 | ret->tagger_email = NULL; |
301 | ret->tagger_email = NULL; |
302 | ret->tagger_date = 0; |
302 | ret->tagger_date = 0; |
303 | ret->msg = NULL; |
303 | ret->msg = NULL; |
304 | |
304 | |
305 | p = data; |
305 | p = data; |
306 | |
306 | |
307 | while (p && *p) { |
307 | while (p && *p) { |
308 | if (*p == '\n') |
308 | if (*p == '\n') |
309 | break; |
309 | break; |
310 | |
310 | |
311 | if (!strncmp(p, "tagger ", 7)) { |
311 | if (!strncmp(p, "tagger ", 7)) { |
312 | p += 7; |
312 | p += 7; |
313 | t = strchr(p, '<') - 1; |
313 | t = strchr(p, '<') - 1; |
314 | ret->tagger = substr(p, t); |
314 | ret->tagger = substr(p, t); |
315 | p = t; |
315 | p = t; |
316 | t = strchr(t, '>') + 1; |
316 | t = strchr(t, '>') + 1; |
317 | ret->tagger_email = substr(p, t); |
317 | ret->tagger_email = substr(p, t); |
318 | ret->tagger_date = atol(++t); |
318 | ret->tagger_date = atol(t+1); |
319 | } |
319 | } |
320 | p = strchr(p, '\n') + 1; |
320 | p = strchr(p, '\n') + 1; |
321 | } |
321 | } |
322 | |
322 | |
323 | while (p && *p && (*p != '\n')) |
323 | while (p && *p && (*p != '\n')) |
324 | p = strchr(p, '\n') + 1; // skip unknown tag fields |
324 | p = strchr(p, '\n') + 1; // skip unknown tag fields |
325 | |
325 | |
326 | while (p && (*p == '\n')) |
326 | while (p && (*p == '\n')) |
327 | p = strchr(p, '\n') + 1; |
327 | p = strchr(p, '\n') + 1; |
328 | if (p && *p) |
328 | if (p && *p) |
329 | ret->msg = xstrdup(p); |
329 | ret->msg = xstrdup(p); |
330 | free(data); |
330 | free(data); |
331 | return ret; |
331 | return ret; |
332 | } |
332 | } |
|