|
diff --git a/shared.c b/shared.c index 343a4f9..0fe513f 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -103,17 +103,17 @@ struct repoinfo *add_repo(const char *url) |
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; |
@@ -146,17 +146,17 @@ void cgit_global_config_cb(const char *name, const char *value) |
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); |
@@ -184,17 +184,17 @@ void cgit_global_config_cb(const char *name, const char *value) |
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: &? */ |
|