summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-01-17 00:09:51 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-01-17 00:09:51 (UTC)
commita69061fdb7380d73715aeb3a0da6e91a24df90e4 (patch) (unidiff)
treebb514d5bfbab6e3b2904b2633a33175802f084d2
parent06c81d6faafff1c80bc9e2302e5b8fea393b775b (diff)
downloadcgit-a69061fdb7380d73715aeb3a0da6e91a24df90e4.zip
cgit-a69061fdb7380d73715aeb3a0da6e91a24df90e4.tar.gz
cgit-a69061fdb7380d73715aeb3a0da6e91a24df90e4.tar.bz2
Add function cgit_parse_tag()
Teach cgit how to extract author info from a tag. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--cgit.h8
-rw-r--r--parsing.c47
2 files changed, 55 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h
index 5e19b11..9b517a7 100644
--- a/cgit.h
+++ b/cgit.h
@@ -18,24 +18,31 @@ struct cacheitem {
18struct commitinfo { 18struct commitinfo {
19 struct commit *commit; 19 struct commit *commit;
20 char *author; 20 char *author;
21 char *author_email; 21 char *author_email;
22 unsigned long author_date; 22 unsigned long author_date;
23 char *committer; 23 char *committer;
24 char *committer_email; 24 char *committer_email;
25 unsigned long committer_date; 25 unsigned long committer_date;
26 char *subject; 26 char *subject;
27 char *msg; 27 char *msg;
28}; 28};
29 29
30struct taginfo {
31 char *tagger;
32 char *tagger_email;
33 int tagger_date;
34 char *msg;
35};
36
30extern const char cgit_version[]; 37extern const char cgit_version[];
31 38
32extern char *cgit_root; 39extern char *cgit_root;
33extern char *cgit_root_title; 40extern char *cgit_root_title;
34extern char *cgit_css; 41extern char *cgit_css;
35extern char *cgit_logo; 42extern char *cgit_logo;
36extern char *cgit_logo_link; 43extern char *cgit_logo_link;
37extern char *cgit_virtual_root; 44extern char *cgit_virtual_root;
38extern char *cgit_cache_root; 45extern char *cgit_cache_root;
39 46
40extern int cgit_nocache; 47extern int cgit_nocache;
41extern int cgit_max_lock_attempts; 48extern int cgit_max_lock_attempts;
@@ -78,24 +85,25 @@ extern void html(const char *txt);
78extern void htmlf(const char *format,...); 85extern void htmlf(const char *format,...);
79extern void html_txt(char *txt); 86extern void html_txt(char *txt);
80extern void html_ntxt(int len, char *txt); 87extern void html_ntxt(int len, char *txt);
81extern void html_attr(char *txt); 88extern void html_attr(char *txt);
82extern void html_hidden(char *name, char *value); 89extern void html_hidden(char *name, char *value);
83extern void html_link_open(char *url, char *title, char *class); 90extern void html_link_open(char *url, char *title, char *class);
84extern void html_link_close(void); 91extern void html_link_close(void);
85extern void html_filemode(unsigned short mode); 92extern void html_filemode(unsigned short mode);
86 93
87extern int cgit_read_config(const char *filename, configfn fn); 94extern int cgit_read_config(const char *filename, configfn fn);
88extern int cgit_parse_query(char *txt, configfn fn); 95extern int cgit_parse_query(char *txt, configfn fn);
89extern struct commitinfo *cgit_parse_commit(struct commit *commit); 96extern struct commitinfo *cgit_parse_commit(struct commit *commit);
97extern struct taginfo *cgit_parse_tag(struct tag *tag);
90 98
91extern char *cache_safe_filename(const char *unsafe); 99extern char *cache_safe_filename(const char *unsafe);
92extern int cache_lock(struct cacheitem *item); 100extern int cache_lock(struct cacheitem *item);
93extern int cache_unlock(struct cacheitem *item); 101extern int cache_unlock(struct cacheitem *item);
94extern int cache_cancel_lock(struct cacheitem *item); 102extern int cache_cancel_lock(struct cacheitem *item);
95extern int cache_exist(struct cacheitem *item); 103extern int cache_exist(struct cacheitem *item);
96extern int cache_expired(struct cacheitem *item); 104extern int cache_expired(struct cacheitem *item);
97 105
98extern char *cgit_repourl(const char *reponame); 106extern char *cgit_repourl(const char *reponame);
99extern char *cgit_pageurl(const char *reponame, const char *pagename, 107extern char *cgit_pageurl(const char *reponame, const char *pagename,
100 const char *query); 108 const char *query);
101 109
diff --git a/parsing.c b/parsing.c
index 4412dee..8aad1dd 100644
--- a/parsing.c
+++ b/parsing.c
@@ -187,12 +187,59 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
187 187
188 t = strchr(p, '\n'); 188 t = strchr(p, '\n');
189 if (t && *t) { 189 if (t && *t) {
190 ret->subject = substr(p, t); 190 ret->subject = substr(p, t);
191 p = t + 1; 191 p = t + 1;
192 192
193 while (*p == '\n') 193 while (*p == '\n')
194 p = strchr(p, '\n') + 1; 194 p = strchr(p, '\n') + 1;
195 ret->msg = p; 195 ret->msg = p;
196 } 196 }
197 return ret; 197 return ret;
198} 198}
199
200
201struct taginfo *cgit_parse_tag(struct tag *tag)
202{
203 void *data;
204 char type[20];
205 unsigned long size;
206 char *p, *t;
207 struct taginfo *ret;
208
209 data = read_sha1_file(tag->object.sha1, type, &size);
210 if (!data || strcmp(type, tag_type)) {
211 free(data);
212 return 0;
213 }
214
215 ret = xmalloc(sizeof(*ret));
216 ret->tagger = NULL;
217 ret->tagger_email = NULL;
218 ret->tagger_date = 0;
219 ret->msg = NULL;
220
221 p = data;
222
223 while (p) {
224 if (*p == '\n')
225 break;
226
227 if (!strncmp(p, "tagger ", 7)) {
228 p += 7;
229 t = strchr(p, '<') - 1;
230 ret->tagger = substr(p, t);
231 p = t;
232 t = strchr(t, '>') + 1;
233 ret->tagger_email = substr(p, t);
234 ret->tagger_date = atol(++t);
235 }
236 p = strchr(p, '\n') + 1;
237 }
238
239 while (p && (*p == '\n'))
240 p = strchr(p, '\n') + 1;
241 if (p)
242 ret->msg = xstrdup(p);
243 free(data);
244 return ret;
245}