author | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:38:46 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-19 09:38:46 (UTC) |
commit | 9af580d8f6e31ccd68307a728a710c525e4133ab (patch) (unidiff) | |
tree | 30b5fb3d0d323423da7ee52ba9a45b36bb557252 /shared.c | |
parent | 023d933121ca7352a069f3886caf6fbe958ba27d (diff) | |
parent | 581a0c2a5428917d42cbfb2b4673a2d2ebceb7d0 (diff) | |
download | cgit-9af580d8f6e31ccd68307a728a710c525e4133ab.zip cgit-9af580d8f6e31ccd68307a728a710c525e4133ab.tar.gz cgit-9af580d8f6e31ccd68307a728a710c525e4133ab.tar.bz2 |
Merge branch 'sn/subject-link'
-rw-r--r-- | shared.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,433 +1,434 @@ | |||
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 | memset(ret, 0, sizeof(struct cgit_repo)); | 51 | memset(ret, 0, sizeof(struct cgit_repo)); |
52 | ret->url = trim_end(url, '/'); | 52 | ret->url = trim_end(url, '/'); |
53 | ret->name = ret->url; | 53 | ret->name = ret->url; |
54 | ret->path = NULL; | 54 | ret->path = NULL; |
55 | ret->desc = "[no description]"; | 55 | ret->desc = "[no description]"; |
56 | ret->owner = NULL; | 56 | ret->owner = NULL; |
57 | ret->section = ctx.cfg.section; | 57 | ret->section = ctx.cfg.section; |
58 | ret->defbranch = "master"; | 58 | ret->defbranch = "master"; |
59 | ret->snapshots = ctx.cfg.snapshots; | 59 | ret->snapshots = ctx.cfg.snapshots; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | 62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
63 | ret->enable_subject_links = ctx.cfg.enable_subject_links; | ||
63 | ret->max_stats = ctx.cfg.max_stats; | 64 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->module_link = ctx.cfg.module_link; | 65 | ret->module_link = ctx.cfg.module_link; |
65 | ret->readme = NULL; | 66 | ret->readme = NULL; |
66 | ret->mtime = -1; | 67 | ret->mtime = -1; |
67 | ret->about_filter = ctx.cfg.about_filter; | 68 | ret->about_filter = ctx.cfg.about_filter; |
68 | ret->commit_filter = ctx.cfg.commit_filter; | 69 | ret->commit_filter = ctx.cfg.commit_filter; |
69 | ret->source_filter = ctx.cfg.source_filter; | 70 | ret->source_filter = ctx.cfg.source_filter; |
70 | return ret; | 71 | return ret; |
71 | } | 72 | } |
72 | 73 | ||
73 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 74 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
74 | { | 75 | { |
75 | int i; | 76 | int i; |
76 | struct cgit_repo *repo; | 77 | struct cgit_repo *repo; |
77 | 78 | ||
78 | for (i=0; i<cgit_repolist.count; i++) { | 79 | for (i=0; i<cgit_repolist.count; i++) { |
79 | repo = &cgit_repolist.repos[i]; | 80 | repo = &cgit_repolist.repos[i]; |
80 | if (!strcmp(repo->url, url)) | 81 | if (!strcmp(repo->url, url)) |
81 | return repo; | 82 | return repo; |
82 | } | 83 | } |
83 | return NULL; | 84 | return NULL; |
84 | } | 85 | } |
85 | 86 | ||
86 | void *cgit_free_commitinfo(struct commitinfo *info) | 87 | void *cgit_free_commitinfo(struct commitinfo *info) |
87 | { | 88 | { |
88 | free(info->author); | 89 | free(info->author); |
89 | free(info->author_email); | 90 | free(info->author_email); |
90 | free(info->committer); | 91 | free(info->committer); |
91 | free(info->committer_email); | 92 | free(info->committer_email); |
92 | free(info->subject); | 93 | free(info->subject); |
93 | free(info->msg); | 94 | free(info->msg); |
94 | free(info->msg_encoding); | 95 | free(info->msg_encoding); |
95 | free(info); | 96 | free(info); |
96 | return NULL; | 97 | return NULL; |
97 | } | 98 | } |
98 | 99 | ||
99 | char *trim_end(const char *str, char c) | 100 | char *trim_end(const char *str, char c) |
100 | { | 101 | { |
101 | int len; | 102 | int len; |
102 | char *s, *t; | 103 | char *s, *t; |
103 | 104 | ||
104 | if (str == NULL) | 105 | if (str == NULL) |
105 | return NULL; | 106 | return NULL; |
106 | t = (char *)str; | 107 | t = (char *)str; |
107 | len = strlen(t); | 108 | len = strlen(t); |
108 | while(len > 0 && t[len - 1] == c) | 109 | while(len > 0 && t[len - 1] == c) |
109 | len--; | 110 | len--; |
110 | 111 | ||
111 | if (len == 0) | 112 | if (len == 0) |
112 | return NULL; | 113 | return NULL; |
113 | 114 | ||
114 | c = t[len]; | 115 | c = t[len]; |
115 | t[len] = '\0'; | 116 | t[len] = '\0'; |
116 | s = xstrdup(t); | 117 | s = xstrdup(t); |
117 | t[len] = c; | 118 | t[len] = c; |
118 | return s; | 119 | return s; |
119 | } | 120 | } |
120 | 121 | ||
121 | char *strlpart(char *txt, int maxlen) | 122 | char *strlpart(char *txt, int maxlen) |
122 | { | 123 | { |
123 | char *result; | 124 | char *result; |
124 | 125 | ||
125 | if (!txt) | 126 | if (!txt) |
126 | return txt; | 127 | return txt; |
127 | 128 | ||
128 | if (strlen(txt) <= maxlen) | 129 | if (strlen(txt) <= maxlen) |
129 | return txt; | 130 | return txt; |
130 | result = xmalloc(maxlen + 1); | 131 | result = xmalloc(maxlen + 1); |
131 | memcpy(result, txt, maxlen - 3); | 132 | memcpy(result, txt, maxlen - 3); |
132 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; | 133 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
133 | result[maxlen] = '\0'; | 134 | result[maxlen] = '\0'; |
134 | return result; | 135 | return result; |
135 | } | 136 | } |
136 | 137 | ||
137 | char *strrpart(char *txt, int maxlen) | 138 | char *strrpart(char *txt, int maxlen) |
138 | { | 139 | { |
139 | char *result; | 140 | char *result; |
140 | 141 | ||
141 | if (!txt) | 142 | if (!txt) |
142 | return txt; | 143 | return txt; |
143 | 144 | ||
144 | if (strlen(txt) <= maxlen) | 145 | if (strlen(txt) <= maxlen) |
145 | return txt; | 146 | return txt; |
146 | result = xmalloc(maxlen + 1); | 147 | result = xmalloc(maxlen + 1); |
147 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); | 148 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
148 | result[0] = result[1] = result[2] = '.'; | 149 | result[0] = result[1] = result[2] = '.'; |
149 | return result; | 150 | return result; |
150 | } | 151 | } |
151 | 152 | ||
152 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) | 153 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
153 | { | 154 | { |
154 | size_t size; | 155 | size_t size; |
155 | 156 | ||
156 | if (list->count >= list->alloc) { | 157 | if (list->count >= list->alloc) { |
157 | list->alloc += (list->alloc ? list->alloc : 4); | 158 | list->alloc += (list->alloc ? list->alloc : 4); |
158 | size = list->alloc * sizeof(struct refinfo *); | 159 | size = list->alloc * sizeof(struct refinfo *); |
159 | list->refs = xrealloc(list->refs, size); | 160 | list->refs = xrealloc(list->refs, size); |
160 | } | 161 | } |
161 | list->refs[list->count++] = ref; | 162 | list->refs[list->count++] = ref; |
162 | } | 163 | } |
163 | 164 | ||
164 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) | 165 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
165 | { | 166 | { |
166 | struct refinfo *ref; | 167 | struct refinfo *ref; |
167 | 168 | ||
168 | ref = xmalloc(sizeof (struct refinfo)); | 169 | ref = xmalloc(sizeof (struct refinfo)); |
169 | ref->refname = xstrdup(refname); | 170 | ref->refname = xstrdup(refname); |
170 | ref->object = parse_object(sha1); | 171 | ref->object = parse_object(sha1); |
171 | switch (ref->object->type) { | 172 | switch (ref->object->type) { |
172 | case OBJ_TAG: | 173 | case OBJ_TAG: |
173 | ref->tag = cgit_parse_tag((struct tag *)ref->object); | 174 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
174 | break; | 175 | break; |
175 | case OBJ_COMMIT: | 176 | case OBJ_COMMIT: |
176 | ref->commit = cgit_parse_commit((struct commit *)ref->object); | 177 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
177 | break; | 178 | break; |
178 | } | 179 | } |
179 | return ref; | 180 | return ref; |
180 | } | 181 | } |
181 | 182 | ||
182 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, | 183 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
183 | void *cb_data) | 184 | void *cb_data) |
184 | { | 185 | { |
185 | struct reflist *list = (struct reflist *)cb_data; | 186 | struct reflist *list = (struct reflist *)cb_data; |
186 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); | 187 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
187 | 188 | ||
188 | if (info) | 189 | if (info) |
189 | cgit_add_ref(list, info); | 190 | cgit_add_ref(list, info); |
190 | return 0; | 191 | return 0; |
191 | } | 192 | } |
192 | 193 | ||
193 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 194 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
194 | struct diff_options *options, void *data) | 195 | struct diff_options *options, void *data) |
195 | { | 196 | { |
196 | int i; | 197 | int i; |
197 | 198 | ||
198 | for (i = 0; i < q->nr; i++) { | 199 | for (i = 0; i < q->nr; i++) { |
199 | if (q->queue[i]->status == 'U') | 200 | if (q->queue[i]->status == 'U') |
200 | continue; | 201 | continue; |
201 | ((filepair_fn)data)(q->queue[i]); | 202 | ((filepair_fn)data)(q->queue[i]); |
202 | } | 203 | } |
203 | } | 204 | } |
204 | 205 | ||
205 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) | 206 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
206 | { | 207 | { |
207 | enum object_type type; | 208 | enum object_type type; |
208 | 209 | ||
209 | if (is_null_sha1(sha1)) { | 210 | if (is_null_sha1(sha1)) { |
210 | file->ptr = (char *)""; | 211 | file->ptr = (char *)""; |
211 | file->size = 0; | 212 | file->size = 0; |
212 | } else { | 213 | } else { |
213 | file->ptr = read_sha1_file(sha1, &type, | 214 | file->ptr = read_sha1_file(sha1, &type, |
214 | (unsigned long *)&file->size); | 215 | (unsigned long *)&file->size); |
215 | } | 216 | } |
216 | return 1; | 217 | return 1; |
217 | } | 218 | } |
218 | 219 | ||
219 | /* | 220 | /* |
220 | * Receive diff-buffers from xdiff and concatenate them as | 221 | * Receive diff-buffers from xdiff and concatenate them as |
221 | * needed across multiple callbacks. | 222 | * needed across multiple callbacks. |
222 | * | 223 | * |
223 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), | 224 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
224 | * ripped from git and modified to use globals instead of | 225 | * ripped from git and modified to use globals instead of |
225 | * a special callback-struct. | 226 | * a special callback-struct. |
226 | */ | 227 | */ |
227 | char *diffbuf = NULL; | 228 | char *diffbuf = NULL; |
228 | int buflen = 0; | 229 | int buflen = 0; |
229 | 230 | ||
230 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | 231 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
231 | { | 232 | { |
232 | int i; | 233 | int i; |
233 | 234 | ||
234 | for (i = 0; i < nbuf; i++) { | 235 | for (i = 0; i < nbuf; i++) { |
235 | if (mb[i].ptr[mb[i].size-1] != '\n') { | 236 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
236 | /* Incomplete line */ | 237 | /* Incomplete line */ |
237 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 238 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
238 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 239 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
239 | buflen += mb[i].size; | 240 | buflen += mb[i].size; |
240 | continue; | 241 | continue; |
241 | } | 242 | } |
242 | 243 | ||
243 | /* we have a complete line */ | 244 | /* we have a complete line */ |
244 | if (!diffbuf) { | 245 | if (!diffbuf) { |
245 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); | 246 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
246 | continue; | 247 | continue; |
247 | } | 248 | } |
248 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 249 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
249 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 250 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
250 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 251 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
251 | free(diffbuf); | 252 | free(diffbuf); |
252 | diffbuf = NULL; | 253 | diffbuf = NULL; |
253 | buflen = 0; | 254 | buflen = 0; |
254 | } | 255 | } |
255 | if (diffbuf) { | 256 | if (diffbuf) { |
256 | ((linediff_fn)priv)(diffbuf, buflen); | 257 | ((linediff_fn)priv)(diffbuf, buflen); |
257 | free(diffbuf); | 258 | free(diffbuf); |
258 | diffbuf = NULL; | 259 | diffbuf = NULL; |
259 | buflen = 0; | 260 | buflen = 0; |
260 | } | 261 | } |
261 | return 0; | 262 | return 0; |
262 | } | 263 | } |
263 | 264 | ||
264 | int cgit_diff_files(const unsigned char *old_sha1, | 265 | int cgit_diff_files(const unsigned char *old_sha1, |
265 | const unsigned char *new_sha1, unsigned long *old_size, | 266 | const unsigned char *new_sha1, unsigned long *old_size, |
266 | unsigned long *new_size, int *binary, linediff_fn fn) | 267 | unsigned long *new_size, int *binary, linediff_fn fn) |
267 | { | 268 | { |
268 | mmfile_t file1, file2; | 269 | mmfile_t file1, file2; |
269 | xpparam_t diff_params; | 270 | xpparam_t diff_params; |
270 | xdemitconf_t emit_params; | 271 | xdemitconf_t emit_params; |
271 | xdemitcb_t emit_cb; | 272 | xdemitcb_t emit_cb; |
272 | 273 | ||
273 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 274 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
274 | return 1; | 275 | return 1; |
275 | 276 | ||
276 | *old_size = file1.size; | 277 | *old_size = file1.size; |
277 | *new_size = file2.size; | 278 | *new_size = file2.size; |
278 | 279 | ||
279 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || | 280 | if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || |
280 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { | 281 | (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { |
281 | *binary = 1; | 282 | *binary = 1; |
282 | if (file1.size) | 283 | if (file1.size) |
283 | free(file1.ptr); | 284 | free(file1.ptr); |
284 | if (file2.size) | 285 | if (file2.size) |
285 | free(file2.ptr); | 286 | free(file2.ptr); |
286 | return 0; | 287 | return 0; |
287 | } | 288 | } |
288 | 289 | ||
289 | memset(&diff_params, 0, sizeof(diff_params)); | 290 | memset(&diff_params, 0, sizeof(diff_params)); |
290 | memset(&emit_params, 0, sizeof(emit_params)); | 291 | memset(&emit_params, 0, sizeof(emit_params)); |
291 | memset(&emit_cb, 0, sizeof(emit_cb)); | 292 | memset(&emit_cb, 0, sizeof(emit_cb)); |
292 | diff_params.flags = XDF_NEED_MINIMAL; | 293 | diff_params.flags = XDF_NEED_MINIMAL; |
293 | emit_params.ctxlen = 3; | 294 | emit_params.ctxlen = 3; |
294 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 295 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
295 | emit_cb.outf = filediff_cb; | 296 | emit_cb.outf = filediff_cb; |
296 | emit_cb.priv = fn; | 297 | emit_cb.priv = fn; |
297 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 298 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
298 | if (file1.size) | 299 | if (file1.size) |
299 | free(file1.ptr); | 300 | free(file1.ptr); |
300 | if (file2.size) | 301 | if (file2.size) |
301 | free(file2.ptr); | 302 | free(file2.ptr); |
302 | return 0; | 303 | return 0; |
303 | } | 304 | } |
304 | 305 | ||
305 | void cgit_diff_tree(const unsigned char *old_sha1, | 306 | void cgit_diff_tree(const unsigned char *old_sha1, |
306 | const unsigned char *new_sha1, | 307 | const unsigned char *new_sha1, |
307 | filepair_fn fn, const char *prefix) | 308 | filepair_fn fn, const char *prefix) |
308 | { | 309 | { |
309 | struct diff_options opt; | 310 | struct diff_options opt; |
310 | int ret; | 311 | int ret; |
311 | int prefixlen; | 312 | int prefixlen; |
312 | 313 | ||
313 | diff_setup(&opt); | 314 | diff_setup(&opt); |
314 | opt.output_format = DIFF_FORMAT_CALLBACK; | 315 | opt.output_format = DIFF_FORMAT_CALLBACK; |
315 | opt.detect_rename = 1; | 316 | opt.detect_rename = 1; |
316 | opt.rename_limit = ctx.cfg.renamelimit; | 317 | opt.rename_limit = ctx.cfg.renamelimit; |
317 | DIFF_OPT_SET(&opt, RECURSIVE); | 318 | DIFF_OPT_SET(&opt, RECURSIVE); |
318 | opt.format_callback = cgit_diff_tree_cb; | 319 | opt.format_callback = cgit_diff_tree_cb; |
319 | opt.format_callback_data = fn; | 320 | opt.format_callback_data = fn; |
320 | if (prefix) { | 321 | if (prefix) { |
321 | opt.nr_paths = 1; | 322 | opt.nr_paths = 1; |
322 | opt.paths = &prefix; | 323 | opt.paths = &prefix; |
323 | prefixlen = strlen(prefix); | 324 | prefixlen = strlen(prefix); |
324 | opt.pathlens = &prefixlen; | 325 | opt.pathlens = &prefixlen; |
325 | } | 326 | } |
326 | diff_setup_done(&opt); | 327 | diff_setup_done(&opt); |
327 | 328 | ||
328 | if (old_sha1 && !is_null_sha1(old_sha1)) | 329 | if (old_sha1 && !is_null_sha1(old_sha1)) |
329 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 330 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
330 | else | 331 | else |
331 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 332 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
332 | diffcore_std(&opt); | 333 | diffcore_std(&opt); |
333 | diff_flush(&opt); | 334 | diff_flush(&opt); |
334 | } | 335 | } |
335 | 336 | ||
336 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 337 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
337 | { | 338 | { |
338 | unsigned char *old_sha1 = NULL; | 339 | unsigned char *old_sha1 = NULL; |
339 | 340 | ||
340 | if (commit->parents) | 341 | if (commit->parents) |
341 | old_sha1 = commit->parents->item->object.sha1; | 342 | old_sha1 = commit->parents->item->object.sha1; |
342 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); | 343 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
343 | } | 344 | } |
344 | 345 | ||
345 | int cgit_parse_snapshots_mask(const char *str) | 346 | int cgit_parse_snapshots_mask(const char *str) |
346 | { | 347 | { |
347 | const struct cgit_snapshot_format *f; | 348 | const struct cgit_snapshot_format *f; |
348 | static const char *delim = " \t,:/|;"; | 349 | static const char *delim = " \t,:/|;"; |
349 | int tl, sl, rv = 0; | 350 | int tl, sl, rv = 0; |
350 | 351 | ||
351 | /* favor legacy setting */ | 352 | /* favor legacy setting */ |
352 | if(atoi(str)) | 353 | if(atoi(str)) |
353 | return 1; | 354 | return 1; |
354 | for(;;) { | 355 | for(;;) { |
355 | str += strspn(str,delim); | 356 | str += strspn(str,delim); |
356 | tl = strcspn(str,delim); | 357 | tl = strcspn(str,delim); |
357 | if (!tl) | 358 | if (!tl) |
358 | break; | 359 | break; |
359 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 360 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
360 | sl = strlen(f->suffix); | 361 | sl = strlen(f->suffix); |
361 | if((tl == sl && !strncmp(f->suffix, str, tl)) || | 362 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
362 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { | 363 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
363 | rv |= f->bit; | 364 | rv |= f->bit; |
364 | break; | 365 | break; |
365 | } | 366 | } |
366 | } | 367 | } |
367 | str += tl; | 368 | str += tl; |
368 | } | 369 | } |
369 | return rv; | 370 | return rv; |
370 | } | 371 | } |
371 | 372 | ||
372 | int cgit_open_filter(struct cgit_filter *filter) | 373 | int cgit_open_filter(struct cgit_filter *filter) |
373 | { | 374 | { |
374 | 375 | ||
375 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), | 376 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
376 | "Unable to duplicate STDOUT"); | 377 | "Unable to duplicate STDOUT"); |
377 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); | 378 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
378 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); | 379 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
379 | if (filter->pid == 0) { | 380 | if (filter->pid == 0) { |
380 | close(filter->pipe_fh[1]); | 381 | close(filter->pipe_fh[1]); |
381 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), | 382 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
382 | "Unable to use pipe as STDIN"); | 383 | "Unable to use pipe as STDIN"); |
383 | execvp(filter->cmd, filter->argv); | 384 | execvp(filter->cmd, filter->argv); |
384 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, | 385 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
385 | strerror(errno), errno); | 386 | strerror(errno), errno); |
386 | } | 387 | } |
387 | close(filter->pipe_fh[0]); | 388 | close(filter->pipe_fh[0]); |
388 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), | 389 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
389 | "Unable to use pipe as STDOUT"); | 390 | "Unable to use pipe as STDOUT"); |
390 | close(filter->pipe_fh[1]); | 391 | close(filter->pipe_fh[1]); |
391 | return 0; | 392 | return 0; |
392 | } | 393 | } |
393 | 394 | ||
394 | int cgit_close_filter(struct cgit_filter *filter) | 395 | int cgit_close_filter(struct cgit_filter *filter) |
395 | { | 396 | { |
396 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), | 397 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
397 | "Unable to restore STDOUT"); | 398 | "Unable to restore STDOUT"); |
398 | close(filter->old_stdout); | 399 | close(filter->old_stdout); |
399 | if (filter->pid < 0) | 400 | if (filter->pid < 0) |
400 | return 0; | 401 | return 0; |
401 | waitpid(filter->pid, &filter->exitstatus, 0); | 402 | waitpid(filter->pid, &filter->exitstatus, 0); |
402 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) | 403 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
403 | return 0; | 404 | return 0; |
404 | die("Subprocess %s exited abnormally", filter->cmd); | 405 | die("Subprocess %s exited abnormally", filter->cmd); |
405 | } | 406 | } |
406 | 407 | ||
407 | /* Read the content of the specified file into a newly allocated buffer, | 408 | /* Read the content of the specified file into a newly allocated buffer, |
408 | * zeroterminate the buffer and return 0 on success, errno otherwise. | 409 | * zeroterminate the buffer and return 0 on success, errno otherwise. |
409 | */ | 410 | */ |
410 | int readfile(const char *path, char **buf, size_t *size) | 411 | int readfile(const char *path, char **buf, size_t *size) |
411 | { | 412 | { |
412 | int fd, e; | 413 | int fd, e; |
413 | struct stat st; | 414 | struct stat st; |
414 | 415 | ||
415 | fd = open(path, O_RDONLY); | 416 | fd = open(path, O_RDONLY); |
416 | if (fd == -1) | 417 | if (fd == -1) |
417 | return errno; | 418 | return errno; |
418 | if (fstat(fd, &st)) { | 419 | if (fstat(fd, &st)) { |
419 | e = errno; | 420 | e = errno; |
420 | close(fd); | 421 | close(fd); |
421 | return e; | 422 | return e; |
422 | } | 423 | } |
423 | if (!S_ISREG(st.st_mode)) { | 424 | if (!S_ISREG(st.st_mode)) { |
424 | close(fd); | 425 | close(fd); |
425 | return EISDIR; | 426 | return EISDIR; |
426 | } | 427 | } |
427 | *buf = xmalloc(st.st_size + 1); | 428 | *buf = xmalloc(st.st_size + 1); |
428 | *size = read_in_full(fd, *buf, st.st_size); | 429 | *size = read_in_full(fd, *buf, st.st_size); |
429 | e = errno; | 430 | e = errno; |
430 | (*buf)[*size] = '\0'; | 431 | (*buf)[*size] = '\0'; |
431 | close(fd); | 432 | close(fd); |
432 | return (*size == st.st_size ? 0 : e); | 433 | return (*size == st.st_size ? 0 : e); |
433 | } | 434 | } |