|
diff --git a/shared.c b/shared.c index 343a4f9..0fe513f 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -95,33 +95,33 @@ int chk_non_negative(int result, char *msg) |
95 | |
95 | |
96 | struct repoinfo *add_repo(const char *url) |
96 | struct repoinfo *add_repo(const char *url) |
97 | { |
97 | { |
98 | struct repoinfo *ret; |
98 | struct repoinfo *ret; |
99 | |
99 | |
100 | if (++cgit_repolist.count > cgit_repolist.length) { |
100 | if (++cgit_repolist.count > cgit_repolist.length) { |
101 | if (cgit_repolist.length == 0) |
101 | if (cgit_repolist.length == 0) |
102 | cgit_repolist.length = 8; |
102 | cgit_repolist.length = 8; |
103 | else |
103 | else |
104 | cgit_repolist.length *= 2; |
104 | cgit_repolist.length *= 2; |
105 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
105 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
106 | cgit_repolist.length * |
106 | cgit_repolist.length * |
107 | sizeof(struct repoinfo)); |
107 | sizeof(struct repoinfo)); |
108 | } |
108 | } |
109 | |
109 | |
110 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
110 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
111 | ret->url = xstrdup(url); |
111 | ret->url = trim_end(url, '/'); |
112 | ret->name = ret->url; |
112 | ret->name = ret->url; |
113 | ret->path = NULL; |
113 | ret->path = NULL; |
114 | ret->desc = NULL; |
114 | ret->desc = NULL; |
115 | ret->owner = NULL; |
115 | ret->owner = NULL; |
116 | ret->group = cgit_repo_group; |
116 | ret->group = cgit_repo_group; |
117 | ret->defbranch = "master"; |
117 | ret->defbranch = "master"; |
118 | ret->snapshots = cgit_snapshots; |
118 | ret->snapshots = cgit_snapshots; |
119 | ret->enable_log_filecount = cgit_enable_log_filecount; |
119 | ret->enable_log_filecount = cgit_enable_log_filecount; |
120 | ret->enable_log_linecount = cgit_enable_log_linecount; |
120 | ret->enable_log_linecount = cgit_enable_log_linecount; |
121 | ret->module_link = cgit_module_link; |
121 | ret->module_link = cgit_module_link; |
122 | ret->readme = NULL; |
122 | ret->readme = NULL; |
123 | return ret; |
123 | return ret; |
124 | } |
124 | } |
125 | |
125 | |
126 | struct repoinfo *cgit_get_repoinfo(const char *url) |
126 | struct repoinfo *cgit_get_repoinfo(const char *url) |
127 | { |
127 | { |
@@ -138,33 +138,33 @@ struct repoinfo *cgit_get_repoinfo(const char *url) |
138 | |
138 | |
139 | void cgit_global_config_cb(const char *name, const char *value) |
139 | void cgit_global_config_cb(const char *name, const char *value) |
140 | { |
140 | { |
141 | if (!strcmp(name, "root-title")) |
141 | if (!strcmp(name, "root-title")) |
142 | cgit_root_title = xstrdup(value); |
142 | cgit_root_title = xstrdup(value); |
143 | else if (!strcmp(name, "css")) |
143 | else if (!strcmp(name, "css")) |
144 | cgit_css = xstrdup(value); |
144 | cgit_css = xstrdup(value); |
145 | else if (!strcmp(name, "logo")) |
145 | else if (!strcmp(name, "logo")) |
146 | cgit_logo = xstrdup(value); |
146 | cgit_logo = xstrdup(value); |
147 | else if (!strcmp(name, "index-header")) |
147 | else if (!strcmp(name, "index-header")) |
148 | cgit_index_header = xstrdup(value); |
148 | cgit_index_header = xstrdup(value); |
149 | else if (!strcmp(name, "logo-link")) |
149 | else if (!strcmp(name, "logo-link")) |
150 | cgit_logo_link = xstrdup(value); |
150 | cgit_logo_link = xstrdup(value); |
151 | else if (!strcmp(name, "module-link")) |
151 | else if (!strcmp(name, "module-link")) |
152 | cgit_module_link = xstrdup(value); |
152 | cgit_module_link = xstrdup(value); |
153 | else if (!strcmp(name, "virtual-root")) |
153 | else if (!strcmp(name, "virtual-root")) |
154 | cgit_virtual_root = xstrdup(value); |
154 | cgit_virtual_root = trim_end(value, '/'); |
155 | else if (!strcmp(name, "nocache")) |
155 | else if (!strcmp(name, "nocache")) |
156 | cgit_nocache = atoi(value); |
156 | cgit_nocache = atoi(value); |
157 | else if (!strcmp(name, "snapshots")) |
157 | else if (!strcmp(name, "snapshots")) |
158 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
158 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
159 | else if (!strcmp(name, "enable-index-links")) |
159 | else if (!strcmp(name, "enable-index-links")) |
160 | cgit_enable_index_links = atoi(value); |
160 | cgit_enable_index_links = atoi(value); |
161 | else if (!strcmp(name, "enable-log-filecount")) |
161 | else if (!strcmp(name, "enable-log-filecount")) |
162 | cgit_enable_log_filecount = atoi(value); |
162 | cgit_enable_log_filecount = atoi(value); |
163 | else if (!strcmp(name, "enable-log-linecount")) |
163 | else if (!strcmp(name, "enable-log-linecount")) |
164 | cgit_enable_log_linecount = atoi(value); |
164 | cgit_enable_log_linecount = atoi(value); |
165 | else if (!strcmp(name, "cache-root")) |
165 | else if (!strcmp(name, "cache-root")) |
166 | cgit_cache_root = xstrdup(value); |
166 | cgit_cache_root = xstrdup(value); |
167 | else if (!strcmp(name, "cache-root-ttl")) |
167 | else if (!strcmp(name, "cache-root-ttl")) |
168 | cgit_cache_root_ttl = atoi(value); |
168 | cgit_cache_root_ttl = atoi(value); |
169 | else if (!strcmp(name, "cache-repo-ttl")) |
169 | else if (!strcmp(name, "cache-repo-ttl")) |
170 | cgit_cache_repo_ttl = atoi(value); |
170 | cgit_cache_repo_ttl = atoi(value); |
@@ -176,33 +176,33 @@ void cgit_global_config_cb(const char *name, const char *value) |
176 | cgit_max_msg_len = atoi(value); |
176 | cgit_max_msg_len = atoi(value); |
177 | else if (!strcmp(name, "max-repodesc-length")) |
177 | else if (!strcmp(name, "max-repodesc-length")) |
178 | cgit_max_repodesc_len = atoi(value); |
178 | cgit_max_repodesc_len = atoi(value); |
179 | else if (!strcmp(name, "max-commit-count")) |
179 | else if (!strcmp(name, "max-commit-count")) |
180 | cgit_max_commit_count = atoi(value); |
180 | cgit_max_commit_count = atoi(value); |
181 | else if (!strcmp(name, "summary-log")) |
181 | else if (!strcmp(name, "summary-log")) |
182 | cgit_summary_log = atoi(value); |
182 | cgit_summary_log = atoi(value); |
183 | else if (!strcmp(name, "agefile")) |
183 | else if (!strcmp(name, "agefile")) |
184 | cgit_agefile = xstrdup(value); |
184 | cgit_agefile = xstrdup(value); |
185 | else if (!strcmp(name, "repo.group")) |
185 | else if (!strcmp(name, "repo.group")) |
186 | cgit_repo_group = xstrdup(value); |
186 | cgit_repo_group = xstrdup(value); |
187 | else if (!strcmp(name, "repo.url")) |
187 | else if (!strcmp(name, "repo.url")) |
188 | cgit_repo = add_repo(value); |
188 | cgit_repo = add_repo(value); |
189 | else if (!strcmp(name, "repo.name")) |
189 | else if (!strcmp(name, "repo.name")) |
190 | cgit_repo->name = xstrdup(value); |
190 | cgit_repo->name = xstrdup(value); |
191 | else if (cgit_repo && !strcmp(name, "repo.path")) |
191 | else if (cgit_repo && !strcmp(name, "repo.path")) |
192 | cgit_repo->path = xstrdup(value); |
192 | cgit_repo->path = trim_end(value, '/'); |
193 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
193 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
194 | cgit_repo->desc = xstrdup(value); |
194 | cgit_repo->desc = xstrdup(value); |
195 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
195 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
196 | cgit_repo->owner = xstrdup(value); |
196 | cgit_repo->owner = xstrdup(value); |
197 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
197 | else if (cgit_repo && !strcmp(name, "repo.defbranch")) |
198 | cgit_repo->defbranch = xstrdup(value); |
198 | cgit_repo->defbranch = xstrdup(value); |
199 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
199 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
200 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
200 | cgit_repo->snapshots = cgit_snapshots & cgit_parse_snapshots_mask(value); /* XXX: &? */ |
201 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
201 | else if (cgit_repo && !strcmp(name, "repo.enable-log-filecount")) |
202 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
202 | cgit_repo->enable_log_filecount = cgit_enable_log_filecount * atoi(value); |
203 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
203 | else if (cgit_repo && !strcmp(name, "repo.enable-log-linecount")) |
204 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
204 | cgit_repo->enable_log_linecount = cgit_enable_log_linecount * atoi(value); |
205 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
205 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
206 | cgit_repo->module_link= xstrdup(value); |
206 | cgit_repo->module_link= xstrdup(value); |
207 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { |
207 | else if (cgit_repo && !strcmp(name, "repo.readme") && value != NULL) { |
208 | if (*value == '/') |
208 | if (*value == '/') |
|