summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--scan-tree.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c
index e5a4baf..378d795 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -110,96 +110,98 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
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
159 free(rel);
158} 160}
159 161
160static void scan_path(const char *base, const char *path, repo_config_fn fn) 162static void scan_path(const char *base, const char *path, repo_config_fn fn)
161{ 163{
162 DIR *dir = opendir(path); 164 DIR *dir = opendir(path);
163 struct dirent *ent; 165 struct dirent *ent;
164 char *buf; 166 char *buf;
165 struct stat st; 167 struct stat st;
166 168
167 if (!dir) { 169 if (!dir) {
168 fprintf(stderr, "Error opening directory %s: %s (%d)\n", 170 fprintf(stderr, "Error opening directory %s: %s (%d)\n",
169 path, strerror(errno), errno); 171 path, strerror(errno), errno);
170 return; 172 return;
171 } 173 }
172 if (is_git_dir(path)) { 174 if (is_git_dir(path)) {
173 add_repo(base, path, fn); 175 add_repo(base, path, fn);
174 goto end; 176 goto end;
175 } 177 }
176 if (is_git_dir(fmt("%s/.git", path))) { 178 if (is_git_dir(fmt("%s/.git", path))) {
177 add_repo(base, fmt("%s/.git", path), fn); 179 add_repo(base, fmt("%s/.git", path), fn);
178 goto end; 180 goto end;
179 } 181 }
180 while((ent = readdir(dir)) != NULL) { 182 while((ent = readdir(dir)) != NULL) {
181 if (ent->d_name[0] == '.') { 183 if (ent->d_name[0] == '.') {
182 if (ent->d_name[1] == '\0') 184 if (ent->d_name[1] == '\0')
183 continue; 185 continue;
184 if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') 186 if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
185 continue; 187 continue;
186 if (!ctx.cfg.scan_hidden_path) 188 if (!ctx.cfg.scan_hidden_path)
187 continue; 189 continue;
188 } 190 }
189 buf = malloc(strlen(path) + strlen(ent->d_name) + 2); 191 buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
190 if (!buf) { 192 if (!buf) {
191 fprintf(stderr, "Alloc error on %s: %s (%d)\n", 193 fprintf(stderr, "Alloc error on %s: %s (%d)\n",
192 path, strerror(errno), errno); 194 path, strerror(errno), errno);
193 exit(1); 195 exit(1);
194 } 196 }
195 sprintf(buf, "%s/%s", path, ent->d_name); 197 sprintf(buf, "%s/%s", path, ent->d_name);
196 if (stat(buf, &st)) { 198 if (stat(buf, &st)) {
197 fprintf(stderr, "Error checking path %s: %s (%d)\n", 199 fprintf(stderr, "Error checking path %s: %s (%d)\n",
198 buf, strerror(errno), errno); 200 buf, strerror(errno), errno);
199 free(buf); 201 free(buf);
200 continue; 202 continue;
201 } 203 }
202 if (S_ISDIR(st.st_mode)) 204 if (S_ISDIR(st.st_mode))
203 scan_path(base, buf, fn); 205 scan_path(base, buf, fn);
204 free(buf); 206 free(buf);
205 } 207 }