Add support for 'enable-gitweb-owner' option

When this option is enabled (which it is by default), cgit will lookup
the 'gitweb.owner' setting in each git config file found when processing
the 'scan-path' option.

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

1 files changed, 24 insertions, 9 deletions

diff --git a/scan-tree.c b/scan-tree.c
index a83a78c..e987824 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -26,91 +26,106 @@ static int is_git_dir(const char *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_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;
+char *owner;
 
 static void repo_config(const char *name, const char *value)
 {
 	config_fn(repo, name, value);
 }
 
+static int git_owner_config(const char *key, const char *value, void *cb)
+{
+	if (!strcmp(key, "gitweb.owner"))
+		owner = xstrdup(value);
+	return 0;
+}
+
 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;
-	}
+
+	owner = NULL;
+	if (ctx.cfg.enable_gitweb_owner)
+		git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
 	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));
 	if (ctx.cfg.remove_suffix)
 		if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
 			*p = '\0';
 	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) : "");
+	while (!owner) {
+		if ((pwd = getpwuid(st.st_uid)) == NULL) {
+			fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
+				path, strerror(errno), errno);
+			break;
+		}
+		if (pwd->pw_gecos)
+			if ((p = strchr(pwd->pw_gecos, ',')))
+				*p = '\0';
+		owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name);
+	}
+	repo->owner = owner;
 
 	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)) {