|
diff --git a/shared.c b/shared.c index 5f46793..6e8f0ce 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -1,205 +1,204 @@ |
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; |
| |
14 | |
13 | |
15 | int chk_zero(int result, char *msg) |
14 | int chk_zero(int result, char *msg) |
16 | { |
15 | { |
17 | if (result != 0) |
16 | if (result != 0) |
18 | die("%s: %s", msg, strerror(errno)); |
17 | die("%s: %s", msg, strerror(errno)); |
19 | return result; |
18 | return result; |
20 | } |
19 | } |
21 | |
20 | |
22 | int chk_positive(int result, char *msg) |
21 | int chk_positive(int result, char *msg) |
23 | { |
22 | { |
24 | if (result <= 0) |
23 | if (result <= 0) |
25 | die("%s: %s", msg, strerror(errno)); |
24 | die("%s: %s", msg, strerror(errno)); |
26 | return result; |
25 | return result; |
27 | } |
26 | } |
28 | |
27 | |
29 | int chk_non_negative(int result, char *msg) |
28 | int chk_non_negative(int result, char *msg) |
30 | { |
29 | { |
31 | if (result < 0) |
30 | if (result < 0) |
32 | die("%s: %s",msg, strerror(errno)); |
31 | die("%s: %s",msg, strerror(errno)); |
33 | return result; |
32 | return result; |
34 | } |
33 | } |
35 | |
34 | |
36 | struct cgit_repo *cgit_add_repo(const char *url) |
35 | struct cgit_repo *cgit_add_repo(const char *url) |
37 | { |
36 | { |
38 | struct cgit_repo *ret; |
37 | struct cgit_repo *ret; |
39 | |
38 | |
40 | if (++cgit_repolist.count > cgit_repolist.length) { |
39 | if (++cgit_repolist.count > cgit_repolist.length) { |
41 | if (cgit_repolist.length == 0) |
40 | if (cgit_repolist.length == 0) |
42 | cgit_repolist.length = 8; |
41 | cgit_repolist.length = 8; |
43 | else |
42 | else |
44 | cgit_repolist.length *= 2; |
43 | cgit_repolist.length *= 2; |
45 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
44 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
46 | cgit_repolist.length * |
45 | cgit_repolist.length * |
47 | sizeof(struct cgit_repo)); |
46 | sizeof(struct cgit_repo)); |
48 | } |
47 | } |
49 | |
48 | |
50 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
49 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
51 | memset(ret, 0, sizeof(struct cgit_repo)); |
50 | memset(ret, 0, sizeof(struct cgit_repo)); |
52 | ret->url = trim_end(url, '/'); |
51 | ret->url = trim_end(url, '/'); |
53 | ret->name = ret->url; |
52 | ret->name = ret->url; |
54 | ret->path = NULL; |
53 | ret->path = NULL; |
55 | ret->desc = "[no description]"; |
54 | ret->desc = "[no description]"; |
56 | ret->owner = NULL; |
55 | ret->owner = NULL; |
57 | ret->section = ctx.cfg.section; |
56 | ret->section = ctx.cfg.section; |
58 | ret->defbranch = "master"; |
57 | ret->defbranch = "master"; |
59 | ret->snapshots = ctx.cfg.snapshots; |
58 | ret->snapshots = ctx.cfg.snapshots; |
60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
63 | ret->max_stats = ctx.cfg.max_stats; |
62 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->module_link = ctx.cfg.module_link; |
63 | ret->module_link = ctx.cfg.module_link; |
65 | ret->readme = NULL; |
64 | ret->readme = NULL; |
66 | ret->mtime = -1; |
65 | ret->mtime = -1; |
67 | ret->about_filter = ctx.cfg.about_filter; |
66 | ret->about_filter = ctx.cfg.about_filter; |
68 | ret->commit_filter = ctx.cfg.commit_filter; |
67 | ret->commit_filter = ctx.cfg.commit_filter; |
69 | ret->source_filter = ctx.cfg.source_filter; |
68 | ret->source_filter = ctx.cfg.source_filter; |
70 | return ret; |
69 | return ret; |
71 | } |
70 | } |
72 | |
71 | |
73 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
72 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
74 | { |
73 | { |
75 | int i; |
74 | int i; |
76 | struct cgit_repo *repo; |
75 | struct cgit_repo *repo; |
77 | |
76 | |
78 | for (i=0; i<cgit_repolist.count; i++) { |
77 | for (i=0; i<cgit_repolist.count; i++) { |
79 | repo = &cgit_repolist.repos[i]; |
78 | repo = &cgit_repolist.repos[i]; |
80 | if (!strcmp(repo->url, url)) |
79 | if (!strcmp(repo->url, url)) |
81 | return repo; |
80 | return repo; |
82 | } |
81 | } |
83 | return NULL; |
82 | return NULL; |
84 | } |
83 | } |
85 | |
84 | |
86 | void *cgit_free_commitinfo(struct commitinfo *info) |
85 | void *cgit_free_commitinfo(struct commitinfo *info) |
87 | { |
86 | { |
88 | free(info->author); |
87 | free(info->author); |
89 | free(info->author_email); |
88 | free(info->author_email); |
90 | free(info->committer); |
89 | free(info->committer); |
91 | free(info->committer_email); |
90 | free(info->committer_email); |
92 | free(info->subject); |
91 | free(info->subject); |
93 | free(info->msg); |
92 | free(info->msg); |
94 | free(info->msg_encoding); |
93 | free(info->msg_encoding); |
95 | free(info); |
94 | free(info); |
96 | return NULL; |
95 | return NULL; |
97 | } |
96 | } |
98 | |
97 | |
99 | char *trim_end(const char *str, char c) |
98 | char *trim_end(const char *str, char c) |
100 | { |
99 | { |
101 | int len; |
100 | int len; |
102 | char *s, *t; |
101 | char *s, *t; |
103 | |
102 | |
104 | if (str == NULL) |
103 | if (str == NULL) |
105 | return NULL; |
104 | return NULL; |
106 | t = (char *)str; |
105 | t = (char *)str; |
107 | len = strlen(t); |
106 | len = strlen(t); |
108 | while(len > 0 && t[len - 1] == c) |
107 | while(len > 0 && t[len - 1] == c) |
109 | len--; |
108 | len--; |
110 | |
109 | |
111 | if (len == 0) |
110 | if (len == 0) |
112 | return NULL; |
111 | return NULL; |
113 | |
112 | |
114 | c = t[len]; |
113 | c = t[len]; |
115 | t[len] = '\0'; |
114 | t[len] = '\0'; |
116 | s = xstrdup(t); |
115 | s = xstrdup(t); |
117 | t[len] = c; |
116 | t[len] = c; |
118 | return s; |
117 | return s; |
119 | } |
118 | } |
120 | |
119 | |
121 | char *strlpart(char *txt, int maxlen) |
120 | char *strlpart(char *txt, int maxlen) |
122 | { |
121 | { |
123 | char *result; |
122 | char *result; |
124 | |
123 | |
125 | if (!txt) |
124 | if (!txt) |
126 | return txt; |
125 | return txt; |
127 | |
126 | |
128 | if (strlen(txt) <= maxlen) |
127 | if (strlen(txt) <= maxlen) |
129 | return txt; |
128 | return txt; |
130 | result = xmalloc(maxlen + 1); |
129 | result = xmalloc(maxlen + 1); |
131 | memcpy(result, txt, maxlen - 3); |
130 | memcpy(result, txt, maxlen - 3); |
132 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
131 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
133 | result[maxlen] = '\0'; |
132 | result[maxlen] = '\0'; |
134 | return result; |
133 | return result; |
135 | } |
134 | } |
136 | |
135 | |
137 | char *strrpart(char *txt, int maxlen) |
136 | char *strrpart(char *txt, int maxlen) |
138 | { |
137 | { |
139 | char *result; |
138 | char *result; |
140 | |
139 | |
141 | if (!txt) |
140 | if (!txt) |
142 | return txt; |
141 | return txt; |
143 | |
142 | |
144 | if (strlen(txt) <= maxlen) |
143 | if (strlen(txt) <= maxlen) |
145 | return txt; |
144 | return txt; |
146 | result = xmalloc(maxlen + 1); |
145 | result = xmalloc(maxlen + 1); |
147 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
146 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
148 | result[0] = result[1] = result[2] = '.'; |
147 | result[0] = result[1] = result[2] = '.'; |
149 | return result; |
148 | return result; |
150 | } |
149 | } |
151 | |
150 | |
152 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
151 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
153 | { |
152 | { |
154 | size_t size; |
153 | size_t size; |
155 | |
154 | |
156 | if (list->count >= list->alloc) { |
155 | if (list->count >= list->alloc) { |
157 | list->alloc += (list->alloc ? list->alloc : 4); |
156 | list->alloc += (list->alloc ? list->alloc : 4); |
158 | size = list->alloc * sizeof(struct refinfo *); |
157 | size = list->alloc * sizeof(struct refinfo *); |
159 | list->refs = xrealloc(list->refs, size); |
158 | list->refs = xrealloc(list->refs, size); |
160 | } |
159 | } |
161 | list->refs[list->count++] = ref; |
160 | list->refs[list->count++] = ref; |
162 | } |
161 | } |
163 | |
162 | |
164 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
163 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
165 | { |
164 | { |
166 | struct refinfo *ref; |
165 | struct refinfo *ref; |
167 | |
166 | |
168 | ref = xmalloc(sizeof (struct refinfo)); |
167 | ref = xmalloc(sizeof (struct refinfo)); |
169 | ref->refname = xstrdup(refname); |
168 | ref->refname = xstrdup(refname); |
170 | ref->object = parse_object(sha1); |
169 | ref->object = parse_object(sha1); |
171 | switch (ref->object->type) { |
170 | switch (ref->object->type) { |
172 | case OBJ_TAG: |
171 | case OBJ_TAG: |
173 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
172 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
174 | break; |
173 | break; |
175 | case OBJ_COMMIT: |
174 | case OBJ_COMMIT: |
176 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
175 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
177 | break; |
176 | break; |
178 | } |
177 | } |
179 | return ref; |
178 | return ref; |
180 | } |
179 | } |
181 | |
180 | |
182 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
181 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
183 | void *cb_data) |
182 | void *cb_data) |
184 | { |
183 | { |
185 | struct reflist *list = (struct reflist *)cb_data; |
184 | struct reflist *list = (struct reflist *)cb_data; |
186 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
185 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
187 | |
186 | |
188 | if (info) |
187 | if (info) |
189 | cgit_add_ref(list, info); |
188 | cgit_add_ref(list, info); |
190 | return 0; |
189 | return 0; |
191 | } |
190 | } |
192 | |
191 | |
193 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
192 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
194 | struct diff_options *options, void *data) |
193 | struct diff_options *options, void *data) |
195 | { |
194 | { |
196 | int i; |
195 | int i; |
197 | |
196 | |
198 | for (i = 0; i < q->nr; i++) { |
197 | for (i = 0; i < q->nr; i++) { |
199 | if (q->queue[i]->status == 'U') |
198 | if (q->queue[i]->status == 'U') |
200 | continue; |
199 | continue; |
201 | ((filepair_fn)data)(q->queue[i]); |
200 | ((filepair_fn)data)(q->queue[i]); |
202 | } |
201 | } |
203 | } |
202 | } |
204 | |
203 | |
205 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
204 | static int load_mmfile(mmfile_t *file, const unsigned char *sha1) |
|