author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:27:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 11:41:54 (UTC) |
commit | 537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4 (patch) (unidiff) | |
tree | 73b1d25a96dd171c5503fae1fefc6a27a7d58683 /shared.c | |
parent | e1782fff8a78b7f265432603351281ad2988bb40 (diff) | |
download | cgit-537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4.zip cgit-537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4.tar.gz cgit-537c05f138d59c1eb3ac8e2d8b0dca3a38aa5dd4.tar.bz2 |
Add 'about-filter' and 'repo.about-filter' options
These options can be used to execute a filter command on each about-page,
both top-level and for each repository (repo.about-filter can be used
to override the current about-filter).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,192 +1,193 @@ | |||
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->max_stats = ctx.cfg.max_stats; |
62 | ret->module_link = ctx.cfg.module_link; | 62 | ret->module_link = ctx.cfg.module_link; |
63 | ret->readme = NULL; | 63 | ret->readme = NULL; |
64 | ret->mtime = -1; | 64 | ret->mtime = -1; |
65 | ret->about_filter = ctx.cfg.about_filter; | ||
65 | ret->commit_filter = ctx.cfg.commit_filter; | 66 | ret->commit_filter = ctx.cfg.commit_filter; |
66 | ret->source_filter = ctx.cfg.source_filter; | 67 | ret->source_filter = ctx.cfg.source_filter; |
67 | return ret; | 68 | return ret; |
68 | } | 69 | } |
69 | 70 | ||
70 | struct cgit_repo *cgit_get_repoinfo(const char *url) | 71 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
71 | { | 72 | { |
72 | int i; | 73 | int i; |
73 | struct cgit_repo *repo; | 74 | struct cgit_repo *repo; |
74 | 75 | ||
75 | for (i=0; i<cgit_repolist.count; i++) { | 76 | for (i=0; i<cgit_repolist.count; i++) { |
76 | repo = &cgit_repolist.repos[i]; | 77 | repo = &cgit_repolist.repos[i]; |
77 | if (!strcmp(repo->url, url)) | 78 | if (!strcmp(repo->url, url)) |
78 | return repo; | 79 | return repo; |
79 | } | 80 | } |
80 | return NULL; | 81 | return NULL; |
81 | } | 82 | } |
82 | 83 | ||
83 | void *cgit_free_commitinfo(struct commitinfo *info) | 84 | void *cgit_free_commitinfo(struct commitinfo *info) |
84 | { | 85 | { |
85 | free(info->author); | 86 | free(info->author); |
86 | free(info->author_email); | 87 | free(info->author_email); |
87 | free(info->committer); | 88 | free(info->committer); |
88 | free(info->committer_email); | 89 | free(info->committer_email); |
89 | free(info->subject); | 90 | free(info->subject); |
90 | free(info->msg); | 91 | free(info->msg); |
91 | free(info->msg_encoding); | 92 | free(info->msg_encoding); |
92 | free(info); | 93 | free(info); |
93 | return NULL; | 94 | return NULL; |
94 | } | 95 | } |
95 | 96 | ||
96 | char *trim_end(const char *str, char c) | 97 | char *trim_end(const char *str, char c) |
97 | { | 98 | { |
98 | int len; | 99 | int len; |
99 | char *s, *t; | 100 | char *s, *t; |
100 | 101 | ||
101 | if (str == NULL) | 102 | if (str == NULL) |
102 | return NULL; | 103 | return NULL; |
103 | t = (char *)str; | 104 | t = (char *)str; |
104 | len = strlen(t); | 105 | len = strlen(t); |
105 | while(len > 0 && t[len - 1] == c) | 106 | while(len > 0 && t[len - 1] == c) |
106 | len--; | 107 | len--; |
107 | 108 | ||
108 | if (len == 0) | 109 | if (len == 0) |
109 | return NULL; | 110 | return NULL; |
110 | 111 | ||
111 | c = t[len]; | 112 | c = t[len]; |
112 | t[len] = '\0'; | 113 | t[len] = '\0'; |
113 | s = xstrdup(t); | 114 | s = xstrdup(t); |
114 | t[len] = c; | 115 | t[len] = c; |
115 | return s; | 116 | return s; |
116 | } | 117 | } |
117 | 118 | ||
118 | char *strlpart(char *txt, int maxlen) | 119 | char *strlpart(char *txt, int maxlen) |
119 | { | 120 | { |
120 | char *result; | 121 | char *result; |
121 | 122 | ||
122 | if (!txt) | 123 | if (!txt) |
123 | return txt; | 124 | return txt; |
124 | 125 | ||
125 | if (strlen(txt) <= maxlen) | 126 | if (strlen(txt) <= maxlen) |
126 | return txt; | 127 | return txt; |
127 | result = xmalloc(maxlen + 1); | 128 | result = xmalloc(maxlen + 1); |
128 | memcpy(result, txt, maxlen - 3); | 129 | memcpy(result, txt, maxlen - 3); |
129 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; | 130 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
130 | result[maxlen] = '\0'; | 131 | result[maxlen] = '\0'; |
131 | return result; | 132 | return result; |
132 | } | 133 | } |
133 | 134 | ||
134 | char *strrpart(char *txt, int maxlen) | 135 | char *strrpart(char *txt, int maxlen) |
135 | { | 136 | { |
136 | char *result; | 137 | char *result; |
137 | 138 | ||
138 | if (!txt) | 139 | if (!txt) |
139 | return txt; | 140 | return txt; |
140 | 141 | ||
141 | if (strlen(txt) <= maxlen) | 142 | if (strlen(txt) <= maxlen) |
142 | return txt; | 143 | return txt; |
143 | result = xmalloc(maxlen + 1); | 144 | result = xmalloc(maxlen + 1); |
144 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); | 145 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
145 | result[0] = result[1] = result[2] = '.'; | 146 | result[0] = result[1] = result[2] = '.'; |
146 | return result; | 147 | return result; |
147 | } | 148 | } |
148 | 149 | ||
149 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) | 150 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
150 | { | 151 | { |
151 | size_t size; | 152 | size_t size; |
152 | 153 | ||
153 | if (list->count >= list->alloc) { | 154 | if (list->count >= list->alloc) { |
154 | list->alloc += (list->alloc ? list->alloc : 4); | 155 | list->alloc += (list->alloc ? list->alloc : 4); |
155 | size = list->alloc * sizeof(struct refinfo *); | 156 | size = list->alloc * sizeof(struct refinfo *); |
156 | list->refs = xrealloc(list->refs, size); | 157 | list->refs = xrealloc(list->refs, size); |
157 | } | 158 | } |
158 | list->refs[list->count++] = ref; | 159 | list->refs[list->count++] = ref; |
159 | } | 160 | } |
160 | 161 | ||
161 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) | 162 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
162 | { | 163 | { |
163 | struct refinfo *ref; | 164 | struct refinfo *ref; |
164 | 165 | ||
165 | ref = xmalloc(sizeof (struct refinfo)); | 166 | ref = xmalloc(sizeof (struct refinfo)); |
166 | ref->refname = xstrdup(refname); | 167 | ref->refname = xstrdup(refname); |
167 | ref->object = parse_object(sha1); | 168 | ref->object = parse_object(sha1); |
168 | switch (ref->object->type) { | 169 | switch (ref->object->type) { |
169 | case OBJ_TAG: | 170 | case OBJ_TAG: |
170 | ref->tag = cgit_parse_tag((struct tag *)ref->object); | 171 | ref->tag = cgit_parse_tag((struct tag *)ref->object); |
171 | break; | 172 | break; |
172 | case OBJ_COMMIT: | 173 | case OBJ_COMMIT: |
173 | ref->commit = cgit_parse_commit((struct commit *)ref->object); | 174 | ref->commit = cgit_parse_commit((struct commit *)ref->object); |
174 | break; | 175 | break; |
175 | } | 176 | } |
176 | return ref; | 177 | return ref; |
177 | } | 178 | } |
178 | 179 | ||
179 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, | 180 | int cgit_refs_cb(const char *refname, const unsigned char *sha1, int flags, |
180 | void *cb_data) | 181 | void *cb_data) |
181 | { | 182 | { |
182 | struct reflist *list = (struct reflist *)cb_data; | 183 | struct reflist *list = (struct reflist *)cb_data; |
183 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); | 184 | struct refinfo *info = cgit_mk_refinfo(refname, sha1); |
184 | 185 | ||
185 | if (info) | 186 | if (info) |
186 | cgit_add_ref(list, info); | 187 | cgit_add_ref(list, info); |
187 | return 0; | 188 | return 0; |
188 | } | 189 | } |
189 | 190 | ||
190 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 191 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
191 | struct diff_options *options, void *data) | 192 | struct diff_options *options, void *data) |
192 | { | 193 | { |