Archives/cgit
2
0
Fork 0
mirror of https://git.zx2c4.com/cgit/ synced 2024-11-10 07:10:33 +00:00
Code Issues Projects Releases Wiki Activity

Use trim_end() to remove trailing slashes

Browse Source 
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>
This commit is contained in:
Lars Hjemli 2007-09-20 00:56:53 +02:00
parent 0835ffefb8
commit 4e40d8507e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shared.c
View File

@ -108,7 +108,7 @@ struct repoinfo *add_repo(const char *url)
} }
ret = &cgit_repolist.repos[cgit_repolist.count-1]; ret = &cgit_repolist.repos[cgit_repolist.count-1];
ret->url = xstrdup(url); ret->url = trim_end(url, '/');
ret->name = ret->url; ret->name = ret->url;
ret->path = NULL; ret->path = NULL;
ret->desc = NULL; ret->desc = NULL;
@ -151,7 +151,7 @@ void cgit_global_config_cb(const char *name, const char *value)
else if (!strcmp(name, "module-link")) else if (!strcmp(name, "module-link"))
cgit_module_link = xstrdup(value); cgit_module_link = xstrdup(value);
else if (!strcmp(name, "virtual-root")) else if (!strcmp(name, "virtual-root"))
cgit_virtual_root = xstrdup(value); cgit_virtual_root = trim_end(value, '/');
else if (!strcmp(name, "nocache")) else if (!strcmp(name, "nocache"))
cgit_nocache = atoi(value); cgit_nocache = atoi(value);
else if (!strcmp(name, "snapshots")) else if (!strcmp(name, "snapshots"))
@ -189,7 +189,7 @@ void cgit_global_config_cb(const char *name, const char *value)
else if (!strcmp(name, "repo.name")) else if (!strcmp(name, "repo.name"))
cgit_repo->name = xstrdup(value); cgit_repo->name = xstrdup(value);
else if (cgit_repo && !strcmp(name, "repo.path")) else if (cgit_repo && !strcmp(name, "repo.path"))
cgit_repo->path = xstrdup(value); cgit_repo->path = trim_end(value, '/');
else if (cgit_repo && !strcmp(name, "repo.desc")) else if (cgit_repo && !strcmp(name, "repo.desc"))
cgit_repo->desc = xstrdup(value); cgit_repo->desc = xstrdup(value);
else if (cgit_repo && !strcmp(name, "repo.owner")) else if (cgit_repo && !strcmp(name, "repo.owner"))