aboutsummaryrefslogtreecommitdiff
path: root/scan-tree.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2009-09-13 20:02:07 +0000
committerLars Hjemli <hjemli@gmail.com>2009-09-13 20:02:07 +0000
commit92f6940975f6771f3a08d497c02575ee5bdc79da (patch)
treec1c538b24e50be3bf63356acf246cda76b91c519 /scan-tree.c
parent5f12e45fe3338095916a444ff106dd9fc9991d84 (diff)
parentee554849ac7209fa8f7486327ec9f3b370e4c876 (diff)
downloadcgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar
cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar.gz
cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.zip
Merge branch 'lh/repo-scan'
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c32
1 files changed, 25 insertions, 7 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 4da21a4..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,9 +36,16 @@ static int is_git_dir(const char *path)
return 1;
}
-static void add_repo(const char *base, const char *path)
+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)
{
- struct cgit_repo *repo;
struct stat st;
struct passwd *pwd;
char *p;
@@ -76,9 +84,15 @@ static void add_repo(const char *base, const char *path)
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;
@@ -86,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);
@@ -116,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);
}