| author | Lars Hjemli <hjemli@gmail.com> | 2009-09-13 20:02:07 (UTC) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2009-09-13 20:02:07 (UTC) |
| commit | 92f6940975f6771f3a08d497c02575ee5bdc79da (patch) (unidiff) | |
| tree | c1c538b24e50be3bf63356acf246cda76b91c519 /scan-tree.c | |
| parent | 5f12e45fe3338095916a444ff106dd9fc9991d84 (diff) | |
| parent | ee554849ac7209fa8f7486327ec9f3b370e4c876 (diff) | |
| download | cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.zip cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar.gz cgit-92f6940975f6771f3a08d497c02575ee5bdc79da.tar.bz2 | |
Merge branch 'lh/repo-scan'
| -rw-r--r-- | scan-tree.c | 32 |
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,2 +1,3 @@ | |||
| 1 | #include "cgit.h" | 1 | #include "cgit.h" |
| 2 | #include "configfile.h" | ||
| 2 | #include "html.h" | 3 | #include "html.h" |
| @@ -37,5 +38,12 @@ static int is_git_dir(const char *path) | |||
| 37 | 38 | ||
| 38 | static void add_repo(const char *base, const char *path) | 39 | struct cgit_repo *repo; |
| 40 | repo_config_fn config_fn; | ||
| 41 | |||
| 42 | static void repo_config(const char *name, const char *value) | ||
| 43 | { | ||
| 44 | config_fn(repo, name, value); | ||
| 45 | } | ||
| 46 | |||
| 47 | static void add_repo(const char *base, const char *path, repo_config_fn fn) | ||
| 39 | { | 48 | { |
| 40 | struct cgit_repo *repo; | ||
| 41 | struct stat st; | 49 | struct stat st; |
| @@ -78,5 +86,11 @@ static void add_repo(const char *base, const char *path) | |||
| 78 | repo->readme = "README.html"; | 86 | repo->readme = "README.html"; |
| 87 | |||
| 88 | p = fmt("%s/cgitrc", path); | ||
| 89 | if (!stat(p, &st)) { | ||
| 90 | config_fn = fn; | ||
| 91 | parse_configfile(xstrdup(p), &repo_config); | ||
| 92 | } | ||
| 79 | } | 93 | } |
| 80 | 94 | ||
| 81 | static void scan_path(const char *base, const char *path) | 95 | static void scan_path(const char *base, const char *path, repo_config_fn fn) |
| 82 | { | 96 | { |
| @@ -88,3 +102,7 @@ static void scan_path(const char *base, const char *path) | |||
| 88 | if (is_git_dir(path)) { | 102 | if (is_git_dir(path)) { |
| 89 | add_repo(base, path); | 103 | add_repo(base, path, fn); |
| 104 | return; | ||
| 105 | } | ||
| 106 | if (is_git_dir(fmt("%s/.git", path))) { | ||
| 107 | add_repo(base, fmt("%s/.git", path), fn); | ||
| 90 | return; | 108 | return; |
| @@ -118,3 +136,3 @@ static void scan_path(const char *base, const char *path) | |||
| 118 | if (S_ISDIR(st.st_mode)) | 136 | if (S_ISDIR(st.st_mode)) |
| 119 | scan_path(base, buf); | 137 | scan_path(base, buf, fn); |
| 120 | free(buf); | 138 | free(buf); |
| @@ -124,5 +142,5 @@ static void scan_path(const char *base, const char *path) | |||
| 124 | 142 | ||
| 125 | void scan_tree(const char *path) | 143 | void scan_tree(const char *path, repo_config_fn fn) |
| 126 | { | 144 | { |
| 127 | scan_path(path, path); | 145 | scan_path(path, path, fn); |
| 128 | } | 146 | } |