1 files changed, 5 insertions, 14 deletions

diff --git a/scan-tree.c b/scan-tree.c
index 47f3988..4da21a4 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -22,78 +22,69 @@ static int is_git_dir(const char *path)
 	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;
 }
 
-char *readfile(const char *path)
-{
-	FILE *f;
-	static char buf[MAX_PATH];
-
-	if (!(f = fopen(path, "r")))
-		return NULL;
-	buf[0] = 0;
-	fgets(buf, MAX_PATH, f);
-	fclose(f);
-	return buf;
-}
-
 static void add_repo(const char *base, const char *path)
 {
 	struct cgit_repo *repo;
 	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 ((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))
-		repo->desc = xstrdup(readfile(p));
+		readfile(p, &repo->desc, &size);
 
 	p = fmt("%s/README.html", path);
 	if (!stat(p, &st))
 		repo->readme = "README.html";
 }
 
 static void scan_path(const char *base, const char *path)
 {
 	DIR *dir;
 	struct dirent *ent;
 	char *buf;
 	struct stat st;
 
 	if (is_git_dir(path)) {
 		add_repo(base, path);
 		return;