author | Lars Hjemli <hjemli@gmail.com> | 2007-06-26 16:04:31 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-26 16:04:39 (UTC) |
commit | 382805ee83b6e6f165159312a9fe20e3971897b6 (patch) (unidiff) | |
tree | 8bcf24b888ba95c91a575640be9ae87e949a99ea /shared.c | |
parent | 42e459bb1f209df8278f4f4f0ee3f4bcfae80da8 (diff) | |
download | cgit-382805ee83b6e6f165159312a9fe20e3971897b6.zip cgit-382805ee83b6e6f165159312a9fe20e3971897b6.tar.gz cgit-382805ee83b6e6f165159312a9fe20e3971897b6.tar.bz2 |
Add trim_end() and use it to remove trailing slashes from repo paths
The new function removes all trailing instances of an arbitrary character
from a copy of the supplied char array. This is then used to remove any
trailing slashes from cgit_query_path.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | shared.c | 24 |
1 files changed, 23 insertions, 1 deletions
@@ -223,17 +223,17 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
223 | cgit_query_sha1 = xstrdup(value); | 223 | cgit_query_sha1 = xstrdup(value); |
224 | cgit_query_has_sha1 = 1; | 224 | cgit_query_has_sha1 = 1; |
225 | } else if (!strcmp(name, "id2")) { | 225 | } else if (!strcmp(name, "id2")) { |
226 | cgit_query_sha2 = xstrdup(value); | 226 | cgit_query_sha2 = xstrdup(value); |
227 | cgit_query_has_sha1 = 1; | 227 | cgit_query_has_sha1 = 1; |
228 | } else if (!strcmp(name, "ofs")) { | 228 | } else if (!strcmp(name, "ofs")) { |
229 | cgit_query_ofs = atoi(value); | 229 | cgit_query_ofs = atoi(value); |
230 | } else if (!strcmp(name, "path")) { | 230 | } else if (!strcmp(name, "path")) { |
231 | cgit_query_path = xstrdup(value); | 231 | cgit_query_path = trim_end(value, '/'); |
232 | } else if (!strcmp(name, "name")) { | 232 | } else if (!strcmp(name, "name")) { |
233 | cgit_query_name = xstrdup(value); | 233 | cgit_query_name = xstrdup(value); |
234 | } | 234 | } |
235 | } | 235 | } |
236 | 236 | ||
237 | void *cgit_free_commitinfo(struct commitinfo *info) | 237 | void *cgit_free_commitinfo(struct commitinfo *info) |
238 | { | 238 | { |
239 | free(info->author); | 239 | free(info->author); |
@@ -252,16 +252,38 @@ int hextoint(char c) | |||
252 | else if (c >= 'A' && c <= 'F') | 252 | else if (c >= 'A' && c <= 'F') |
253 | return 10 + c - 'A'; | 253 | return 10 + c - 'A'; |
254 | else if (c >= '0' && c <= '9') | 254 | else if (c >= '0' && c <= '9') |
255 | return c - '0'; | 255 | return c - '0'; |
256 | else | 256 | else |
257 | return -1; | 257 | return -1; |
258 | } | 258 | } |
259 | 259 | ||
260 | char *trim_end(const char *str, char c) | ||
261 | { | ||
262 | int len; | ||
263 | char *s, *t; | ||
264 | |||
265 | if (str == NULL) | ||
266 | return NULL; | ||
267 | t = (char *)str; | ||
268 | len = strlen(t); | ||
269 | while(len > 0 && t[len - 1] == c) | ||
270 | len--; | ||
271 | |||
272 | if (len == 0) | ||
273 | return NULL; | ||
274 | |||
275 | c = t[len]; | ||
276 | t[len] = '\0'; | ||
277 | s = xstrdup(t); | ||
278 | t[len] = c; | ||
279 | return s; | ||
280 | } | ||
281 | |||
260 | void cgit_diff_tree_cb(struct diff_queue_struct *q, | 282 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
261 | struct diff_options *options, void *data) | 283 | struct diff_options *options, void *data) |
262 | { | 284 | { |
263 | int i; | 285 | int i; |
264 | 286 | ||
265 | for (i = 0; i < q->nr; i++) { | 287 | for (i = 0; i < q->nr; i++) { |
266 | if (q->queue[i]->status == 'U') | 288 | if (q->queue[i]->status == 'U') |
267 | continue; | 289 | continue; |