-rw-r--r-- | scan-tree.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/scan-tree.c b/scan-tree.c index a0e09ce..627af1b 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -1,239 +1,241 @@ | |||
1 | /* scan-tree.c | 1 | /* scan-tree.c |
2 | * | 2 | * |
3 | * Copyright (C) 2008-2009 Lars Hjemli | 3 | * Copyright (C) 2008-2009 Lars Hjemli |
4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> | 4 | * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com> |
5 | * | 5 | * |
6 | * Licensed under GNU General Public License v2 | 6 | * Licensed under GNU General Public License v2 |
7 | * (see COPYING for full license text) | 7 | * (see COPYING for full license text) |
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "cgit.h" | 10 | #include "cgit.h" |
11 | #include "configfile.h" | 11 | #include "configfile.h" |
12 | #include "html.h" | 12 | #include "html.h" |
13 | 13 | ||
14 | #define MAX_PATH 4096 | 14 | #define MAX_PATH 4096 |
15 | 15 | ||
16 | /* return 1 if path contains a objects/ directory and a HEAD file */ | 16 | /* return 1 if path contains a objects/ directory and a HEAD file */ |
17 | static int is_git_dir(const char *path) | 17 | static int is_git_dir(const char *path) |
18 | { | 18 | { |
19 | struct stat st; | 19 | struct stat st; |
20 | static char buf[MAX_PATH]; | 20 | static char buf[MAX_PATH]; |
21 | 21 | ||
22 | if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) { | 22 | if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) { |
23 | fprintf(stderr, "Insanely long path: %s\n", path); | 23 | fprintf(stderr, "Insanely long path: %s\n", path); |
24 | return 0; | 24 | return 0; |
25 | } | 25 | } |
26 | if (stat(buf, &st)) { | 26 | if (stat(buf, &st)) { |
27 | if (errno != ENOENT) | 27 | if (errno != ENOENT) |
28 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 28 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
29 | path, strerror(errno), errno); | 29 | path, strerror(errno), errno); |
30 | return 0; | 30 | return 0; |
31 | } | 31 | } |
32 | if (!S_ISDIR(st.st_mode)) | 32 | if (!S_ISDIR(st.st_mode)) |
33 | return 0; | 33 | return 0; |
34 | 34 | ||
35 | sprintf(buf, "%s/HEAD", path); | 35 | sprintf(buf, "%s/HEAD", path); |
36 | if (stat(buf, &st)) { | 36 | if (stat(buf, &st)) { |
37 | if (errno != ENOENT) | 37 | if (errno != ENOENT) |
38 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 38 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
39 | path, strerror(errno), errno); | 39 | path, strerror(errno), errno); |
40 | return 0; | 40 | return 0; |
41 | } | 41 | } |
42 | if (!S_ISREG(st.st_mode)) | 42 | if (!S_ISREG(st.st_mode)) |
43 | return 0; | 43 | return 0; |
44 | 44 | ||
45 | return 1; | 45 | return 1; |
46 | } | 46 | } |
47 | 47 | ||
48 | struct cgit_repo *repo; | 48 | struct cgit_repo *repo; |
49 | repo_config_fn config_fn; | 49 | repo_config_fn config_fn; |
50 | char *owner; | 50 | char *owner; |
51 | 51 | ||
52 | static void repo_config(const char *name, const char *value) | 52 | static void repo_config(const char *name, const char *value) |
53 | { | 53 | { |
54 | config_fn(repo, name, value); | 54 | config_fn(repo, name, value); |
55 | } | 55 | } |
56 | 56 | ||
57 | static int git_owner_config(const char *key, const char *value, void *cb) | 57 | static int git_owner_config(const char *key, const char *value, void *cb) |
58 | { | 58 | { |
59 | if (!strcmp(key, "gitweb.owner")) | 59 | if (!strcmp(key, "gitweb.owner")) |
60 | owner = xstrdup(value); | 60 | owner = xstrdup(value); |
61 | return 0; | 61 | return 0; |
62 | } | 62 | } |
63 | 63 | ||
64 | static char *xstrrchr(char *s, char *from, int c) | 64 | static char *xstrrchr(char *s, char *from, int c) |
65 | { | 65 | { |
66 | while (from >= s && *from != c) | 66 | while (from >= s && *from != c) |
67 | from--; | 67 | from--; |
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 | 84 | ||
85 | if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st)) | 85 | if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st)) |
86 | return; | 86 | return; |
87 | 87 | ||
88 | if (!stat(fmt("%s/noweb", path), &st)) | 88 | if (!stat(fmt("%s/noweb", path), &st)) |
89 | return; | 89 | return; |
90 | 90 | ||
91 | owner = NULL; | 91 | owner = NULL; |
92 | if (ctx.cfg.enable_gitweb_owner) | 92 | if (ctx.cfg.enable_gitweb_owner) |
93 | 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); |
94 | if (base == path) | 94 | if (base == path) |
95 | rel = xstrdup(fmt("%s", path)); | 95 | rel = xstrdup(fmt("%s", path)); |
96 | else | 96 | else |
97 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); | 97 | rel = xstrdup(fmt("%s", path + strlen(base) + 1)); |
98 | 98 | ||
99 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) | 99 | if (!strcmp(rel + strlen(rel) - 5, "/.git")) |
100 | rel[strlen(rel) - 5] = '\0'; | 100 | rel[strlen(rel) - 5] = '\0'; |
101 | 101 | ||
102 | repo = cgit_add_repo(rel); | 102 | repo = cgit_add_repo(rel); |
103 | if (ctx.cfg.remove_suffix) | 103 | if (ctx.cfg.remove_suffix) |
104 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) | 104 | if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git")) |
105 | *p = '\0'; | 105 | *p = '\0'; |
106 | repo->name = repo->url; | 106 | repo->name = repo->url; |
107 | repo->path = xstrdup(path); | 107 | repo->path = xstrdup(path); |
108 | while (!owner) { | 108 | while (!owner) { |
109 | if ((pwd = getpwuid(st.st_uid)) == NULL) { | 109 | if ((pwd = getpwuid(st.st_uid)) == NULL) { |
110 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", | 110 | fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", |
111 | path, strerror(errno), errno); | 111 | path, strerror(errno), errno); |
112 | break; | 112 | break; |
113 | } | 113 | } |
114 | if (pwd->pw_gecos) | 114 | if (pwd->pw_gecos) |
115 | if ((p = strchr(pwd->pw_gecos, ','))) | 115 | if ((p = strchr(pwd->pw_gecos, ','))) |
116 | *p = '\0'; | 116 | *p = '\0'; |
117 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); | 117 | owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name); |
118 | } | 118 | } |
119 | repo->owner = owner; | 119 | repo->owner = owner; |
120 | 120 | ||
121 | p = fmt("%s/description", path); | 121 | p = fmt("%s/description", path); |
122 | if (!stat(p, &st)) | 122 | if (!stat(p, &st)) |
123 | readfile(p, &repo->desc, &size); | 123 | readfile(p, &repo->desc, &size); |
124 | 124 | ||
125 | if (!repo->readme) { | 125 | if (!repo->readme) { |
126 | p = fmt("%s/README.html", path); | 126 | p = fmt("%s/README.html", path); |
127 | if (!stat(p, &st)) | 127 | if (!stat(p, &st)) |
128 | repo->readme = "README.html"; | 128 | repo->readme = "README.html"; |
129 | } | 129 | } |
130 | if (ctx.cfg.section_from_path) { | 130 | if (ctx.cfg.section_from_path) { |
131 | n = ctx.cfg.section_from_path; | 131 | n = ctx.cfg.section_from_path; |
132 | if (n > 0) { | 132 | if (n > 0) { |
133 | slash = rel; | 133 | slash = rel; |
134 | while (slash && n && (slash = strchr(slash, '/'))) | 134 | while (slash && n && (slash = strchr(slash, '/'))) |
135 | n--; | 135 | n--; |
136 | } else { | 136 | } else { |
137 | slash = rel + strlen(rel); | 137 | slash = rel + strlen(rel); |
138 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) | 138 | while (slash && n && (slash = xstrrchr(rel, slash, '/'))) |
139 | n++; | 139 | n++; |
140 | } | 140 | } |
141 | if (slash && !n) { | 141 | if (slash && !n) { |
142 | *slash = '\0'; | 142 | *slash = '\0'; |
143 | repo->section = xstrdup(rel); | 143 | repo->section = xstrdup(rel); |
144 | *slash = '/'; | 144 | *slash = '/'; |
145 | if (!prefixcmp(repo->name, repo->section)) { | 145 | if (!prefixcmp(repo->name, repo->section)) { |
146 | repo->name += strlen(repo->section); | 146 | repo->name += strlen(repo->section); |
147 | if (*repo->name == '/') | 147 | if (*repo->name == '/') |
148 | repo->name++; | 148 | repo->name++; |
149 | } | 149 | } |
150 | } | 150 | } |
151 | } | 151 | } |
152 | 152 | ||
153 | p = fmt("%s/cgitrc", path); | 153 | p = fmt("%s/cgitrc", path); |
154 | if (!stat(p, &st)) { | 154 | if (!stat(p, &st)) { |
155 | config_fn = fn; | 155 | config_fn = fn; |
156 | parse_configfile(xstrdup(p), &repo_config); | 156 | parse_configfile(xstrdup(p), &repo_config); |
157 | } | 157 | } |
158 | } | 158 | } |
159 | 159 | ||
160 | static void scan_path(const char *base, const char *path, repo_config_fn fn) | 160 | static void scan_path(const char *base, const char *path, repo_config_fn fn) |
161 | { | 161 | { |
162 | DIR *dir; | 162 | DIR *dir = opendir(path); |
163 | struct dirent *ent; | 163 | struct dirent *ent; |
164 | char *buf; | 164 | char *buf; |
165 | struct stat st; | 165 | struct stat st; |
166 | 166 | ||
167 | if (!dir) { | ||
168 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | ||
169 | path, strerror(errno), errno); | ||
170 | return; | ||
171 | } | ||
167 | if (is_git_dir(path)) { | 172 | if (is_git_dir(path)) { |
168 | add_repo(base, path, fn); | 173 | add_repo(base, path, fn); |
169 | return; | 174 | goto end; |
170 | } | 175 | } |
171 | if (is_git_dir(fmt("%s/.git", path))) { | 176 | if (is_git_dir(fmt("%s/.git", path))) { |
172 | add_repo(base, fmt("%s/.git", path), fn); | 177 | add_repo(base, fmt("%s/.git", path), fn); |
173 | return; | 178 | goto end; |
174 | } | ||
175 | dir = opendir(path); | ||
176 | if (!dir) { | ||
177 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | ||
178 | path, strerror(errno), errno); | ||
179 | return; | ||
180 | } | 179 | } |
181 | while((ent = readdir(dir)) != NULL) { | 180 | while((ent = readdir(dir)) != NULL) { |
182 | if (ent->d_name[0] == '.') { | 181 | if (ent->d_name[0] == '.') { |
183 | if (ent->d_name[1] == '\0') | 182 | if (ent->d_name[1] == '\0') |
184 | continue; | 183 | continue; |
185 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') | 184 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') |
186 | continue; | 185 | continue; |
186 | if (!ctx.cfg.scan_hidden_path) | ||
187 | continue; | ||
187 | } | 188 | } |
188 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); | 189 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); |
189 | if (!buf) { | 190 | if (!buf) { |
190 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", | 191 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", |
191 | path, strerror(errno), errno); | 192 | path, strerror(errno), errno); |
192 | exit(1); | 193 | exit(1); |
193 | } | 194 | } |
194 | sprintf(buf, "%s/%s", path, ent->d_name); | 195 | sprintf(buf, "%s/%s", path, ent->d_name); |
195 | if (stat(buf, &st)) { | 196 | if (stat(buf, &st)) { |
196 | fprintf(stderr, "Error checking path %s: %s (%d)\n", | 197 | fprintf(stderr, "Error checking path %s: %s (%d)\n", |
197 | buf, strerror(errno), errno); | 198 | buf, strerror(errno), errno); |
198 | free(buf); | 199 | free(buf); |
199 | continue; | 200 | continue; |
200 | } | 201 | } |
201 | if (S_ISDIR(st.st_mode)) | 202 | if (S_ISDIR(st.st_mode)) |
202 | scan_path(base, buf, fn); | 203 | scan_path(base, buf, fn); |
203 | free(buf); | 204 | free(buf); |
204 | } | 205 | } |
206 | end: | ||
205 | closedir(dir); | 207 | closedir(dir); |
206 | } | 208 | } |
207 | 209 | ||
208 | #define lastc(s) s[strlen(s) - 1] | 210 | #define lastc(s) s[strlen(s) - 1] |
209 | 211 | ||
210 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) | 212 | void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn) |
211 | { | 213 | { |
212 | char line[MAX_PATH * 2], *z; | 214 | char line[MAX_PATH * 2], *z; |
213 | FILE *projects; | 215 | FILE *projects; |
214 | int err; | 216 | int err; |
215 | 217 | ||
216 | projects = fopen(projectsfile, "r"); | 218 | projects = fopen(projectsfile, "r"); |
217 | if (!projects) { | 219 | if (!projects) { |
218 | fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", | 220 | fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", |
219 | projectsfile, strerror(errno), errno); | 221 | projectsfile, strerror(errno), errno); |
220 | } | 222 | } |
221 | while (fgets(line, sizeof(line), projects) != NULL) { | 223 | while (fgets(line, sizeof(line), projects) != NULL) { |
222 | for (z = &lastc(line); | 224 | for (z = &lastc(line); |
223 | strlen(line) && strchr("\n\r", *z); | 225 | strlen(line) && strchr("\n\r", *z); |
224 | z = &lastc(line)) | 226 | z = &lastc(line)) |
225 | *z = '\0'; | 227 | *z = '\0'; |
226 | if (strlen(line)) | 228 | if (strlen(line)) |
227 | scan_path(path, fmt("%s/%s", path, line), fn); | 229 | scan_path(path, fmt("%s/%s", path, line), fn); |
228 | } | 230 | } |
229 | if ((err = ferror(projects))) { | 231 | if ((err = ferror(projects))) { |
230 | fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n", | 232 | fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n", |
231 | projectsfile, strerror(err), err); | 233 | projectsfile, strerror(err), err); |
232 | } | 234 | } |
233 | fclose(projects); | 235 | fclose(projects); |
234 | } | 236 | } |
235 | 237 | ||
236 | void scan_tree(const char *path, repo_config_fn fn) | 238 | void scan_tree(const char *path, repo_config_fn fn) |
237 | { | 239 | { |
238 | scan_path(path, path, fn); | 240 | scan_path(path, path, fn); |
239 | } | 241 | } |