1 files changed, 71 insertions, 89 deletions

diff --git a/scan-tree.c b/scan-tree.c
index beb584b..05caba5 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -12,38 +12,38 @@
 #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;
-	struct strbuf pathbuf = STRBUF_INIT;
-	int result = 0;
+	static char buf[MAX_PATH];
 
-	strbuf_addf(&pathbuf, "%s/objects", path);
-	if (stat(pathbuf.buf, &st)) {
+	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);
-		goto out;
+		return 0;
 	}
 	if (!S_ISDIR(st.st_mode))
-		goto out;
+		return 0;
 
-	strbuf_reset(&pathbuf);
-	strbuf_addf(&pathbuf, "%s/HEAD", path);
-	if (stat(pathbuf.buf, &st)) {
+	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);
-		goto out;
+		return 0;
 	}
 	if (!S_ISREG(st.st_mode))
-		goto out;
+		return 0;
 
-	result = 1;
-out:
-	strbuf_release(&pathbuf);
-	return result;
+	return 1;
 }
 
 struct cgit_repo *repo;
@@ -75,61 +75,47 @@ static char *xstrrchr(char *s, char *from, int c)
 	return from < s ? NULL : from;
 }
 
-static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
+static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
 	struct stat st;
 	struct passwd *pwd;
-	size_t pathlen;
-	struct strbuf rel = STRBUF_INIT;
-	char *p, *slash;
+	char *rel, *p, *slash;
 	int n;
 	size_t size;
 
-	if (stat(path->buf, &st)) {
+	if (stat(path, &st)) {
 		fprintf(stderr, "Error accessing %s: %s (%d)\n",
-			path->buf, strerror(errno), errno);
+			path, strerror(errno), errno);
 		return;
 	}
 
-	strbuf_addch(path, '/');
-	pathlen = path->len;
-
-	if (ctx.cfg.strict_export) {
-		strbuf_addstr(path, ctx.cfg.strict_export);
-		if(stat(path->buf, &st))
-			return;
-		strbuf_setlen(path, pathlen);
-	}
+	if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st))
+		return;
 
-	strbuf_addstr(path, "noweb");
-	if (!stat(path->buf, &st))
+	if (!stat(fmt("%s/noweb", path), &st))
 		return;
-	strbuf_setlen(path, pathlen);
 
-	if (strncmp(base, path->buf, strlen(base)))
-		strbuf_addbuf(&rel, path);
+	if (base == path)
+		rel = xstrdup(path);
 	else
-		strbuf_addstr(&rel, path->buf + strlen(base) + 1);
+		rel = xstrdup(path + strlen(base) + 1);
 
-	if (!strcmp(rel.buf + rel.len - 5, "/.git"))
-		strbuf_setlen(&rel, rel.len - 5);
+	if (!strcmp(rel + strlen(rel) - 5, "/.git"))
+		rel[strlen(rel) - 5] = '\0';
 
-	repo = cgit_add_repo(rel.buf);
+	repo = cgit_add_repo(rel);
 	config_fn = fn;
-	if (ctx.cfg.enable_git_config) {
-		strbuf_addstr(path, "config");
-		git_config_from_file(gitconfig_config, path->buf, NULL);
-		strbuf_setlen(path, pathlen);
-	}
+	if (ctx.cfg.enable_git_config)
+		git_config_from_file(gitconfig_config, fmt("%s/config", path), NULL);
 
 	if (ctx.cfg.remove_suffix)
 		if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
 			*p = '\0';
-	repo->path = xstrdup(path->buf);
+	repo->path = xstrdup(path);
 	while (!repo->owner) {
 		if ((pwd = getpwuid(st.st_uid)) == NULL) {
 			fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
-				path->buf, strerror(errno), errno);
+				path, strerror(errno), errno);
 			break;
 		}
 		if (pwd->pw_gecos)
@@ -139,32 +125,30 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
 	}
 
 	if (repo->desc == cgit_default_repo_desc || !repo->desc) {
-		strbuf_addstr(path, "description");
-		if (!stat(path->buf, &st))
-			readfile(path->buf, &repo->desc, &size);
-		strbuf_setlen(path, pathlen);
+		p = fmt("%s/description", path);
+		if (!stat(p, &st))
+			readfile(p, &repo->desc, &size);
 	}
 
 	if (!repo->readme) {
-		strbuf_addstr(path, "README.html");
-		if (!stat(path->buf, &st))
+		p = fmt("%s/README.html", path);
+		if (!stat(p, &st))
 			repo->readme = "README.html";
-		strbuf_setlen(path, pathlen);
 	}
 	if (ctx.cfg.section_from_path) {
 		n  = ctx.cfg.section_from_path;
 		if (n > 0) {
-			slash = rel.buf;
+			slash = rel;
 			while (slash && n && (slash = strchr(slash, '/')))
 				n--;
 		} else {
-			slash = rel.buf + rel.len;
-			while (slash && n && (slash = xstrrchr(rel.buf, slash, '/')))
+			slash = rel + strlen(rel);
+			while (slash && n && (slash = xstrrchr(rel, slash, '/')))
 				n++;
 		}
 		if (slash && !n) {
 			*slash = '\0';
-			repo->section = xstrdup(rel.buf);
+			repo->section = xstrdup(rel);
 			*slash = '/';
 			if (!prefixcmp(repo->name, repo->section)) {
 				repo->name += strlen(repo->section);
@@ -174,19 +158,19 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
 		}
 	}
 
-	strbuf_addstr(path, "cgitrc");
-	if (!stat(path->buf, &st))
-		parse_configfile(xstrdup(path->buf), &repo_config);
+	p = fmt("%s/cgitrc", path);
+	if (!stat(p, &st))
+		parse_configfile(xstrdup(p), &repo_config);
+
 
-	strbuf_release(&rel);
+	free(rel);
 }
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
 	DIR *dir = opendir(path);
 	struct dirent *ent;
-	struct strbuf pathbuf = STRBUF_INIT;
-	size_t pathlen = strlen(path);
+	char *buf;
 	struct stat st;
 
 	if (!dir) {
@@ -194,22 +178,14 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
 			path, strerror(errno), errno);
 		return;
 	}
-
-	strbuf_add(&pathbuf, path, strlen(path));
-	if (is_git_dir(pathbuf.buf)) {
-		add_repo(base, &pathbuf, fn);
+	if (is_git_dir(path)) {
+		add_repo(base, path, fn);
 		goto end;
 	}
-	strbuf_addstr(&pathbuf, "/.git");
-	if (is_git_dir(pathbuf.buf)) {
-		add_repo(base, &pathbuf, fn);
+	if (is_git_dir(fmt("%s/.git", path))) {
+		add_repo(base, fmt("%s/.git", path), fn);
 		goto end;
 	}
-	/*
-	 * Add one because we don't want to lose the trailing '/' when we
-	 * reset the length of pathbuf in the loop below.
-	 */
-	pathlen++;
 	while ((ent = readdir(dir)) != NULL) {
 		if (ent->d_name[0] == '.') {
 			if (ent->d_name[1] == '\0')
@@ -219,18 +195,24 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
 			if (!ctx.cfg.scan_hidden_path)
 				continue;
 		}
-		strbuf_setlen(&pathbuf, pathlen);
-		strbuf_addstr(&pathbuf, ent->d_name);
-		if (stat(pathbuf.buf, &st)) {
+		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",
-				pathbuf.buf, strerror(errno), errno);
+				buf, strerror(errno), errno);
+			free(buf);
 			continue;
 		}
 		if (S_ISDIR(st.st_mode))
-			scan_path(base, pathbuf.buf, fn);
+			scan_path(base, buf, fn);
+		free(buf);
 	}
 end:
-	strbuf_release(&pathbuf);
 	closedir(dir);
 }
 
@@ -238,7 +220,7 @@ end:
 
 void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn)
 {
-	struct strbuf line = STRBUF_INIT;
+	char line[MAX_PATH * 2], *z;
 	FILE *projects;
 	int err;
 
@@ -248,19 +230,19 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
 			projectsfile, strerror(errno), errno);
 		return;
 	}
-	while (strbuf_getline(&line, projects, '\n') != EOF) {
-		if (!line.len)
-			continue;
-		strbuf_insert(&line, 0, "/", 1);
-		strbuf_insert(&line, 0, path, strlen(path));
-		scan_path(path, line.buf, fn);
+	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);
-	strbuf_release(&line);
 }
 
 void scan_tree(const char *path, repo_config_fn fn)