Add support for 'project-list' option

This option specifies the location of a projectlist file as used by
gitweb - when 'scan-tree' is later specified, only the projects listed in
the projectlist file will be added.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 37 insertions, 0 deletions

diff --git a/scan-tree.c b/scan-tree.c
index 1e18f3c..9bf9b38 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,148 +1,185 @@
+/* scan-tree.c
+ * 
+ * Copyright (C) 2008-2009 Lars Hjemli
+ * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ *
+ * Licensed under GNU General Public License v2
+ *   (see COPYING for full license text)
+ */
+
 #include "cgit.h"
 #include "configfile.h"
 #include "html.h"
 
 #define MAX_PATH 4096
 
 /* return 1 if path contains a objects/ directory and a HEAD file */
 static int is_git_dir(const char *path)
 {
 	struct stat st;
 	static char buf[MAX_PATH];
 
 	if (snprintf(buf, MAX_PATH, "%s/objects", path) >= MAX_PATH) {
 		fprintf(stderr, "Insanely long path: %s\n", path);
 		return 0;
 	}
 	if (stat(buf, &st)) {
 		if (errno != ENOENT)
 			fprintf(stderr, "Error checking path %s: %s (%d)\n",
 				path, strerror(errno), errno);
 		return 0;
 	}
 	if (!S_ISDIR(st.st_mode))
 		return 0;
 
 	sprintf(buf, "%s/HEAD", path);
 	if (stat(buf, &st)) {
 		if (errno != ENOENT)
 			fprintf(stderr, "Error checking path %s: %s (%d)\n",
 				path, strerror(errno), errno);
 		return 0;
 	}
 	if (!S_ISREG(st.st_mode))
 		return 0;
 
 	return 1;
 }
 
 struct cgit_repo *repo;
 repo_config_fn config_fn;
 
 static void repo_config(const char *name, const char *value)
 {
 	config_fn(repo, name, value);
 }
 
 static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
 	struct stat st;
 	struct passwd *pwd;
 	char *p;
 	size_t size;
 
 	if (stat(path, &st)) {
 		fprintf(stderr, "Error accessing %s: %s (%d)\n",
 			path, strerror(errno), errno);
 		return;
 	}
 	if (!stat(fmt("%s/noweb", path), &st))
 		return;
 	if ((pwd = getpwuid(st.st_uid)) == NULL) {
 		fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
 			path, strerror(errno), errno);
 		return;
 	}
 	if (base == path)
 		p = fmt("%s", path);
 	else
 		p = fmt("%s", path + strlen(base) + 1);
 
 	if (!strcmp(p + strlen(p) - 5, "/.git"))
 		p[strlen(p) - 5] = '\0';
 
 	repo = cgit_add_repo(xstrdup(p));
 	repo->name = repo->url;
 	repo->path = xstrdup(path);
 	p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL;
 	if (p)
 		*p = '\0';
 	repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : "");
 
 	p = fmt("%s/description", path);
 	if (!stat(p, &st))
 		readfile(p, &repo->desc, &size);
 
 	p = fmt("%s/README.html", path);
 	if (!stat(p, &st))
 		repo->readme = "README.html";
 
 	p = fmt("%s/cgitrc", path);
 	if (!stat(p, &st)) {
 		config_fn = fn;
 		parse_configfile(xstrdup(p), &repo_config);
 	}
 }
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
 	DIR *dir;
 	struct dirent *ent;
 	char *buf;
 	struct stat st;
 
 	if (is_git_dir(path)) {
 		add_repo(base, path, fn);
 		return;
 	}
 	if (is_git_dir(fmt("%s/.git", path))) {
 		add_repo(base, fmt("%s/.git", path), fn);
 		return;
 	}
 	dir = opendir(path);
 	if (!dir) {
 		fprintf(stderr, "Error opening directory %s: %s (%d)\n",
 			path, strerror(errno), errno);
 		return;
 	}
 	while((ent = readdir(dir)) != NULL) {
 		if (ent->d_name[0] == '.') {
 			if (ent->d_name[1] == '\0')
 				continue;
 			if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
 				continue;
 		}
 		buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
 		if (!buf) {
 			fprintf(stderr, "Alloc error on %s: %s (%d)\n",
 				path, strerror(errno), errno);
 			exit(1);
 		}
 		sprintf(buf, "%s/%s", path, ent->d_name);
 		if (stat(buf, &st)) {
 			fprintf(stderr, "Error checking path %s: %s (%d)\n",
 				buf, strerror(errno), errno);
 			free(buf);
 			continue;
 		}
 		if (S_ISDIR(st.st_mode))
 			scan_path(base, buf, fn);
 		free(buf);
 	}
 	closedir(dir);
 }
 
+#define lastc(s) s[strlen(s) - 1]
+
+void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn)
+{
+	char line[MAX_PATH * 2], *z;
+	FILE *projects;
+	int err;
+	
+	projects = fopen(projectsfile, "r");
+	if (!projects) {
+		fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n",
+			projectsfile, strerror(errno), errno);
+	}
+	while (fgets(line, sizeof(line), projects) != NULL) {
+		for (z = &lastc(line);
+		     strlen(line) && strchr("\n\r", *z);
+		     z = &lastc(line))
+			*z = '\0';
+		if (strlen(line))
+			scan_path(path, fmt("%s/%s", path, line), fn);
+	}
+	if ((err = ferror(projects))) {
+		fprintf(stderr, "Error reading from projectsfile %s: %s (%d)\n",
+			projectsfile, strerror(err), err);
+	}
+	fclose(projects);
+}
+
 void scan_tree(const char *path, repo_config_fn fn)
 {
 	scan_path(path, path, fn);
 }