diff options
Diffstat (limited to 'scan-tree.c')
| -rw-r--r-- | scan-tree.c | 45 |
1 files changed, 27 insertions, 18 deletions
diff --git a/scan-tree.c b/scan-tree.c index 47f3988..dbca797 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -1,4 +1,5 @@ #include "cgit.h" +#include "configfile.h" #include "html.h" #define MAX_PATH 4096 @@ -35,25 +36,20 @@ static int is_git_dir(const char *path) return 1; } -char *readfile(const char *path) -{ - FILE *f; - static char buf[MAX_PATH]; +struct cgit_repo *repo; +repo_config_fn config_fn; - if (!(f = fopen(path, "r"))) - return NULL; - buf[0] = 0; - fgets(buf, MAX_PATH, f); - fclose(f); - return buf; +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) +static void add_repo(const char *base, const char *path, repo_config_fn fn) { - struct cgit_repo *repo; struct stat st; struct passwd *pwd; char *p; + size_t size; if (stat(path, &st)) { fprintf(stderr, "Error accessing %s: %s (%d)\n", @@ -76,18 +72,27 @@ static void add_repo(const char *base, const char *path) repo = cgit_add_repo(xstrdup(p)); repo->name = repo->url; repo->path = xstrdup(path); + p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; + if (p) + *p = '\0'; repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); p = fmt("%s/description", path); if (!stat(p, &st)) - repo->desc = xstrdup(readfile(p)); + readfile(p, &repo->desc, &size); 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) +static void scan_path(const char *base, const char *path, repo_config_fn fn) { DIR *dir; struct dirent *ent; @@ -95,7 +100,11 @@ static void scan_path(const char *base, const char *path) struct stat st; if (is_git_dir(path)) { - add_repo(base, path); + add_repo(base, path, fn); + return; + } + if (is_git_dir(fmt("%s/.git", path))) { + add_repo(base, fmt("%s/.git", path), fn); return; } dir = opendir(path); @@ -125,13 +134,13 @@ static void scan_path(const char *base, const char *path) continue; } if (S_ISDIR(st.st_mode)) - scan_path(base, buf); + scan_path(base, buf, fn); free(buf); } closedir(dir); } -void scan_tree(const char *path) +void scan_tree(const char *path, repo_config_fn fn) { - scan_path(path, path); + scan_path(path, path, fn); } |