summaryrefslogtreecommitdiffabout
path: root/parsing.c
authorLars Hjemli <hjemli@gmail.com>2007-12-02 21:11:35 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-12-02 21:27:07 (UTC)
commitfc4c4ba3a99f4fe4bd8a42caca902269d2e0b678 (patch) (unidiff)
treeb45ed1a2e08360977df3c4a7c1dc5af32dae2751 /parsing.c
parent5b75064a81f9fe8f8a446a4be050fe3dfcf52b89 (diff)
downloadcgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.zip
cgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.tar.gz
cgit-fc4c4ba3a99f4fe4bd8a42caca902269d2e0b678.tar.bz2
Handle missing timestamp in commit/tag objects
When a commit or tag lacks author/committer/tagger timestamp, do not skip the next line in the commit/tag object. Also, do not bother to print timestamps with value 0 as it is close to certain to be bogus. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'parsing.c') (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/parsing.c b/parsing.c
index 30e7648..55a485d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -205,44 +205,44 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
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;
@@ -277,31 +277,31 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
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}