|
diff --git a/shared.c b/shared.c index b42c2a2..72ac140 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -1,257 +1,257 @@ |
1 | /* shared.c: global vars + some callback functions |
1 | /* shared.c: global vars + some callback functions |
2 | * |
2 | * |
3 | * Copyright (C) 2006 Lars Hjemli |
3 | * Copyright (C) 2006 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | |
10 | |
11 | struct cgit_repolist cgit_repolist; |
11 | struct cgit_repolist cgit_repolist; |
12 | struct cgit_context ctx; |
12 | struct cgit_context ctx; |
13 | |
13 | |
14 | int chk_zero(int result, char *msg) |
14 | int chk_zero(int result, char *msg) |
15 | { |
15 | { |
16 | if (result != 0) |
16 | if (result != 0) |
17 | die("%s: %s", msg, strerror(errno)); |
17 | die("%s: %s", msg, strerror(errno)); |
18 | return result; |
18 | return result; |
19 | } |
19 | } |
20 | |
20 | |
21 | int chk_positive(int result, char *msg) |
21 | int chk_positive(int result, char *msg) |
22 | { |
22 | { |
23 | if (result <= 0) |
23 | if (result <= 0) |
24 | die("%s: %s", msg, strerror(errno)); |
24 | die("%s: %s", msg, strerror(errno)); |
25 | return result; |
25 | return result; |
26 | } |
26 | } |
27 | |
27 | |
28 | int chk_non_negative(int result, char *msg) |
28 | int chk_non_negative(int result, char *msg) |
29 | { |
29 | { |
30 | if (result < 0) |
30 | if (result < 0) |
31 | die("%s: %s",msg, strerror(errno)); |
31 | die("%s: %s",msg, strerror(errno)); |
32 | return result; |
32 | return result; |
33 | } |
33 | } |
34 | |
34 | |
35 | struct cgit_repo *cgit_add_repo(const char *url) |
35 | struct cgit_repo *cgit_add_repo(const char *url) |
36 | { |
36 | { |
37 | struct cgit_repo *ret; |
37 | struct cgit_repo *ret; |
38 | |
38 | |
39 | if (++cgit_repolist.count > cgit_repolist.length) { |
39 | if (++cgit_repolist.count > cgit_repolist.length) { |
40 | if (cgit_repolist.length == 0) |
40 | if (cgit_repolist.length == 0) |
41 | cgit_repolist.length = 8; |
41 | cgit_repolist.length = 8; |
42 | else |
42 | else |
43 | cgit_repolist.length *= 2; |
43 | cgit_repolist.length *= 2; |
44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
45 | cgit_repolist.length * |
45 | cgit_repolist.length * |
46 | sizeof(struct cgit_repo)); |
46 | sizeof(struct cgit_repo)); |
47 | } |
47 | } |
48 | |
48 | |
49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
50 | memset(ret, 0, sizeof(struct cgit_repo)); |
50 | memset(ret, 0, sizeof(struct cgit_repo)); |
51 | ret->url = trim_end(url, '/'); |
51 | ret->url = trim_end(url, '/'); |
52 | ret->name = ret->url; |
52 | ret->name = ret->url; |
53 | ret->path = NULL; |
53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; |
54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; |
55 | ret->owner = NULL; |
56 | ret->section = ctx.cfg.section; |
56 | ret->section = ctx.cfg.section; |
57 | ret->defbranch = "master"; |
57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; |
58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
63 | ret->max_stats = ctx.cfg.max_stats; |
63 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->module_link = ctx.cfg.module_link; |
64 | ret->module_link = ctx.cfg.module_link; |
65 | ret->readme = NULL; |
65 | ret->readme = ctx.cfg.readme; |
66 | ret->mtime = -1; |
66 | ret->mtime = -1; |
67 | ret->about_filter = ctx.cfg.about_filter; |
67 | ret->about_filter = ctx.cfg.about_filter; |
68 | ret->commit_filter = ctx.cfg.commit_filter; |
68 | ret->commit_filter = ctx.cfg.commit_filter; |
69 | ret->source_filter = ctx.cfg.source_filter; |
69 | ret->source_filter = ctx.cfg.source_filter; |
70 | return ret; |
70 | return ret; |
71 | } |
71 | } |
72 | |
72 | |
73 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
73 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
74 | { |
74 | { |
75 | int i; |
75 | int i; |
76 | struct cgit_repo *repo; |
76 | struct cgit_repo *repo; |
77 | |
77 | |
78 | for (i=0; i<cgit_repolist.count; i++) { |
78 | for (i=0; i<cgit_repolist.count; i++) { |
79 | repo = &cgit_repolist.repos[i]; |
79 | repo = &cgit_repolist.repos[i]; |
80 | if (!strcmp(repo->url, url)) |
80 | if (!strcmp(repo->url, url)) |
81 | return repo; |
81 | return repo; |
82 | } |
82 | } |
83 | return NULL; |
83 | return NULL; |
84 | } |
84 | } |
85 | |
85 | |
86 | void *cgit_free_commitinfo(struct commitinfo *info) |
86 | void *cgit_free_commitinfo(struct commitinfo *info) |
87 | { |
87 | { |
88 | free(info->author); |
88 | free(info->author); |
89 | free(info->author_email); |
89 | free(info->author_email); |
90 | free(info->committer); |
90 | free(info->committer); |
91 | free(info->committer_email); |
91 | free(info->committer_email); |
92 | free(info->subject); |
92 | free(info->subject); |
93 | free(info->msg); |
93 | free(info->msg); |
94 | free(info->msg_encoding); |
94 | free(info->msg_encoding); |
95 | free(info); |
95 | free(info); |
96 | return NULL; |
96 | return NULL; |
97 | } |
97 | } |
98 | |
98 | |
99 | char *trim_end(const char *str, char c) |
99 | char *trim_end(const char *str, char c) |
100 | { |
100 | { |
101 | int len; |
101 | int len; |
102 | char *s, *t; |
102 | char *s, *t; |
103 | |
103 | |
104 | if (str == NULL) |
104 | if (str == NULL) |
105 | return NULL; |
105 | return NULL; |
106 | t = (char *)str; |
106 | t = (char *)str; |
107 | len = strlen(t); |
107 | len = strlen(t); |
108 | while(len > 0 && t[len - 1] == c) |
108 | while(len > 0 && t[len - 1] == c) |
109 | len--; |
109 | len--; |
110 | |
110 | |
111 | if (len == 0) |
111 | if (len == 0) |
112 | return NULL; |
112 | return NULL; |
113 | |
113 | |
114 | c = t[len]; |
114 | c = t[len]; |
115 | t[len] = '\0'; |
115 | t[len] = '\0'; |
116 | s = xstrdup(t); |
116 | s = xstrdup(t); |
117 | t[len] = c; |
117 | t[len] = c; |
118 | return s; |
118 | return s; |
119 | } |
119 | } |
120 | |
120 | |
121 | char *strlpart(char *txt, int maxlen) |
121 | char *strlpart(char *txt, int maxlen) |
122 | { |
122 | { |
123 | char *result; |
123 | char *result; |
124 | |
124 | |
125 | if (!txt) |
125 | if (!txt) |
126 | return txt; |
126 | return txt; |
127 | |
127 | |
128 | if (strlen(txt) <= maxlen) |
128 | if (strlen(txt) <= maxlen) |
129 | return txt; |
129 | return txt; |
130 | result = xmalloc(maxlen + 1); |
130 | result = xmalloc(maxlen + 1); |
131 | memcpy(result, txt, maxlen - 3); |
131 | memcpy(result, txt, maxlen - 3); |
132 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
132 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
133 | result[maxlen] = '\0'; |
133 | result[maxlen] = '\0'; |
134 | return result; |
134 | return result; |
135 | } |
135 | } |
136 | |
136 | |
137 | char *strrpart(char *txt, int maxlen) |
137 | char *strrpart(char *txt, int maxlen) |
138 | { |
138 | { |
139 | char *result; |
139 | char *result; |
140 | |
140 | |
141 | if (!txt) |
141 | if (!txt) |
142 | return txt; |
142 | return txt; |
143 | |
143 | |
144 | if (strlen(txt) <= maxlen) |
144 | if (strlen(txt) <= maxlen) |
145 | return txt; |
145 | return txt; |
146 | result = xmalloc(maxlen + 1); |
146 | result = xmalloc(maxlen + 1); |
147 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
147 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
148 | result[0] = result[1] = result[2] = '.'; |
148 | result[0] = result[1] = result[2] = '.'; |
149 | return result; |
149 | return result; |
150 | } |
150 | } |
151 | |
151 | |
152 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
152 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
153 | { |
153 | { |
154 | size_t size; |
154 | size_t size; |
155 | |
155 | |
156 | if (list->count >= list->alloc) { |
156 | if (list->count >= list->alloc) { |
157 | list->alloc += (list->alloc ? list->alloc : 4); |
157 | list->alloc += (list->alloc ? list->alloc : 4); |
158 | size = list->alloc * sizeof(struct refinfo *); |
158 | size = list->alloc * sizeof(struct refinfo *); |
159 | list->refs = xrealloc(list->refs, size); |
159 | list->refs = xrealloc(list->refs, size); |
160 | } |
160 | } |
161 | list->refs[list->count++] = ref; |
161 | list->refs[list->count++] = ref; |
162 | } |
162 | } |
163 | |
163 | |
164 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
164 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
165 | { |
165 | { |
166 | struct refinfo *ref; |
166 | struct refinfo *ref; |
167 | |
167 | |
168 | ref = xmalloc(sizeof (struct refinfo)); |
168 | ref = xmalloc(sizeof (struct refinfo)); |
169 | ref->refname = xstrdup(refname); |
169 | ref->refname = xstrdup(refname); |
170 | ref->object = parse_object(sha1); |
170 | ref->object = parse_object(sha1); |
171 | switch (ref->object->type) { |
171 | switch (ref->object->type) { |
172 | case OBJ_TAG: |
172 | case OBJ_TAG: |
173 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
173 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
174 | break; |
174 | break; |
175 | case OBJ_COMMIT: |
175 | case OBJ_COMMIT: |
176 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
176 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
177 | break; |
177 | break; |
178 | } |
178 | } |
179 | return ref; |
179 | return ref; |
180 | } |
180 | } |
181 | |
181 | |
182 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
182 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
183 | void *cb_data) |
183 | void *cb_data) |
184 | { |
184 | { |
185 | struct reflist *list = (struct reflist *)cb_data; |
185 | struct reflist *list = (struct reflist *)cb_data; |
186 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
186 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
187 | |
187 | |
188 | if (info) |
188 | if (info) |
189 | cgit_add_ref(list, info); |
189 | cgit_add_ref(list, info); |
190 | return 0; |
190 | return 0; |
191 | } |
191 | } |
192 | |
192 | |
193 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
193 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
194 | struct diff_options *options, void *data) |
194 | struct diff_options *options, void *data) |
195 | { |
195 | { |
196 | int i; |
196 | int i; |
197 | |
197 | |
198 | for (i = 0; i < q->nr; i++) { |
198 | for (i = 0; i < q->nr; i++) { |
199 | if (q->queue[i]->status == 'U') |
199 | if (q->queue[i]->status == 'U') |
200 | continue; |
200 | continue; |
201 | ((filepair_fn)data)(q->queue[i]); |
201 | ((filepair_fn)data)(q->queue[i]); |
202 | } |
202 | } |
203 | } |
203 | } |
204 | |
204 | |
205 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
205 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
206 | { |
206 | { |
207 | enum object_type type; |
207 | enum object_type type; |
208 | |
208 | |
209 | if (is_null_sha1(sha1)) { |
209 | if (is_null_sha1(sha1)) { |
210 | file->ptr = (char *)""; |
210 | file->ptr = (char *)""; |
211 | file->size = 0; |
211 | file->size = 0; |
212 | } else { |
212 | } else { |
213 | file->ptr = read_sha1_file(sha1, &type, |
213 | file->ptr = read_sha1_file(sha1, &type, |
214 | (unsigned long *)&file->size); |
214 | (unsigned long *)&file->size); |
215 | } |
215 | } |
216 | return 1; |
216 | return 1; |
217 | } |
217 | } |
218 | |
218 | |
219 | /* |
219 | /* |
220 | * Receive diff-buffers from xdiff and concatenate them as |
220 | * Receive diff-buffers from xdiff and concatenate them as |
221 | * needed across multiple callbacks. |
221 | * needed across multiple callbacks. |
222 | * |
222 | * |
223 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
223 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
224 | * ripped from git and modified to use globals instead of |
224 | * ripped from git and modified to use globals instead of |
225 | * a special callback-struct. |
225 | * a special callback-struct. |
226 | */ |
226 | */ |
227 | char *diffbuf = NULL; |
227 | char *diffbuf = NULL; |
228 | int buflen = 0; |
228 | int buflen = 0; |
229 | |
229 | |
230 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
230 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
231 | { |
231 | { |
232 | int i; |
232 | int i; |
233 | |
233 | |
234 | for (i = 0; i < nbuf; i++) { |
234 | for (i = 0; i < nbuf; i++) { |
235 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
235 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
236 | /* Incomplete line */ |
236 | /* Incomplete line */ |
237 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
237 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
238 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
238 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
239 | buflen += mb[i].size; |
239 | buflen += mb[i].size; |
240 | continue; |
240 | continue; |
241 | } |
241 | } |
242 | |
242 | |
243 | /* we have a complete line */ |
243 | /* we have a complete line */ |
244 | if (!diffbuf) { |
244 | if (!diffbuf) { |
245 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
245 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
246 | continue; |
246 | continue; |
247 | } |
247 | } |
248 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
248 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
249 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
249 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
250 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
250 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
251 | free(diffbuf); |
251 | free(diffbuf); |
252 | diffbuf = NULL; |
252 | diffbuf = NULL; |
253 | buflen = 0; |
253 | buflen = 0; |
254 | } |
254 | } |
255 | if (diffbuf) { |
255 | if (diffbuf) { |
256 | ((linediff_fn)priv)(diffbuf, buflen); |
256 | ((linediff_fn)priv)(diffbuf, buflen); |
257 | free(diffbuf); |
257 | free(diffbuf); |
|