-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.h | 1 | ||||
-rw-r--r-- | cgitrc.5.txt | 6 | ||||
-rw-r--r-- | scan-tree.c | 42 |
4 files changed, 45 insertions, 6 deletions
@@ -195,2 +195,4 @@ void config_cb(const char *name, const char *value) | |||
195 | scan_tree(expand_macros(value), repo_config); | 195 | scan_tree(expand_macros(value), repo_config); |
196 | else if (!strcmp(name, "section-from-path")) | ||
197 | ctx.cfg.section_from_path = atoi(value); | ||
196 | else if (!strcmp(name, "source-filter")) | 198 | else if (!strcmp(name, "source-filter")) |
@@ -208,2 +208,3 @@ struct cgit_config { | |||
208 | int remove_suffix; | 208 | int remove_suffix; |
209 | int section_from_path; | ||
209 | int snapshots; | 210 | int snapshots; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 187031a..ce78d41 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -284,2 +284,8 @@ section:: | |||
284 | 284 | ||
285 | section-from-path:: | ||
286 | A number which, if specified before scan-path, specifies how many | ||
287 | path elements from each repo path to use as a default section name. | ||
288 | If negative, cgit will discard the specified number of path elements | ||
289 | above the repo directory. Default value: 0. | ||
290 | |||
285 | side-by-side-diffs:: | 291 | side-by-side-diffs:: |
diff --git a/scan-tree.c b/scan-tree.c index 780d405..b5b50f3 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -63,2 +63,9 @@ static int git_owner_config(const char *key, const char *value, void *cb) | |||
63 | 63 | ||
64 | static char *xstrrchr(char *s, char *from, int c) | ||
65 | { | ||
66 | while (from >= s && *from != c) | ||
67 | from--; | ||
68 | return from < s ? NULL : from; | ||
69 | } | ||
70 | |||
64 | 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) |
@@ -67,3 +74,4 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
67 | struct passwd *pwd; | 74 | struct passwd *pwd; |
68 | char *p; | 75 | char *rel, *p, *slash; |
76 | int n; | ||
69 | size_t size; | 77 | size_t size; |
@@ -82,10 +90,10 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
82 | if (base == path) | 90 | if (base == path) |
83 | p = fmt("%s", path); | 91 | rel = xstrdup(fmt("%s", path)); |
84 | else | 92 | else |
85 | p = fmt("%s", path + strlen(base) + 1); | 93 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); |
86 | 94 | ||
87 | if (!strcmp(p + strlen(p) - 5, "/.git")) | 95 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) |
88 | p[strlen(p) - 5] = '\0'; | 96 | rel[strlen(rel) - 5] = '\0'; |
89 | 97 | ||
90 | repo = cgit_add_repo(xstrdup(p)); | 98 | repo = cgit_add_repo(rel); |
91 | if (ctx.cfg.remove_suffix) | 99 | if (ctx.cfg.remove_suffix) |
@@ -117,2 +125,24 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
117 | } | 125 | } |
126 | if (ctx.cfg.section_from_path) { | ||
127 | n = ctx.cfg.section_from_path; | ||
128 | if (n > 0) { | ||
129 | slash = rel; | ||
130 | while (slash && n && (slash = strchr(slash, '/'))) | ||
131 | n--; | ||
132 | } else { | ||
133 | slash = rel + strlen(rel); | ||
134 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) | ||
135 | n++; | ||
136 | } | ||
137 | if (slash && !n) { | ||
138 | *slash = '\0'; | ||
139 | repo->section = xstrdup(rel); | ||
140 | *slash = '/'; | ||
141 | if (!prefixcmp(repo->name, repo->section)) { | ||
142 | repo->name += strlen(repo->section); | ||
143 | if (*repo->name == '/') | ||
144 | repo->name++; | ||
145 | } | ||
146 | } | ||
147 | } | ||
118 | 148 | ||