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) (side-by-side diff) | |
tree | 8bcf24b888ba95c91a575640be9ae87e949a99ea /parsing.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-- | parsing.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -139,65 +139,65 @@ int cgit_parse_query(char *txt, configfn fn) * path: any valid path, may contain '/' * */ void cgit_parse_url(const char *url) { char *cmd, *p; cgit_repo = NULL; if (!url || url[0] == '\0') return; cgit_repo = cgit_get_repoinfo(url); if (cgit_repo) { cgit_query_repo = cgit_repo->url; return; } cmd = strchr(url, '/'); while (!cgit_repo && cmd) { cmd[0] = '\0'; cgit_repo = cgit_get_repoinfo(url); if (cgit_repo == NULL) { cmd[0] = '/'; cmd = strchr(cmd + 1, '/'); continue; } cgit_query_repo = cgit_repo->url; p = strchr(cmd + 1, '/'); if (p) { p[0] = '\0'; if (p[1]) - cgit_query_path = xstrdup(p + 1); + cgit_query_path = trim_end(p + 1, '/'); } cgit_cmd = cgit_get_cmd_index(cmd + 1); cgit_query_page = xstrdup(cmd + 1); return; } } char *substr(const char *head, const char *tail) { char *buf; buf = xmalloc(tail - head + 1); strncpy(buf, head, tail - head); buf[tail - head] = '\0'; return buf; } struct commitinfo *cgit_parse_commit(struct commit *commit) { struct commitinfo *ret; char *p = commit->buffer, *t = commit->buffer; ret = xmalloc(sizeof(*ret)); ret->commit = commit; ret->author = NULL; ret->author_email = NULL; ret->committer = NULL; ret->committer_email = NULL; ret->subject = NULL; ret->msg = NULL; if (p == NULL) |