summaryrefslogtreecommitdiffabout
path: root/scan-tree.c
authorLars Hjemli <hjemli@gmail.com>2010-09-19 16:46:17 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-09-19 16:46:17 (UTC)
commit536c7a1eb201b44b9266babe087cb6f2b75e4a7f (patch) (side-by-side diff)
tree899ecd47f770b1909d107b0f1c777e8b032b25fc /scan-tree.c
parente76a1ea427792aaa331cdec70d7d4ff1fb3422e0 (diff)
parent797110e39d5d433638c82cf27d584ed9b8b93bb7 (diff)
downloadcgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.zip
cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.tar.gz
cgit-536c7a1eb201b44b9266babe087cb6f2b75e4a7f.tar.bz2
Merge branch 'lh/section-from-path'
Conflicts: scan-tree.c
Diffstat (limited to 'scan-tree.c') (more/less context) (ignore whitespace changes)
-rw-r--r--scan-tree.c42
1 files changed, 36 insertions, 6 deletions
diff --git a/scan-tree.c b/scan-tree.c
index 780d405..b5b50f3 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -52,51 +52,59 @@ 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 char *xstrrchr(char *s, char *from, int c)
+{
+ while (from >= s && *from != c)
+ from--;
+ return from < s ? NULL : from;
+}
+
static void add_repo(const char *base, const char *path, repo_config_fn fn)
{
struct stat st;
struct passwd *pwd;
- char *p;
+ char *rel, *p, *slash;
+ int n;
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;
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);
+ rel = xstrdup(fmt("%s", path));
else
- p = fmt("%s", path + strlen(base) + 1);
+ rel = xstrdup(fmt("%s", path + strlen(base) + 1));
- if (!strcmp(p + strlen(p) - 5, "/.git"))
- p[strlen(p) - 5] = '\0';
+ if (!strcmp(rel + strlen(rel) - 5, "/.git"))
+ rel[strlen(rel) - 5] = '\0';
- repo = cgit_add_repo(xstrdup(p));
+ repo = cgit_add_repo(rel);
if (ctx.cfg.remove_suffix)
if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
*p = '\0';
repo->name = repo->url;
repo->path = xstrdup(path);
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)
@@ -106,24 +114,46 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
}
repo->owner = owner;
p = fmt("%s/description", path);
if (!stat(p, &st))
readfile(p, &repo->desc, &size);
if (!repo->readme) {
p = fmt("%s/README.html", path);
if (!stat(p, &st))
repo->readme = "README.html";
}
+ if (ctx.cfg.section_from_path) {
+ n = ctx.cfg.section_from_path;
+ if (n > 0) {
+ slash = rel;
+ while (slash && n && (slash = strchr(slash, '/')))
+ n--;
+ } else {
+ slash = rel + strlen(rel);
+ while (slash && n && (slash = xstrrchr(rel, slash, '/')))
+ n++;
+ }
+ if (slash && !n) {
+ *slash = '\0';
+ repo->section = xstrdup(rel);
+ *slash = '/';
+ if (!prefixcmp(repo->name, repo->section)) {
+ repo->name += strlen(repo->section);
+ if (*repo->name == '/')
+ repo->name++;
+ }
+ }
+ }
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;