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
@@ -229,5 +229,5 @@ void cgit_querystring_cb(const char *name, const char *value) | |||
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); |
@@ -258,4 +258,26 @@ int hextoint(char c) | |||
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) |