Diffstat (limited to 'scan-tree.c')
| -rw-r--r-- | scan-tree.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/scan-tree.c b/scan-tree.c index 3d4e417..378d795 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -48,24 +48,19 @@ static int is_git_dir(const char *path) struct cgit_repo *repo; repo_config_fn config_fn; char *owner; -char *desc; static void repo_config(const char *name, const char *value) { config_fn(repo, name, value); } -static int gitweb_config(const char *key, const char *value, void *cb) +static int git_owner_config(const char *key, const char *value, void *cb) { - if (ctx.cfg.enable_gitweb_owner && !strcmp(key, "gitweb.owner")) + if (!strcmp(key, "gitweb.owner")) owner = xstrdup(value); - else if (ctx.cfg.enable_gitweb_desc && !strcmp(key, "gitweb.description")) - desc = xstrdup(value); return 0; } - - static char *xstrrchr(char *s, char *from, int c) { while (from >= s && *from != c) @@ -94,9 +89,8 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) return; owner = NULL; - desc = NULL; - git_config_from_file(gitweb_config, fmt("%s/config", path), NULL); - + if (ctx.cfg.enable_gitweb_owner) + git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); if (base == path) rel = xstrdup(fmt("%s", path)); else @@ -124,13 +118,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) } repo->owner = owner; - if (desc) - repo->desc = desc; - else { - p = fmt("%s/description", path); - if (!stat(p, &st)) - readfile(p, &repo->desc, &size); - } + p = fmt("%s/description", path); + if (!stat(p, &st)) + readfile(p, &repo->desc, &size); if (!repo->readme) { p = fmt("%s/README.html", path); |