| -rw-r--r-- | cgit.c | 8 | ||||
| -rw-r--r-- | cgit.h | 3 | ||||
| -rw-r--r-- | cgitrc.5.txt | 9 | ||||
| -rw-r--r-- | scan-tree.c | 30 | ||||
| -rw-r--r-- | scan-tree.h | 2 |
5 files changed, 13 insertions, 39 deletions
@@ -168,7 +168,7 @@ void config_cb(const char *name, const char *value) if (!ctx.cfg.nocache && ctx.cfg.cache_size) process_cached_repolist(value); else - scan_tree(value, repo_config); + scan_tree(value); else if (!strcmp(name, "source-filter")) ctx.cfg.source_filter = new_filter(value, 1); else if (!strcmp(name, "summary-log")) @@ -476,7 +476,7 @@ static int generate_cached_repolist(const char *path, const char *cached_rc) return errno; } idx = cgit_repolist.count; - scan_tree(path, repo_config); + scan_tree(path); print_repolist(f, &cgit_repolist, idx); if (rename(locked_rc, cached_rc)) fprintf(stderr, "[cgit] Error renaming %s to %s: %s (%d)\n", @@ -500,7 +500,7 @@ static void process_cached_repolist(const char *path) * invoke scan_tree manually. */ if (generate_cached_repolist(path, cached_rc)) - scan_tree(path, repo_config); + scan_tree(path); return; } @@ -559,7 +559,7 @@ static void cgit_parse_args(int argc, const char **argv) if (!strncmp(argv[i], "--scan-tree=", 12) || !strncmp(argv[i], "--scan-path=", 12)) { scan++; - scan_tree(argv[i] + 12, repo_config); + scan_tree(argv[i] + 12); } } if (scan) { @@ -79,9 +79,6 @@ struct cgit_repo { struct cgit_filter *source_filter; }; -typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, - const char *value); - struct cgit_repolist { int length; int count; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index df494aa..e99c9f7 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -326,15 +326,6 @@ repo.url:: setting specified for each repo. Default value: none. -REPOSITORY-SPECIFIC CGITRC FILE -------------------------------- -When the option 'scan-path' is used to auto-discover git repositories, cgit -will try to parse the file 'cgitrc' within any found repository. Such a repo- -specific config file may contain any of the repo-specific options described -above, except 'repo.url' and 'repo.path'. Also, in a repo-specific config -file, the 'repo.' prefix is dropped from the config option names. - - EXAMPLE CGITRC FILE ------------------- diff --git a/scan-tree.c b/scan-tree.c index dbca797..67f4550 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -1,5 +1,4 @@ #include "cgit.h" -#include "configfile.h" #include "html.h" #define MAX_PATH 4096 @@ -36,16 +35,9 @@ static int is_git_dir(const char *path) return 1; } -struct cgit_repo *repo; -repo_config_fn config_fn; - -static void repo_config(const char *name, const char *value) -{ - config_fn(repo, name, value); -} - -static void add_repo(const char *base, const char *path, repo_config_fn fn) +static void add_repo(const char *base, const char *path) { + struct cgit_repo *repo; struct stat st; struct passwd *pwd; char *p; @@ -84,15 +76,9 @@ 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"; - - p = fmt("%s/cgitrc", path); - if (!stat(p, &st)) { - config_fn = fn; - parse_configfile(xstrdup(p), &repo_config); - } } -static void scan_path(const char *base, const char *path, repo_config_fn fn) +static void scan_path(const char *base, const char *path) { DIR *dir; struct dirent *ent; @@ -100,11 +86,11 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) struct stat st; if (is_git_dir(path)) { - add_repo(base, path, fn); + add_repo(base, path); return; } if (is_git_dir(fmt("%s/.git", path))) { - add_repo(base, fmt("%s/.git", path), fn); + add_repo(base, fmt("%s/.git", path)); return; } dir = opendir(path); @@ -134,13 +120,13 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) continue; } if (S_ISDIR(st.st_mode)) - scan_path(base, buf, fn); + scan_path(base, buf); free(buf); } closedir(dir); } -void scan_tree(const char *path, repo_config_fn fn) +void scan_tree(const char *path) { - scan_path(path, path, fn); + scan_path(path, path); } diff --git a/scan-tree.h b/scan-tree.h index 11539f4..b103b16 100644 --- a/scan-tree.h +++ b/scan-tree.h @@ -1,3 +1,3 @@ -extern void scan_tree(const char *path, repo_config_fn fn); +extern void scan_tree(const char *path); |