|
diff --git a/shared.c b/shared.c index 288cfa2..783604b 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -1,160 +1,162 @@ |
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->commit_filter = ctx.cfg.commit_filter; |
| |
66 | ret->source_filter = ctx.cfg.source_filter; |
65 | return ret; |
67 | return ret; |
66 | } |
68 | } |
67 | |
69 | |
68 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
70 | struct cgit_repo *cgit_get_repoinfo(const char *url) |
69 | { |
71 | { |
70 | int i; |
72 | int i; |
71 | struct cgit_repo *repo; |
73 | struct cgit_repo *repo; |
72 | |
74 | |
73 | for (i=0; i<cgit_repolist.count; i++) { |
75 | for (i=0; i<cgit_repolist.count; i++) { |
74 | repo = &cgit_repolist.repos[i]; |
76 | repo = &cgit_repolist.repos[i]; |
75 | if (!strcmp(repo->url, url)) |
77 | if (!strcmp(repo->url, url)) |
76 | return repo; |
78 | return repo; |
77 | } |
79 | } |
78 | return NULL; |
80 | return NULL; |
79 | } |
81 | } |
80 | |
82 | |
81 | void *cgit_free_commitinfo(struct commitinfo *info) |
83 | void *cgit_free_commitinfo(struct commitinfo *info) |
82 | { |
84 | { |
83 | free(info->author); |
85 | free(info->author); |
84 | free(info->author_email); |
86 | free(info->author_email); |
85 | free(info->committer); |
87 | free(info->committer); |
86 | free(info->committer_email); |
88 | free(info->committer_email); |
87 | free(info->subject); |
89 | free(info->subject); |
88 | free(info->msg); |
90 | free(info->msg); |
89 | free(info->msg_encoding); |
91 | free(info->msg_encoding); |
90 | free(info); |
92 | free(info); |
91 | return NULL; |
93 | return NULL; |
92 | } |
94 | } |
93 | |
95 | |
94 | char *trim_end(const char *str, char c) |
96 | char *trim_end(const char *str, char c) |
95 | { |
97 | { |
96 | int len; |
98 | int len; |
97 | char *s, *t; |
99 | char *s, *t; |
98 | |
100 | |
99 | if (str == NULL) |
101 | if (str == NULL) |
100 | return NULL; |
102 | return NULL; |
101 | t = (char *)str; |
103 | t = (char *)str; |
102 | len = strlen(t); |
104 | len = strlen(t); |
103 | while(len > 0 && t[len - 1] == c) |
105 | while(len > 0 && t[len - 1] == c) |
104 | len--; |
106 | len--; |
105 | |
107 | |
106 | if (len == 0) |
108 | if (len == 0) |
107 | return NULL; |
109 | return NULL; |
108 | |
110 | |
109 | c = t[len]; |
111 | c = t[len]; |
110 | t[len] = '\0'; |
112 | t[len] = '\0'; |
111 | s = xstrdup(t); |
113 | s = xstrdup(t); |
112 | t[len] = c; |
114 | t[len] = c; |
113 | return s; |
115 | return s; |
114 | } |
116 | } |
115 | |
117 | |
116 | char *strlpart(char *txt, int maxlen) |
118 | char *strlpart(char *txt, int maxlen) |
117 | { |
119 | { |
118 | char *result; |
120 | char *result; |
119 | |
121 | |
120 | if (!txt) |
122 | if (!txt) |
121 | return txt; |
123 | return txt; |
122 | |
124 | |
123 | if (strlen(txt) <= maxlen) |
125 | if (strlen(txt) <= maxlen) |
124 | return txt; |
126 | return txt; |
125 | result = xmalloc(maxlen + 1); |
127 | result = xmalloc(maxlen + 1); |
126 | memcpy(result, txt, maxlen - 3); |
128 | memcpy(result, txt, maxlen - 3); |
127 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
129 | result[maxlen-1] = result[maxlen-2] = result[maxlen-3] = '.'; |
128 | result[maxlen] = '\0'; |
130 | result[maxlen] = '\0'; |
129 | return result; |
131 | return result; |
130 | } |
132 | } |
131 | |
133 | |
132 | char *strrpart(char *txt, int maxlen) |
134 | char *strrpart(char *txt, int maxlen) |
133 | { |
135 | { |
134 | char *result; |
136 | char *result; |
135 | |
137 | |
136 | if (!txt) |
138 | if (!txt) |
137 | return txt; |
139 | return txt; |
138 | |
140 | |
139 | if (strlen(txt) <= maxlen) |
141 | if (strlen(txt) <= maxlen) |
140 | return txt; |
142 | return txt; |
141 | result = xmalloc(maxlen + 1); |
143 | result = xmalloc(maxlen + 1); |
142 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
144 | memcpy(result + 3, txt + strlen(txt) - maxlen + 4, maxlen - 3); |
143 | result[0] = result[1] = result[2] = '.'; |
145 | result[0] = result[1] = result[2] = '.'; |
144 | return result; |
146 | return result; |
145 | } |
147 | } |
146 | |
148 | |
147 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
149 | void cgit_add_ref(struct reflist *list, struct refinfo *ref) |
148 | { |
150 | { |
149 | size_t size; |
151 | size_t size; |
150 | |
152 | |
151 | if (list->count >= list->alloc) { |
153 | if (list->count >= list->alloc) { |
152 | list->alloc += (list->alloc ? list->alloc : 4); |
154 | list->alloc += (list->alloc ? list->alloc : 4); |
153 | size = list->alloc * sizeof(struct refinfo *); |
155 | size = list->alloc * sizeof(struct refinfo *); |
154 | list->refs = xrealloc(list->refs, size); |
156 | list->refs = xrealloc(list->refs, size); |
155 | } |
157 | } |
156 | list->refs[list->count++] = ref; |
158 | list->refs[list->count++] = ref; |
157 | } |
159 | } |
158 | |
160 | |
159 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
161 | struct refinfo *cgit_mk_refinfo(const char *refname, const unsigned char *sha1) |
160 | { |
162 | { |
|