-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
@@ -196,4 +196,6 @@ void config_cb(const char *name, const char *value) | |||
196 | else | 196 | else |
197 | scan_tree(expand_macros(value), repo_config); | 197 | scan_tree(expand_macros(value), repo_config); |
198 | else if (!strcmp(name, "section-from-path")) | ||
199 | ctx.cfg.section_from_path = atoi(value); | ||
198 | else if (!strcmp(name, "source-filter")) | 200 | else if (!strcmp(name, "source-filter")) |
199 | ctx.cfg.source_filter = new_filter(value, 1); | 201 | ctx.cfg.source_filter = new_filter(value, 1); |
@@ -206,4 +206,5 @@ struct cgit_config { | |||
206 | int renamelimit; | 206 | int renamelimit; |
207 | int remove_suffix; | 207 | int remove_suffix; |
208 | int section_from_path; | ||
208 | int snapshots; | 209 | int snapshots; |
209 | int summary_branches; | 210 | int summary_branches; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index c643fae..95782df 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -279,4 +279,10 @@ section:: | |||
279 | none. | 279 | none. |
280 | 280 | ||
281 | section-from-path:: | ||
282 | A number which, if specified before scan-path, specifies how many | ||
283 | path elements from each repo path to use as a default section name. | ||
284 | If negative, cgit will discard the specified number of path elements | ||
285 | above the repo directory. Default value: 0. | ||
286 | |||
281 | side-by-side-diffs:: | 287 | side-by-side-diffs:: |
282 | If set to "1" shows side-by-side diffs instead of unidiffs per | 288 | If set to "1" shows side-by-side diffs instead of unidiffs per |
diff --git a/scan-tree.c b/scan-tree.c index e987824..6ba9193 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -62,9 +62,17 @@ static int git_owner_config(const char *key, const char *value, void *cb) | |||
62 | } | 62 | } |
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) |
65 | { | 72 | { |
66 | struct stat st; | 73 | struct stat st; |
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; |
70 | 78 | ||
@@ -81,12 +89,12 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
81 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); | 89 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); |
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) |
92 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) | 100 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) |
@@ -114,4 +122,26 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
114 | if (!stat(p, &st)) | 122 | if (!stat(p, &st)) |
115 | repo->readme = "README.html"; | 123 | repo->readme = "README.html"; |
124 | if (ctx.cfg.section_from_path) { | ||
125 | n = ctx.cfg.section_from_path; | ||
126 | if (n > 0) { | ||
127 | slash = rel; | ||
128 | while (slash && n && (slash = strchr(slash, '/'))) | ||
129 | n--; | ||
130 | } else { | ||
131 | slash = rel + strlen(rel); | ||
132 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) | ||
133 | n++; | ||
134 | } | ||
135 | if (slash && !n) { | ||
136 | *slash = '\0'; | ||
137 | repo->section = xstrdup(rel); | ||
138 | *slash = '/'; | ||
139 | if (!prefixcmp(repo->name, repo->section)) { | ||
140 | repo->name += strlen(repo->section); | ||
141 | if (*repo->name == '/') | ||
142 | repo->name++; | ||
143 | } | ||
144 | } | ||
145 | } | ||
116 | 146 | ||
117 | p = fmt("%s/cgitrc", path); | 147 | p = fmt("%s/cgitrc", path); |