author | Felix Hanley <felix@seconddrawer.com.au> | 2010-11-08 18:41:13 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-11-08 18:41:13 (UTC) |
commit | e0c6f23789e4893781bcd5af2281d468991ccf3a (patch) (unidiff) | |
tree | 1cffe4d35b6404dd59cd0f0a314e11944e37d0f2 /scan-tree.c | |
parent | 49d09d4fd1b0cab8189cf1809a1b1241f54c2e48 (diff) | |
download | cgit-e0c6f23789e4893781bcd5af2281d468991ccf3a.zip cgit-e0c6f23789e4893781bcd5af2281d468991ccf3a.tar.gz cgit-e0c6f23789e4893781bcd5af2281d468991ccf3a.tar.bz2 |
Add `strict-export` option
This option is used to specify a filename which needs to be present in
the repositories found during `scan-path` processing. By setting this
option to 'git-daemon-export-ok', only repositories explicitly marked
for git daemon export will be included in the cgit configuration.
Signed-off-by: Felix Hanley <felix@seconddrawer.com.au>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | scan-tree.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c index b5b50f3..a0e09ce 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -68,32 +68,36 @@ static char *xstrrchr(char *s, char *from, int c) | |||
68 | return from < s ? NULL : from; | 68 | return from < s ? NULL : from; |
69 | } | 69 | } |
70 | 70 | ||
71 | static void add_repo(const char *base, const char *path, repo_config_fn fn) | 71 | static void add_repo(const char *base, const char *path, repo_config_fn fn) |
72 | { | 72 | { |
73 | struct stat st; | 73 | struct stat st; |
74 | struct passwd *pwd; | 74 | struct passwd *pwd; |
75 | char *rel, *p, *slash; | 75 | char *rel, *p, *slash; |
76 | int n; | 76 | int n; |
77 | size_t size; | 77 | size_t size; |
78 | 78 | ||
79 | if (stat(path, &st)) { | 79 | if (stat(path, &st)) { |
80 | fprintf(stderr, "Error accessing %s: %s (%d)\n", | 80 | fprintf(stderr, "Error accessing %s: %s (%d)\n", |
81 | path, strerror(errno), errno); | 81 | path, strerror(errno), errno); |
82 | return; | 82 | return; |
83 | } | 83 | } |
84 | |||
85 | if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st)) | ||
86 | return; | ||
87 | |||
84 | if (!stat(fmt("%s/noweb", path), &st)) | 88 | if (!stat(fmt("%s/noweb", path), &st)) |
85 | return; | 89 | return; |
86 | 90 | ||
87 | owner = NULL; | 91 | owner = NULL; |
88 | if (ctx.cfg.enable_gitweb_owner) | 92 | if (ctx.cfg.enable_gitweb_owner) |
89 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); | 93 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); |
90 | if (base == path) | 94 | if (base == path) |
91 | rel = xstrdup(fmt("%s", path)); | 95 | rel = xstrdup(fmt("%s", path)); |
92 | else | 96 | else |
93 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); | 97 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); |
94 | 98 | ||
95 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) | 99 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) |
96 | rel[strlen(rel) - 5] = '\0'; | 100 | rel[strlen(rel) - 5] = '\0'; |
97 | 101 | ||
98 | repo = cgit_add_repo(rel); | 102 | repo = cgit_add_repo(rel); |
99 | if (ctx.cfg.remove_suffix) | 103 | if (ctx.cfg.remove_suffix) |