diff options
author | Lars Hjemli | 2007-09-20 00:56:53 +0200 |
---|---|---|
committer | Lars Hjemli | 2007-09-20 00:56:53 +0200 |
commit | 4e40d8507ea9a3b5082ae690190e9d41c5b49ae2 (patch) | |
tree | 119531367d7a5359ff62d1f050d9858d48b90179 /shared.c | |
parent | 0835ffefb8a1f5387463b22e2e5f7e34d387d7b1 (diff) | |
download | cgit-4e40d8507ea9a3b5082ae690190e9d41c5b49ae2.tar.gz cgit-4e40d8507ea9a3b5082ae690190e9d41c5b49ae2.tar.bz2 cgit-4e40d8507ea9a3b5082ae690190e9d41c5b49ae2.zip |
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>
Diffstat (limited to 'shared.c')
-rw-r--r-- | shared.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -108,7 +108,7 @@ struct repoinfo *add_repo(const char *url) | |||
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; |
@@ -151,7 +151,7 @@ void cgit_global_config_cb(const char *name, const char *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")) |
@@ -189,7 +189,7 @@ void cgit_global_config_cb(const char *name, const char *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")) |