author | Lars Hjemli <hjemli@gmail.com> | 2007-09-19 22:56:53 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-09-19 22:56:53 (UTC) |
commit | 4e40d8507ea9a3b5082ae690190e9d41c5b49ae2 (patch) (unidiff) | |
tree | 119531367d7a5359ff62d1f050d9858d48b90179 | |
parent | 0835ffefb8a1f5387463b22e2e5f7e34d387d7b1 (diff) | |
download | cgit-4e40d8507ea9a3b5082ae690190e9d41c5b49ae2.zip cgit-4e40d8507ea9a3b5082ae690190e9d41c5b49ae2.tar.gz cgit-4e40d8507ea9a3b5082ae690190e9d41c5b49ae2.tar.bz2 |
Use trim_end() to remove trailing slashes
All urls and paths read from cgitrc needs to be 'normalized', i.e. get any
trailing slashes removed, and the trim_end() function works out nice for
this purpose.
Removing the trailing slashes also happens to fix the case where the virtual
root should be a single slash; that case used to require specifying the full
hostname (including the http:// prefix), but now it can simply be specified
as /.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -63,178 +63,178 @@ int htmlfd = 0; | |||
63 | int cgit_get_cmd_index(const char *cmd) | 63 | int cgit_get_cmd_index(const char *cmd) |
64 | { | 64 | { |
65 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", | 65 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
66 | "snapshot", "tag", NULL}; | 66 | "snapshot", "tag", NULL}; |
67 | int i; | 67 | int i; |
68 | 68 | ||
69 | for(i = 0; cmds[i]; i++) | 69 | for(i = 0; cmds[i]; i++) |
70 | if (!strcmp(cmd, cmds[i])) | 70 | if (!strcmp(cmd, cmds[i])) |
71 | return i + 1; | 71 | return i + 1; |
72 | return 0; | 72 | return 0; |
73 | } | 73 | } |
74 | 74 | ||
75 | int chk_zero(int result, char *msg) | 75 | int chk_zero(int result, char *msg) |
76 | { | 76 | { |
77 | if (result != 0) | 77 | if (result != 0) |
78 | die("%s: %s", msg, strerror(errno)); | 78 | die("%s: %s", msg, strerror(errno)); |
79 | return result; | 79 | return result; |
80 | } | 80 | } |
81 | 81 | ||
82 | int chk_positive(int result, char *msg) | 82 | int chk_positive(int result, char *msg) |
83 | { | 83 | { |
84 | if (result <= 0) | 84 | if (result <= 0) |
85 | die("%s: %s", msg, strerror(errno)); | 85 | die("%s: %s", msg, strerror(errno)); |
86 | return result; | 86 | return result; |
87 | } | 87 | } |
88 | 88 | ||
89 | int chk_non_negative(int result, char *msg) | 89 | int chk_non_negative(int result, char *msg) |
90 | { | 90 | { |
91 | if (result < 0) | 91 | if (result < 0) |
92 | die("%s: %s",msg, strerror(errno)); | 92 | die("%s: %s",msg, strerror(errno)); |
93 | return result; | 93 | return result; |
94 | } | 94 | } |
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 | { |
128 | int i; | 128 | int i; |
129 | struct repoinfo *repo; | 129 | struct repoinfo *repo; |
130 | 130 | ||
131 | for (i=0; i<cgit_repolist.count; i++) { | 131 | for (i=0; i<cgit_repolist.count; i++) { |
132 | repo = &cgit_repolist.repos[i]; | 132 | repo = &cgit_repolist.repos[i]; |
133 | if (!strcmp(repo->url, url)) | 133 | if (!strcmp(repo->url, url)) |
134 | return repo; | 134 | return repo; |
135 | } | 135 | } |
136 | return NULL; | 136 | return NULL; |
137 | } | 137 | } |
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); |
171 | else if (!strcmp(name, "cache-static-ttl")) | 171 | else if (!strcmp(name, "cache-static-ttl")) |
172 | cgit_cache_static_ttl = atoi(value); | 172 | cgit_cache_static_ttl = atoi(value); |
173 | else if (!strcmp(name, "cache-dynamic-ttl")) | 173 | else if (!strcmp(name, "cache-dynamic-ttl")) |
174 | cgit_cache_dynamic_ttl = atoi(value); | 174 | cgit_cache_dynamic_ttl = atoi(value); |
175 | else if (!strcmp(name, "max-message-length")) | 175 | else if (!strcmp(name, "max-message-length")) |
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 == '/') |
209 | cgit_repo->readme = xstrdup(value); | 209 | cgit_repo->readme = xstrdup(value); |
210 | else | 210 | else |
211 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); | 211 | cgit_repo->readme = xstrdup(fmt("%s/%s", cgit_repo->path, value)); |
212 | } else if (!strcmp(name, "include")) | 212 | } else if (!strcmp(name, "include")) |
213 | cgit_read_config(value, cgit_global_config_cb); | 213 | cgit_read_config(value, cgit_global_config_cb); |
214 | } | 214 | } |
215 | 215 | ||
216 | void cgit_querystring_cb(const char *name, const char *value) | 216 | void cgit_querystring_cb(const char *name, const char *value) |
217 | { | 217 | { |
218 | if (!strcmp(name,"r")) { | 218 | if (!strcmp(name,"r")) { |
219 | cgit_query_repo = xstrdup(value); | 219 | cgit_query_repo = xstrdup(value); |
220 | cgit_repo = cgit_get_repoinfo(value); | 220 | cgit_repo = cgit_get_repoinfo(value); |
221 | } else if (!strcmp(name, "p")) { | 221 | } else if (!strcmp(name, "p")) { |
222 | cgit_query_page = xstrdup(value); | 222 | cgit_query_page = xstrdup(value); |
223 | cgit_cmd = cgit_get_cmd_index(value); | 223 | cgit_cmd = cgit_get_cmd_index(value); |
224 | } else if (!strcmp(name, "url")) { | 224 | } else if (!strcmp(name, "url")) { |
225 | cgit_parse_url(value); | 225 | cgit_parse_url(value); |
226 | } else if (!strcmp(name, "q")) { | 226 | } else if (!strcmp(name, "q")) { |
227 | cgit_query_search = xstrdup(value); | 227 | cgit_query_search = xstrdup(value); |
228 | } else if (!strcmp(name, "h")) { | 228 | } else if (!strcmp(name, "h")) { |
229 | cgit_query_head = xstrdup(value); | 229 | cgit_query_head = xstrdup(value); |
230 | cgit_query_has_symref = 1; | 230 | cgit_query_has_symref = 1; |
231 | } else if (!strcmp(name, "id")) { | 231 | } else if (!strcmp(name, "id")) { |
232 | cgit_query_sha1 = xstrdup(value); | 232 | cgit_query_sha1 = xstrdup(value); |
233 | cgit_query_has_sha1 = 1; | 233 | cgit_query_has_sha1 = 1; |
234 | } else if (!strcmp(name, "id2")) { | 234 | } else if (!strcmp(name, "id2")) { |
235 | cgit_query_sha2 = xstrdup(value); | 235 | cgit_query_sha2 = xstrdup(value); |
236 | cgit_query_has_sha1 = 1; | 236 | cgit_query_has_sha1 = 1; |
237 | } else if (!strcmp(name, "ofs")) { | 237 | } else if (!strcmp(name, "ofs")) { |
238 | cgit_query_ofs = atoi(value); | 238 | cgit_query_ofs = atoi(value); |
239 | } else if (!strcmp(name, "path")) { | 239 | } else if (!strcmp(name, "path")) { |
240 | cgit_query_path = trim_end(value, '/'); | 240 | cgit_query_path = trim_end(value, '/'); |