-rw-r--r-- | scan-tree.c | 42 |
1 files changed, 36 insertions, 6 deletions
diff --git a/scan-tree.c b/scan-tree.c index 780d405..b5b50f3 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -61,11 +61,19 @@ static int git_owner_config(const char *key, const char *value, void *cb) | |||
61 | return 0; | 61 | return 0; |
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 | ||
71 | if (stat(path, &st)) { | 79 | if (stat(path, &st)) { |
@@ -80,14 +88,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
80 | if (ctx.cfg.enable_gitweb_owner) | 88 | if (ctx.cfg.enable_gitweb_owner) |
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")) |
93 | *p = '\0'; | 101 | *p = '\0'; |
@@ -115,6 +123,28 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
115 | if (!stat(p, &st)) | 123 | if (!stat(p, &st)) |
116 | repo->readme = "README.html"; | 124 | repo->readme = "README.html"; |
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 | ||
119 | p = fmt("%s/cgitrc", path); | 149 | p = fmt("%s/cgitrc", path); |
120 | if (!stat(p, &st)) { | 150 | if (!stat(p, &st)) { |