| -rw-r--r-- | scan-tree.c | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/scan-tree.c b/scan-tree.c index 780d405..b5b50f3 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -63,2 +63,9 @@ static int git_owner_config(const char *key, const char *value, void *cb) +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) @@ -67,3 +74,4 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) struct passwd *pwd; - char *p; + char *rel, *p, *slash; + int n; size_t size; @@ -82,10 +90,10 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) if (base == path) - p = fmt("%s", path); + rel = xstrdup(fmt("%s", path)); else - p = fmt("%s", path + strlen(base) + 1); + rel = xstrdup(fmt("%s", path + strlen(base) + 1)); - if (!strcmp(p + strlen(p) - 5, "/.git")) - p[strlen(p) - 5] = '\0'; + if (!strcmp(rel + strlen(rel) - 5, "/.git")) + rel[strlen(rel) - 5] = '\0'; - repo = cgit_add_repo(xstrdup(p)); + repo = cgit_add_repo(rel); if (ctx.cfg.remove_suffix) @@ -117,2 +125,24 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) } + 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++; + } + } + } |