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