-rw-r--r-- | scan-tree.c | 115 |
1 files changed, 102 insertions, 13 deletions
diff --git a/scan-tree.c b/scan-tree.c index dbca797..b5b50f3 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -1 +1,10 @@ | |||
1 | /* scan-tree.c | ||
2 | * | ||
3 | * Copyright (C) 2008-2009 Lars Hjemli | ||
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | ||
5 | * | ||
6 | * Licensed under GNU General Public License v2 | ||
7 | * (see COPYING for full license text) | ||
8 | */ | ||
9 | |||
1 | #include "cgit.h" | 10 | #include "cgit.h" |
@@ -40,2 +49,3 @@ struct cgit_repo *repo; | |||
40 | repo_config_fn config_fn; | 49 | repo_config_fn config_fn; |
50 | char *owner; | ||
41 | 51 | ||
@@ -46,2 +56,16 @@ static void repo_config(const char *name, const char *value) | |||
46 | 56 | ||
57 | static int git_owner_config(const char *key, const char *value, void *cb) | ||
58 | { | ||
59 | if (!strcmp(key, "gitweb.owner")) | ||
60 | owner = xstrdup(value); | ||
61 | return 0; | ||
62 | } | ||
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 | |||
47 | 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) |
@@ -50,3 +74,4 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
50 | struct passwd *pwd; | 74 | struct passwd *pwd; |
51 | char *p; | 75 | char *rel, *p, *slash; |
76 | int n; | ||
52 | size_t size; | 77 | size_t size; |
@@ -58,22 +83,34 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
58 | } | 83 | } |
59 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 84 | if (!stat(fmt("%s/noweb", path), &st)) |
60 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | ||
61 | path, strerror(errno), errno); | ||
62 | return; | 85 | return; |
63 | } | 86 | |
87 | owner = NULL; | ||
88 | if (ctx.cfg.enable_gitweb_owner) | ||
89 | git_config_from_file(git_owner_config, fmt("%s/config", path), NULL); | ||
64 | if (base == path) | 90 | if (base == path) |
65 | p = fmt("%s", path); | 91 | rel = xstrdup(fmt("%s", path)); |
66 | else | 92 | else |
67 | p = fmt("%s", path + strlen(base) + 1); | 93 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); |
68 | 94 | ||
69 | if (!strcmp(p + strlen(p) - 5, "/.git")) | 95 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) |
70 | p[strlen(p) - 5] = '\0'; | 96 | rel[strlen(rel) - 5] = '\0'; |
71 | 97 | ||
72 | repo = cgit_add_repo(xstrdup(p)); | 98 | repo = cgit_add_repo(rel); |
99 | if (ctx.cfg.remove_suffix) | ||
100 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) | ||
101 | *p = '\0'; | ||
73 | repo->name = repo->url; | 102 | repo->name = repo->url; |
74 | repo->path = xstrdup(path); | 103 | repo->path = xstrdup(path); |
75 | p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL; | 104 | while (!owner) { |
76 | if (p) | 105 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
106 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | ||
107 | path, strerror(errno), errno); | ||
108 | break; | ||
109 | } | ||
110 | if (pwd->pw_gecos) | ||
111 | if ((p = strchr(pwd->pw_gecos, ','))) | ||
77 | *p = '\0'; | 112 | *p = '\0'; |
78 | repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : ""); | 113 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); |
114 | } | ||
115 | repo->owner = owner; | ||
79 | 116 | ||
@@ -83,2 +120,3 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
83 | 120 | ||
121 | if (!repo->readme) { | ||
84 | p = fmt("%s/README.html", path); | 122 | p = fmt("%s/README.html", path); |
@@ -86,2 +124,25 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) | |||
86 | repo->readme = "README.html"; | 124 | repo->readme = "README.html"; |
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 | } | ||
87 | 148 | ||
@@ -142,2 +203,30 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) | |||
142 | 203 | ||
204 | #define lastc(s) s[strlen(s) - 1] | ||
205 | |||
206 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) | ||
207 | { | ||
208 | char line[MAX_PATH * 2], *z; | ||
209 | FILE *projects; | ||
210 | int err; | ||
211 | |||
212 | projects = fopen(projectsfile, "r"); | ||
213 | if (!projects) { | ||
214 | fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", | ||
215 | projectsfile, strerror(errno), errno); | ||
216 | } | ||
217 | while (fgets(line, sizeof(line), projects) != NULL) { | ||
218 | for (z = &lastc(line); | ||
219 | strlen(line) && strchr("\n\r", *z); | ||
220 | z = &lastc(line)) | ||
221 | *z = '\0'; | ||
222 | if (strlen(line)) | ||
223 | scan_path(path, fmt("%s/%s", path, line), fn); | ||
224 | } | ||
225 | if ((err = ferror(projects))) { | ||
226 | fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n", | ||
227 | projectsfile, strerror(err), err); | ||
228 | } | ||
229 | fclose(projects); | ||
230 | } | ||
231 | |||
143 | void scan_tree(const char *path, repo_config_fn fn) | 232 | void scan_tree(const char *path, repo_config_fn fn) |