Add support for 'remove-suffix' option

When this option is enabled, the '.git' suffix of repository directories
found while processing the 'scan-path' option will be removed.

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

1 files changed, 3 insertions, 0 deletions

diff --git a/scan-tree.c b/scan-tree.c
index 9bf9b38..a83a78c 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -52,64 +52,67 @@ 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));
+	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) : "");
 
 	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;