|
diff --git a/shared.c b/shared.c index a764c4d..578a544 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -1,347 +1,348 @@ |
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->max_stats = ctx.cfg.max_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 | ret->mtime = -1; |
64 | ret->mtime = -1; |
64 | return ret; |
65 | return ret; |
65 | } |
66 | } |
66 | |
67 | |
67 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
68 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
68 | { |
69 | { |
69 | int i; |
70 | int i; |
70 | struct cgit_repo *repo; |
71 | struct cgit_repo *repo; |
71 | |
72 | |
72 | for (i=0; i<cgit_repolist.count; i++) { |
73 | for (i=0; i<cgit_repolist.count; i++) { |
73 | repo = &cgit_repolist.repos[i]; |
74 | repo = &cgit_repolist.repos[i]; |
74 | if (!strcmp(repo->url, url)) |
75 | if (!strcmp(repo->url, url)) |
75 | return repo; |
76 | return repo; |
76 | } |
77 | } |
77 | return NULL; |
78 | return NULL; |
78 | } |
79 | } |
79 | |
80 | |
80 | void *cgit_free_commitinfo(struct commitinfo *info) |
81 | void *cgit_free_commitinfo(struct commitinfo *info) |
81 | { |
82 | { |
82 | free(info->author); |
83 | free(info->author); |
83 | free(info->author_email); |
84 | free(info->author_email); |
84 | free(info->committer); |
85 | free(info->committer); |
85 | free(info->committer_email); |
86 | free(info->committer_email); |
86 | free(info->subject); |
87 | free(info->subject); |
87 | free(info->msg); |
88 | free(info->msg); |
88 | free(info->msg_encoding); |
89 | free(info->msg_encoding); |
89 | free(info); |
90 | free(info); |
90 | return NULL; |
91 | return NULL; |
91 | } |
92 | } |
92 | |
93 | |
93 | char *trim_end(const char *str, char c) |
94 | char *trim_end(const char *str, char c) |
94 | { |
95 | { |
95 | int len; |
96 | int len; |
96 | char *s, *t; |
97 | char *s, *t; |
97 | |
98 | |
98 | if (str == NULL) |
99 | if (str == NULL) |
99 | return NULL; |
100 | return NULL; |
100 | t = (char *)str; |
101 | t = (char *)str; |
101 | len = strlen(t); |
102 | len = strlen(t); |
102 | while(len > 0 && t[len - 1] == c) |
103 | while(len > 0 && t[len - 1] == c) |
103 | len--; |
104 | len--; |
104 | |
105 | |
105 | if (len == 0) |
106 | if (len == 0) |
106 | return NULL; |
107 | return NULL; |
107 | |
108 | |
108 | c = t[len]; |
109 | c = t[len]; |
109 | t[len] = '\0'; |
110 | t[len] = '\0'; |
110 | s = xstrdup(t); |
111 | s = xstrdup(t); |
111 | t[len] = c; |
112 | t[len] = c; |
112 | return s; |
113 | return s; |
113 | } |
114 | } |
114 | |
115 | |
115 | char *strlpart(char *txt, int maxlen) |
116 | char *strlpart(char *txt, int maxlen) |
116 | { |
117 | { |
117 | char *result; |
118 | char *result; |
118 | |
119 | |
119 | if (!txt) |
120 | if (!txt) |
120 | return txt; |
121 | return txt; |
121 | |
122 | |
122 | if (strlen(txt) <= maxlen) |
123 | if (strlen(txt) <= maxlen) |
123 | return txt; |
124 | return txt; |
124 | result = xmalloc(maxlen + 1); |
125 | result = xmalloc(maxlen + 1); |
125 | memcpy(result, txt, maxlen - 3); |
126 | memcpy(result, txt, maxlen - 3); |
126 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
127 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
127 | result[maxlen] = '\0'; |
128 | result[maxlen] = '\0'; |
128 | return result; |
129 | return result; |
129 | } |
130 | } |
130 | |
131 | |
131 | char *strrpart(char *txt, int maxlen) |
132 | char *strrpart(char *txt, int maxlen) |
132 | { |
133 | { |
133 | char *result; |
134 | char *result; |
134 | |
135 | |
135 | if (!txt) |
136 | if (!txt) |
136 | return txt; |
137 | return txt; |
137 | |
138 | |
138 | if (strlen(txt) <= maxlen) |
139 | if (strlen(txt) <= maxlen) |
139 | return txt; |
140 | return txt; |
140 | result = xmalloc(maxlen + 1); |
141 | result = xmalloc(maxlen + 1); |
141 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
142 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
142 | result[0] = result[1] = result[2] = '.'; |
143 | result[0] = result[1] = result[2] = '.'; |
143 | return result; |
144 | return result; |
144 | } |
145 | } |
145 | |
146 | |
146 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
147 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
147 | { |
148 | { |
148 | size_t size; |
149 | size_t size; |
149 | |
150 | |
150 | if (list->count >= list->alloc) { |
151 | if (list->count >= list->alloc) { |
151 | list->alloc += (list->alloc ? list->alloc : 4); |
152 | list->alloc += (list->alloc ? list->alloc : 4); |
152 | size = list->alloc * sizeof(struct refinfo *); |
153 | size = list->alloc * sizeof(struct refinfo *); |
153 | list->refs = xrealloc(list->refs, size); |
154 | list->refs = xrealloc(list->refs, size); |
154 | } |
155 | } |
155 | list->refs[list->count++] = ref; |
156 | list->refs[list->count++] = ref; |
156 | } |
157 | } |
157 | |
158 | |
158 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
159 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
159 | { |
160 | { |
160 | struct refinfo *ref; |
161 | struct refinfo *ref; |
161 | |
162 | |
162 | ref = xmalloc(sizeof (struct refinfo)); |
163 | ref = xmalloc(sizeof (struct refinfo)); |
163 | ref->refname = xstrdup(refname); |
164 | ref->refname = xstrdup(refname); |
164 | ref->object = parse_object(sha1); |
165 | ref->object = parse_object(sha1); |
165 | switch (ref->object->type) { |
166 | switch (ref->object->type) { |
166 | case OBJ_TAG: |
167 | case OBJ_TAG: |
167 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
168 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
168 | break; |
169 | break; |
169 | case OBJ_COMMIT: |
170 | case OBJ_COMMIT: |
170 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
171 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
171 | break; |
172 | break; |
172 | } |
173 | } |
173 | return ref; |
174 | return ref; |
174 | } |
175 | } |
175 | |
176 | |
176 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
177 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
177 | void *cb_data) |
178 | void *cb_data) |
178 | { |
179 | { |
179 | struct reflist *list = (struct reflist *)cb_data; |
180 | struct reflist *list = (struct reflist *)cb_data; |
180 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
181 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
181 | |
182 | |
182 | if (info) |
183 | if (info) |
183 | cgit_add_ref(list, info); |
184 | cgit_add_ref(list, info); |
184 | return 0; |
185 | return 0; |
185 | } |
186 | } |
186 | |
187 | |
187 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
188 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
188 | struct diff_options *options, void *data) |
189 | struct diff_options *options, void *data) |
189 | { |
190 | { |
190 | int i; |
191 | int i; |
191 | |
192 | |
192 | for (i = 0; i < q->nr; i++) { |
193 | for (i = 0; i < q->nr; i++) { |
193 | if (q->queue[i]->status == 'U') |
194 | if (q->queue[i]->status == 'U') |
194 | continue; |
195 | continue; |
195 | ((filepair_fn)data)(q->queue[i]); |
196 | ((filepair_fn)data)(q->queue[i]); |
196 | } |
197 | } |
197 | } |
198 | } |
198 | |
199 | |
199 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
200 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
200 | { |
201 | { |
201 | enum object_type type; |
202 | enum object_type type; |
202 | |
203 | |
203 | if (is_null_sha1(sha1)) { |
204 | if (is_null_sha1(sha1)) { |
204 | file->ptr = (char *)""; |
205 | file->ptr = (char *)""; |
205 | file->size = 0; |
206 | file->size = 0; |
206 | } else { |
207 | } else { |
207 | file->ptr = read_sha1_file(sha1, &type, |
208 | file->ptr = read_sha1_file(sha1, &type, |
208 | (unsigned long *)&file->size); |
209 | (unsigned long *)&file->size); |
209 | } |
210 | } |
210 | return 1; |
211 | return 1; |
211 | } |
212 | } |
212 | |
213 | |
213 | /* |
214 | /* |
214 | * Receive diff-buffers from xdiff and concatenate them as |
215 | * Receive diff-buffers from xdiff and concatenate them as |
215 | * needed across multiple callbacks. |
216 | * needed across multiple callbacks. |
216 | * |
217 | * |
217 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
218 | * This is basically a copy of xdiff-interface.c/xdiff_outf(), |
218 | * ripped from git and modified to use globals instead of |
219 | * ripped from git and modified to use globals instead of |
219 | * a special callback-struct. |
220 | * a special callback-struct. |
220 | */ |
221 | */ |
221 | char *diffbuf = NULL; |
222 | char *diffbuf = NULL; |
222 | int buflen = 0; |
223 | int buflen = 0; |
223 | |
224 | |
224 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
225 | int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) |
225 | { |
226 | { |
226 | int i; |
227 | int i; |
227 | |
228 | |
228 | for (i = 0; i < nbuf; i++) { |
229 | for (i = 0; i < nbuf; i++) { |
229 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
230 | if (mb[i].ptr[mb[i].size-1] != '\n') { |
230 | /* Incomplete line */ |
231 | /* Incomplete line */ |
231 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
232 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
232 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
233 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
233 | buflen += mb[i].size; |
234 | buflen += mb[i].size; |
234 | continue; |
235 | continue; |
235 | } |
236 | } |
236 | |
237 | |
237 | /* we have a complete line */ |
238 | /* we have a complete line */ |
238 | if (!diffbuf) { |
239 | if (!diffbuf) { |
239 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
240 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
240 | continue; |
241 | continue; |
241 | } |
242 | } |
242 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
243 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
243 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
244 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
244 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
245 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
245 | free(diffbuf); |
246 | free(diffbuf); |
246 | diffbuf = NULL; |
247 | diffbuf = NULL; |
247 | buflen = 0; |
248 | buflen = 0; |
248 | } |
249 | } |
249 | if (diffbuf) { |
250 | if (diffbuf) { |
250 | ((linediff_fn)priv)(diffbuf, buflen); |
251 | ((linediff_fn)priv)(diffbuf, buflen); |
251 | free(diffbuf); |
252 | free(diffbuf); |
252 | diffbuf = NULL; |
253 | diffbuf = NULL; |
253 | buflen = 0; |
254 | buflen = 0; |
254 | } |
255 | } |
255 | return 0; |
256 | return 0; |
256 | } |
257 | } |
257 | |
258 | |
258 | int cgit_diff_files(const unsigned char *old_sha1, |
259 | int cgit_diff_files(const unsigned char *old_sha1, |
259 | const unsigned char *new_sha1, |
260 | const unsigned char *new_sha1, |
260 | linediff_fn fn) |
261 | linediff_fn fn) |
261 | { |
262 | { |
262 | mmfile_t file1, file2; |
263 | mmfile_t file1, file2; |
263 | xpparam_t diff_params; |
264 | xpparam_t diff_params; |
264 | xdemitconf_t emit_params; |
265 | xdemitconf_t emit_params; |
265 | xdemitcb_t emit_cb; |
266 | xdemitcb_t emit_cb; |
266 | |
267 | |
267 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
268 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
268 | return 1; |
269 | return 1; |
269 | |
270 | |
270 | memset(&diff_params, 0, sizeof(diff_params)); |
271 | memset(&diff_params, 0, sizeof(diff_params)); |
271 | memset(&emit_params, 0, sizeof(emit_params)); |
272 | memset(&emit_params, 0, sizeof(emit_params)); |
272 | memset(&emit_cb, 0, sizeof(emit_cb)); |
273 | memset(&emit_cb, 0, sizeof(emit_cb)); |
273 | diff_params.flags = XDF_NEED_MINIMAL; |
274 | diff_params.flags = XDF_NEED_MINIMAL; |
274 | emit_params.ctxlen = 3; |
275 | emit_params.ctxlen = 3; |
275 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
276 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
276 | emit_cb.outf = filediff_cb; |
277 | emit_cb.outf = filediff_cb; |
277 | emit_cb.priv = fn; |
278 | emit_cb.priv = fn; |
278 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
279 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
279 | return 0; |
280 | return 0; |
280 | } |
281 | } |
281 | |
282 | |
282 | void cgit_diff_tree(const unsigned char *old_sha1, |
283 | void cgit_diff_tree(const unsigned char *old_sha1, |
283 | const unsigned char *new_sha1, |
284 | const unsigned char *new_sha1, |
284 | filepair_fn fn, const char *prefix) |
285 | filepair_fn fn, const char *prefix) |
285 | { |
286 | { |
286 | struct diff_options opt; |
287 | struct diff_options opt; |
287 | int ret; |
288 | int ret; |
288 | int prefixlen; |
289 | int prefixlen; |
289 | |
290 | |
290 | diff_setup(&opt); |
291 | diff_setup(&opt); |
291 | opt.output_format = DIFF_FORMAT_CALLBACK; |
292 | opt.output_format = DIFF_FORMAT_CALLBACK; |
292 | opt.detect_rename = 1; |
293 | opt.detect_rename = 1; |
293 | opt.rename_limit = ctx.cfg.renamelimit; |
294 | opt.rename_limit = ctx.cfg.renamelimit; |
294 | DIFF_OPT_SET(&opt, RECURSIVE); |
295 | DIFF_OPT_SET(&opt, RECURSIVE); |
295 | opt.format_callback = cgit_diff_tree_cb; |
296 | opt.format_callback = cgit_diff_tree_cb; |
296 | opt.format_callback_data = fn; |
297 | opt.format_callback_data = fn; |
297 | if (prefix) { |
298 | if (prefix) { |
298 | opt.nr_paths = 1; |
299 | opt.nr_paths = 1; |
299 | opt.paths = &prefix; |
300 | opt.paths = &prefix; |
300 | prefixlen = strlen(prefix); |
301 | prefixlen = strlen(prefix); |
301 | opt.pathlens = &prefixlen; |
302 | opt.pathlens = &prefixlen; |
302 | } |
303 | } |
303 | diff_setup_done(&opt); |
304 | diff_setup_done(&opt); |
304 | |
305 | |
305 | if (old_sha1 && !is_null_sha1(old_sha1)) |
306 | if (old_sha1 && !is_null_sha1(old_sha1)) |
306 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
307 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
307 | else |
308 | else |
308 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
309 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
309 | diffcore_std(&opt); |
310 | diffcore_std(&opt); |
310 | diff_flush(&opt); |
311 | diff_flush(&opt); |
311 | } |
312 | } |
312 | |
313 | |
313 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
314 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
314 | { |
315 | { |
315 | unsigned char *old_sha1 = NULL; |
316 | unsigned char *old_sha1 = NULL; |
316 | |
317 | |
317 | if (commit->parents) |
318 | if (commit->parents) |
318 | old_sha1 = commit->parents->item->object.sha1; |
319 | old_sha1 = commit->parents->item->object.sha1; |
319 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
320 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
320 | } |
321 | } |
321 | |
322 | |
322 | int cgit_parse_snapshots_mask(const char *str) |
323 | int cgit_parse_snapshots_mask(const char *str) |
323 | { |
324 | { |
324 | const struct cgit_snapshot_format *f; |
325 | const struct cgit_snapshot_format *f; |
325 | static const char *delim = " \t,:/|;"; |
326 | static const char *delim = " \t,:/|;"; |
326 | int tl, sl, rv = 0; |
327 | int tl, sl, rv = 0; |
327 | |
328 | |
328 | /* favor legacy setting */ |
329 | /* favor legacy setting */ |
329 | if(atoi(str)) |
330 | if(atoi(str)) |
330 | return 1; |
331 | return 1; |
331 | for(;;) { |
332 | for(;;) { |
332 | str += strspn(str,delim); |
333 | str += strspn(str,delim); |
333 | tl = strcspn(str,delim); |
334 | tl = strcspn(str,delim); |
334 | if (!tl) |
335 | if (!tl) |
335 | break; |
336 | break; |
336 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
337 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
337 | sl = strlen(f->suffix); |
338 | sl = strlen(f->suffix); |
338 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
339 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
339 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
340 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
340 | rv |= f->bit; |
341 | rv |= f->bit; |
341 | break; |
342 | break; |
342 | } |
343 | } |
343 | } |
344 | } |
344 | str += tl; |
345 | str += tl; |
345 | } |
346 | } |
346 | return rv; |
347 | return rv; |
347 | } |
348 | } |
|