diff options
author | Lars Hjemli <hjemli@gmail.com> | 2010-08-21 15:44:09 +0200 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 13:35:56 +0200 |
commit | 797110e39d5d433638c82cf27d584ed9b8b93bb7 (patch) | |
tree | cead7ef38aec7dfa76603870b4734ab403405d32 /scan-tree.c | |
parent | 6d7552bc072599313ef423d69156d824c075572a (diff) | |
download | cgit-797110e39d5d433638c82cf27d584ed9b8b93bb7.tar.gz cgit-797110e39d5d433638c82cf27d584ed9b8b93bb7.tar.bz2 cgit-797110e39d5d433638c82cf27d584ed9b8b93bb7.zip |
Add support for 'section-from-path' option
This option can be used to autogenerate section names during scan-path
processing.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'scan-tree.c')
-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 e987824..6ba9193 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -61,11 +61,19 @@ 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 *p; + char *rel, *p, *slash; + int n; size_t size; if (stat(path, &st)) { @@ -80,14 +88,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) - 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) if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) *p = '\0'; @@ -113,6 +121,28 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) p = fmt("%s/README.html", path); 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)) { |