| -rw-r--r-- | cgit.c | 2 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | cgitrc.5.txt | 6 | ||||
| -rw-r--r-- | scan-tree.c | 42 |
4 files changed, 6 insertions, 45 deletions
@@ -193,8 +193,6 @@ void config_cb(const char *name, const char *value) ctx.cfg.project_list, repo_config); else scan_tree(expand_macros(value), repo_config); - else if (!strcmp(name, "section-from-path")) - ctx.cfg.section_from_path = atoi(value); else if (!strcmp(name, "source-filter")) ctx.cfg.source_filter = new_filter(value, 1); else if (!strcmp(name, "summary-log")) @@ -206,7 +206,6 @@ struct cgit_config { int noheader; int renamelimit; int remove_suffix; - int section_from_path; int snapshots; int summary_branches; int summary_log; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index ce78d41..187031a 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -282,12 +282,6 @@ section:: after this option will inherit the current section name. Default value: none. -section-from-path:: - A number which, if specified before scan-path, specifies how many - path elements from each repo path to use as a default section name. - If negative, cgit will discard the specified number of path elements - above the repo directory. Default value: 0. - side-by-side-diffs:: If set to "1" shows side-by-side diffs instead of unidiffs per default. Default value: "0". 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)) { |