author | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 13:25:41 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-16 13:25:41 (UTC) |
commit | 77078ba716ccdfdc954741355dd6a17632db961b (patch) (unidiff) | |
tree | ef66d7a2690c90981ab0f446a19111a04d121c7a | |
parent | 7c849d94ec1cfecdec5a88d49f5af5c98f96ebca (diff) | |
download | cgit-77078ba716ccdfdc954741355dd6a17632db961b.zip cgit-77078ba716ccdfdc954741355dd6a17632db961b.tar.gz cgit-77078ba716ccdfdc954741355dd6a17632db961b.tar.bz2 |
Teach commit parser about author/committer email + timestamp
We want all four of these when showing a commit, so save them in the
commitinfo struct.
Btw: There's probably no good reason to save committer timestamp since
it's already available in commit->date. But it doesn't hurt us either,
and it makes the parser look more complete, so we just do it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | parsing.c | 12 |
2 files changed, 14 insertions, 2 deletions
@@ -1,101 +1,105 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | #include "git.h" | 4 | #include "git.h" |
5 | #include <openssl/sha.h> | 5 | #include <openssl/sha.h> |
6 | #include <ctype.h> | 6 | #include <ctype.h> |
7 | #include <sched.h> | 7 | #include <sched.h> |
8 | 8 | ||
9 | typedef void (*configfn)(const char *name, const char *value); | 9 | typedef void (*configfn)(const char *name, const char *value); |
10 | 10 | ||
11 | struct cacheitem { | 11 | struct cacheitem { |
12 | char *name; | 12 | char *name; |
13 | struct stat st; | 13 | struct stat st; |
14 | int ttl; | 14 | int ttl; |
15 | int fd; | 15 | int fd; |
16 | }; | 16 | }; |
17 | 17 | ||
18 | struct commitinfo { | 18 | struct commitinfo { |
19 | struct commit *commit; | 19 | struct commit *commit; |
20 | char *author; | 20 | char *author; |
21 | char *author_email; | ||
22 | unsigned long author_date; | ||
21 | char *committer; | 23 | char *committer; |
24 | char *committer_email; | ||
25 | unsigned long committer_date; | ||
22 | char *subject; | 26 | char *subject; |
23 | char *msg; | 27 | char *msg; |
24 | }; | 28 | }; |
25 | 29 | ||
26 | extern const char cgit_version[]; | 30 | extern const char cgit_version[]; |
27 | 31 | ||
28 | extern char *cgit_root; | 32 | extern char *cgit_root; |
29 | extern char *cgit_root_title; | 33 | extern char *cgit_root_title; |
30 | extern char *cgit_css; | 34 | extern char *cgit_css; |
31 | extern char *cgit_logo; | 35 | extern char *cgit_logo; |
32 | extern char *cgit_logo_link; | 36 | extern char *cgit_logo_link; |
33 | extern char *cgit_virtual_root; | 37 | extern char *cgit_virtual_root; |
34 | extern char *cgit_cache_root; | 38 | extern char *cgit_cache_root; |
35 | 39 | ||
36 | extern int cgit_nocache; | 40 | extern int cgit_nocache; |
37 | extern int cgit_max_lock_attempts; | 41 | extern int cgit_max_lock_attempts; |
38 | extern int cgit_cache_root_ttl; | 42 | extern int cgit_cache_root_ttl; |
39 | extern int cgit_cache_repo_ttl; | 43 | extern int cgit_cache_repo_ttl; |
40 | extern int cgit_cache_dynamic_ttl; | 44 | extern int cgit_cache_dynamic_ttl; |
41 | extern int cgit_cache_static_ttl; | 45 | extern int cgit_cache_static_ttl; |
42 | extern int cgit_cache_max_create_time; | 46 | extern int cgit_cache_max_create_time; |
43 | 47 | ||
44 | extern char *cgit_repo_name; | 48 | extern char *cgit_repo_name; |
45 | extern char *cgit_repo_desc; | 49 | extern char *cgit_repo_desc; |
46 | extern char *cgit_repo_owner; | 50 | extern char *cgit_repo_owner; |
47 | 51 | ||
48 | extern int cgit_query_has_symref; | 52 | extern int cgit_query_has_symref; |
49 | extern int cgit_query_has_sha1; | 53 | extern int cgit_query_has_sha1; |
50 | 54 | ||
51 | extern char *cgit_querystring; | 55 | extern char *cgit_querystring; |
52 | extern char *cgit_query_repo; | 56 | extern char *cgit_query_repo; |
53 | extern char *cgit_query_page; | 57 | extern char *cgit_query_page; |
54 | extern char *cgit_query_head; | 58 | extern char *cgit_query_head; |
55 | extern char *cgit_query_sha1; | 59 | extern char *cgit_query_sha1; |
56 | extern int cgit_query_ofs; | 60 | extern int cgit_query_ofs; |
57 | 61 | ||
58 | extern int htmlfd; | 62 | extern int htmlfd; |
59 | 63 | ||
60 | extern void cgit_global_config_cb(const char *name, const char *value); | 64 | extern void cgit_global_config_cb(const char *name, const char *value); |
61 | extern void cgit_repo_config_cb(const char *name, const char *value); | 65 | extern void cgit_repo_config_cb(const char *name, const char *value); |
62 | extern void cgit_querystring_cb(const char *name, const char *value); | 66 | extern void cgit_querystring_cb(const char *name, const char *value); |
63 | 67 | ||
64 | extern char *fmt(const char *format,...); | 68 | extern char *fmt(const char *format,...); |
65 | 69 | ||
66 | extern void html(const char *txt); | 70 | extern void html(const char *txt); |
67 | extern void htmlf(const char *format,...); | 71 | extern void htmlf(const char *format,...); |
68 | extern void html_txt(char *txt); | 72 | extern void html_txt(char *txt); |
69 | extern void html_attr(char *txt); | 73 | extern void html_attr(char *txt); |
70 | extern void html_link_open(char *url, char *title, char *class); | 74 | extern void html_link_open(char *url, char *title, char *class); |
71 | extern void html_link_close(void); | 75 | extern void html_link_close(void); |
72 | 76 | ||
73 | extern int cgit_read_config(const char *filename, configfn fn); | 77 | extern int cgit_read_config(const char *filename, configfn fn); |
74 | extern int cgit_parse_query(char *txt, configfn fn); | 78 | extern int cgit_parse_query(char *txt, configfn fn); |
75 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 79 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
76 | 80 | ||
77 | extern void cache_prepare(struct cacheitem *item); | 81 | extern void cache_prepare(struct cacheitem *item); |
78 | extern int cache_lock(struct cacheitem *item); | 82 | extern int cache_lock(struct cacheitem *item); |
79 | extern int cache_unlock(struct cacheitem *item); | 83 | extern int cache_unlock(struct cacheitem *item); |
80 | extern int cache_cancel_lock(struct cacheitem *item); | 84 | extern int cache_cancel_lock(struct cacheitem *item); |
81 | extern int cache_exist(struct cacheitem *item); | 85 | extern int cache_exist(struct cacheitem *item); |
82 | extern int cache_expired(struct cacheitem *item); | 86 | extern int cache_expired(struct cacheitem *item); |
83 | 87 | ||
84 | extern char *cgit_repourl(const char *reponame); | 88 | extern char *cgit_repourl(const char *reponame); |
85 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 89 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
86 | const char *query); | 90 | const char *query); |
87 | 91 | ||
88 | extern void cgit_print_error(char *msg); | 92 | extern void cgit_print_error(char *msg); |
89 | extern void cgit_print_date(unsigned long secs); | 93 | extern void cgit_print_date(unsigned long secs); |
90 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 94 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
91 | extern void cgit_print_docend(); | 95 | extern void cgit_print_docend(); |
92 | extern void cgit_print_pageheader(char *title); | 96 | extern void cgit_print_pageheader(char *title); |
93 | 97 | ||
94 | extern void cgit_print_repolist(struct cacheitem *item); | 98 | extern void cgit_print_repolist(struct cacheitem *item); |
95 | extern void cgit_print_summary(); | 99 | extern void cgit_print_summary(); |
96 | extern void cgit_print_log(const char *tip, int ofs, int cnt); | 100 | extern void cgit_print_log(const char *tip, int ofs, int cnt); |
97 | extern void cgit_print_view(const char *hex); | 101 | extern void cgit_print_view(const char *hex); |
98 | extern void cgit_print_tree(const char *hex); | 102 | extern void cgit_print_tree(const char *hex); |
99 | extern void cgit_print_commit(const char *hex); | 103 | extern void cgit_print_commit(const char *hex); |
100 | 104 | ||
101 | #endif /* CGIT_H */ | 105 | #endif /* CGIT_H */ |
@@ -42,119 +42,127 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize) | |||
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 | int ret = 0, len; | 67 | int ret = 0, len; |
68 | char line[256]; | 68 | char line[256]; |
69 | const char *value; | 69 | const char *value; |
70 | FILE *f = fopen(filename, "r"); | 70 | FILE *f = fopen(filename, "r"); |
71 | 71 | ||
72 | if (!f) | 72 | if (!f) |
73 | return -1; | 73 | return -1; |
74 | 74 | ||
75 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) | 75 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) |
76 | (*fn)(line, value); | 76 | (*fn)(line, value); |
77 | 77 | ||
78 | fclose(f); | 78 | fclose(f); |
79 | return ret; | 79 | return ret; |
80 | } | 80 | } |
81 | 81 | ||
82 | int cgit_parse_query(char *txt, configfn fn) | 82 | int cgit_parse_query(char *txt, configfn fn) |
83 | { | 83 | { |
84 | char *t, *value = NULL, c; | 84 | char *t, *value = NULL, c; |
85 | 85 | ||
86 | if (!txt) | 86 | if (!txt) |
87 | return 0; | 87 | return 0; |
88 | 88 | ||
89 | t = txt = xstrdup(txt); | 89 | t = txt = xstrdup(txt); |
90 | 90 | ||
91 | while((c=*t) != '\0') { | 91 | while((c=*t) != '\0') { |
92 | if (c=='=') { | 92 | if (c=='=') { |
93 | *t = '\0'; | 93 | *t = '\0'; |
94 | value = t+1; | 94 | value = t+1; |
95 | } else if (c=='&') { | 95 | } else if (c=='&') { |
96 | *t = '\0'; | 96 | *t = '\0'; |
97 | (*fn)(txt, value); | 97 | (*fn)(txt, value); |
98 | txt = t+1; | 98 | txt = t+1; |
99 | value = NULL; | 99 | value = NULL; |
100 | } | 100 | } |
101 | t++; | 101 | t++; |
102 | } | 102 | } |
103 | if (t!=txt) | 103 | if (t!=txt) |
104 | (*fn)(txt, value); | 104 | (*fn)(txt, value); |
105 | return 0; | 105 | return 0; |
106 | } | 106 | } |
107 | 107 | ||
108 | char *substr(const char *head, const char *tail) | 108 | char *substr(const char *head, const char *tail) |
109 | { | 109 | { |
110 | char *buf; | 110 | char *buf; |
111 | 111 | ||
112 | buf = xmalloc(tail - head + 1); | 112 | buf = xmalloc(tail - head + 1); |
113 | strncpy(buf, head, tail - head); | 113 | strncpy(buf, head, tail - head); |
114 | buf[tail - head] = '\0'; | 114 | buf[tail - head] = '\0'; |
115 | return buf; | 115 | return buf; |
116 | } | 116 | } |
117 | 117 | ||
118 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 118 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
119 | { | 119 | { |
120 | struct commitinfo *ret; | 120 | struct commitinfo *ret; |
121 | char *p = commit->buffer, *t = commit->buffer; | 121 | char *p = commit->buffer, *t = commit->buffer; |
122 | 122 | ||
123 | ret = xmalloc(sizeof(*ret)); | 123 | ret = xmalloc(sizeof(*ret)); |
124 | ret->commit = commit; | 124 | ret->commit = commit; |
125 | 125 | ||
126 | if (strncmp(p, "tree ", 5)) | 126 | if (strncmp(p, "tree ", 5)) |
127 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); | 127 | die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); |
128 | else | 128 | else |
129 | p += 46; // "tree " + hex[40] + "\n" | 129 | p += 46; // "tree " + hex[40] + "\n" |
130 | 130 | ||
131 | while (!strncmp(p, "parent ", 7)) | 131 | while (!strncmp(p, "parent ", 7)) |
132 | p += 48; // "parent " + hex[40] + "\n" | 132 | p += 48; // "parent " + hex[40] + "\n" |
133 | 133 | ||
134 | if (!strncmp(p, "author ", 7)) { | 134 | if (!strncmp(p, "author ", 7)) { |
135 | p += 7; | 135 | p += 7; |
136 | t = strchr(p, '<') - 1; | 136 | t = strchr(p, '<') - 1; |
137 | ret->author = substr(p, t); | 137 | ret->author = substr(p, t); |
138 | p = strchr(p, '\n') + 1; | 138 | p = t; |
139 | t = strchr(t, '>') + 1; | ||
140 | ret->author_email = substr(p, t); | ||
141 | ret->author_date = atol(++t); | ||
142 | p = strchr(t, '\n') + 1; | ||
139 | } | 143 | } |
140 | 144 | ||
141 | if (!strncmp(p, "committer ", 9)) { | 145 | if (!strncmp(p, "committer ", 9)) { |
142 | p += 9; | 146 | p += 9; |
143 | t = strchr(p, '<') - 1; | 147 | t = strchr(p, '<') - 1; |
144 | ret->committer = substr(p, t); | 148 | ret->committer = substr(p, t); |
145 | p = strchr(p, '\n') + 1; | 149 | p = t; |
150 | t = strchr(t, '>') + 1; | ||
151 | ret->committer_email = substr(p, t); | ||
152 | ret->committer_date = atol(++t); | ||
153 | p = strchr(t, '\n') + 1; | ||
146 | } | 154 | } |
147 | 155 | ||
148 | while (*p == '\n') | 156 | while (*p == '\n') |
149 | p = strchr(p, '\n') + 1; | 157 | p = strchr(p, '\n') + 1; |
150 | 158 | ||
151 | t = strchr(p, '\n'); | 159 | t = strchr(p, '\n'); |
152 | ret->subject = substr(p, t); | 160 | ret->subject = substr(p, t); |
153 | p = t + 1; | 161 | p = t + 1; |
154 | 162 | ||
155 | while (*p == '\n') | 163 | while (*p == '\n') |
156 | p = strchr(p, '\n') + 1; | 164 | p = strchr(p, '\n') + 1; |
157 | ret->msg = p; | 165 | ret->msg = p; |
158 | 166 | ||
159 | return ret; | 167 | return ret; |
160 | } | 168 | } |