diff options
| -rw-r--r-- | cgit.h | 9 | ||||
| -rw-r--r-- | parsing.c | 53 | ||||
| -rw-r--r-- | ui-log.c | 76 |
3 files changed, 75 insertions, 63 deletions
diff --git a/cgit.h b/cgit.h index 82e8681..268db53 100644 --- a/cgit.h +++ b/cgit.h @@ -15,6 +15,14 @@ struct cacheitem { int fd; }; +struct commitinfo { + struct commit *commit; + char *author; + char *committer; + char *subject; + char *msg; +}; + extern const char cgit_version[]; extern char *cgit_root; @@ -63,6 +71,7 @@ extern void html_link_close(void); extern int cgit_read_config(const char *filename, configfn fn); extern int cgit_parse_query(char *txt, configfn fn); +extern struct commitinfo *cgit_parse_commit(struct commit *commit); extern void cache_prepare(struct cacheitem *item); extern int cache_lock(struct cacheitem *item); diff --git a/parsing.c b/parsing.c index 98b3243..6cab0e9 100644 --- a/parsing.c +++ b/parsing.c @@ -104,3 +104,56 @@ int cgit_parse_query(char *txt, configfn fn) (*fn)(txt, value); return 0; } + +char *substr(const char *head, const char *tail) +{ + char *buf; + + buf = xmalloc(tail - head + 1); + strncpy(buf, head, tail - head); + buf[tail - head] = '\0'; + return buf; +} + +struct commitinfo *cgit_parse_commit(struct commit *commit) +{ + struct commitinfo *ret; + char *p = commit->buffer, *t = commit->buffer; + + ret = xmalloc(sizeof(*ret)); + ret->commit = commit; + + if (strncmp(p, "tree ", 5)) + die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); + else + p += 46; // "tree " + hex[40] + "\n" + + while (!strncmp(p, "parent ", 7)) + p += 48; // "parent " + hex[40] + "\n" + + if (!strncmp(p, "author ", 7)) { + p += 7; + t = strchr(p, '<') - 1; + ret->author = substr(p, t); + p = strchr(p, '\n') + 1; + } + + if (!strncmp(p, "committer ", 9)) { + p += 9; + t = strchr(p, '<') - 1; + ret->committer = substr(p, t); + p = strchr(p, '\n') + 1; + } + + while (*p == '\n') + p = strchr(p, '\n') + 1; + + t = strchr(p, '\n'); + ret->subject = substr(p, t); + + while (*p == '\n') + p = strchr(p, '\n') + 1; + ret->msg = p; + + return ret; +} diff --git a/ui-log.c b/ui-log.c index dce50f7..31331ef 100644 --- a/ui-log.c +++ b/ui-log.c @@ -8,69 +8,14 @@ #include "cgit.h" -static int get_one_line(char *txt) +void print_commit(struct commit *commit) { - char *t; - - for(t=txt; *t != '\n' && t != '\0'; t++) - ; - *t = '\0'; - return t-txt-1; -} - -static void cgit_print_commit_shortlog(struct commit *commit) -{ - char *h, *t, *p; - char *tree = NULL, *author = NULL, *subject = NULL; - int len; - time_t sec; - struct tm *time; char buf[32]; + struct commitinfo *info; + struct tm *time; - h = t = commit->buffer; - - if (strncmp(h, "tree ", 5)) - die("Bad commit format: %s", - sha1_to_hex(commit->object.sha1)); - - len = get_one_line(h); - tree = h+5; - h += len + 2; - - while (!strncmp(h, "parent ", 7)) - h += get_one_line(h) + 2; - - if (!strncmp(h, "author ", 7)) { - author = h+7; - h += get_one_line(h) + 2; - t = author; - while(t!=h && *t!='<') - t++; - *t='\0'; - p = t; - while(--t!=author && *t==' ') - *t='\0'; - while(++p!=h && *p!='>') - ; - while(++p!=h && !isdigit(*p)) - ; - - t = p; - while(++p && isdigit(*p)) - ; - *p = '\0'; - sec = atoi(t); - time = gmtime(&sec); - } - - while((len = get_one_line(h)) > 0) - h += len+2; - - h++; - len = get_one_line(h); - - subject = h; - + info = cgit_parse_commit(commit); + time = gmtime(&commit->date); html("<tr><td>"); strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); html_txt(buf); @@ -78,18 +23,23 @@ static void cgit_print_commit_shortlog(struct commit *commit) char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); char *url = cgit_pageurl(cgit_query_repo, "view", qry); html_link_open(url, NULL, NULL); - html_txt(subject); + html_txt(info->subject); html_link_close(); html("</td><td>"); - html_txt(author); + html_txt(info->author); html("</td><td><a href='"); html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("id=%s", sha1_to_hex(commit->tree->object.sha1)))); html("'>tree</a>"); html("</td></tr>\n"); + free(info->author); + free(info->committer); + free(info->subject); + free(info); } + void cgit_print_log(const char *tip, int ofs, int cnt) { struct rev_info rev; @@ -120,7 +70,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt) } for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { - cgit_print_commit_shortlog(commit); + print_commit(commit); free(commit->buffer); commit->buffer = NULL; free_commit_list(commit->parents); |