Diffstat (limited to 'scan-tree.c')
| -rw-r--r-- | scan-tree.c | 42 |
1 files changed, 6 insertions, 36 deletions
diff --git a/scan-tree.c b/scan-tree.c index b5b50f3..780d405 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -61,19 +61,11 @@ static int git_owner_config(const char *key, const char *value, void *cb) return 0; } -static char *xstrrchr(char *s, char *from, int c) -{ - while (from >= s && *from != c) - from--; - return from < s ? NULL : from; -} - static void add_repo(const char *base, const char *path, repo_config_fn fn) { struct stat st; struct passwd *pwd; - char *rel, *p, *slash; - int n; + char *p; size_t size; if (stat(path, &st)) { @@ -88,14 +80,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) 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)); + p = fmt("%s", path); else - rel = xstrdup(fmt("%s", path + strlen(base) + 1)); + p = fmt("%s", path + strlen(base) + 1); - if (!strcmp(rel + strlen(rel) - 5, "/.git")) - rel[strlen(rel) - 5] = '\0'; + if (!strcmp(p + strlen(p) - 5, "/.git")) + p[strlen(p) - 5] = '\0'; - repo = cgit_add_repo(rel); + repo = cgit_add_repo(xstrdup(p)); if (ctx.cfg.remove_suffix) if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) *p = '\0'; @@ -123,28 +115,6 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) if (!stat(p, &st)) repo->readme = "README.html"; } - if (ctx.cfg.section_from_path) { - n = ctx.cfg.section_from_path; - if (n > 0) { - slash = rel; - while (slash && n && (slash = strchr(slash, '/'))) - n--; - } else { - slash = rel + strlen(rel); - while (slash && n && (slash = xstrrchr(rel, slash, '/'))) - n++; - } - if (slash && !n) { - *slash = '\0'; - repo->section = xstrdup(rel); - *slash = '/'; - if (!prefixcmp(repo->name, repo->section)) { - repo->name += strlen(repo->section); - if (*repo->name == '/') - repo->name++; - } - } - } p = fmt("%s/cgitrc", path); if (!stat(p, &st)) { |