aboutsummaryrefslogtreecommitdiffstats
path: root/scan-tree.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2010-08-04 03:10:29 +0200
committerLars Hjemli <hjemli@gmail.com>2010-08-04 03:10:29 +0200
commitaec9c245e7eaf444c7ae1851e3eda3b30748950f (patch)
tree04d5e945781441f2589ae8eb44bee8d5a2b17c2b /scan-tree.c
parente6c960c7c0f0d2e54b51cc43ef190df3ce52755e (diff)
parent119397b175874bd606952e93b7249ae4ffb9afbe (diff)
downloadcgit-aec9c245e7eaf444c7ae1851e3eda3b30748950f.tar.gz
cgit-aec9c245e7eaf444c7ae1851e3eda3b30748950f.tar.xz
Merge branch 'jd/gitolite'
Diffstat (limited to 'scan-tree.c')
-rw-r--r--scan-tree.c73
1 files changed, 64 insertions, 9 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 1e18f3c..e987824 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,3 +1,12 @@
+/* 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"
@@ -38,12 +47,20 @@ static int is_git_dir(const char *path)
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;
@@ -58,11 +75,10 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
}
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
@@ -72,12 +88,23 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
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))
@@ -142,6 +169,34 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
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);