| -rw-r--r-- | scan-tree.c | 147 |
1 files changed, 121 insertions, 26 deletions
diff --git a/scan-tree.c b/scan-tree.c index ebfd41e..627af1b 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -1 +1,10 @@ +/* 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" @@ -40,2 +49,3 @@ struct cgit_repo *repo; repo_config_fn config_fn; +char *owner; @@ -46,2 +56,16 @@ static void repo_config(const char *name, const char *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) @@ -50,3 +74,4 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) struct passwd *pwd; - char *p; + char *rel, *p, *slash; + int n; size_t size; @@ -58,22 +83,38 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) } - if ((pwd = getpwuid(st.st_uid)) == NULL) { - fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", - path, strerror(errno), errno); + + if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st)) 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); - 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; @@ -83,5 +124,29 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) - p = fmt("%s/README.html", path); - if (!stat(p, &st)) - repo->readme = xstrdup(p); + 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++; + } + } + } @@ -96,3 +161,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) { - DIR *dir; + DIR *dir = opendir(path); struct dirent *ent; @@ -101,5 +166,10 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) + if (!dir) { + fprintf(stderr, "Error opening directory %s: %s (%d)\n", + path, strerror(errno), errno); + return; + } if (is_git_dir(path)) { add_repo(base, path, fn); - return; + goto end; } @@ -107,9 +177,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) add_repo(base, fmt("%s/.git", path), fn); - return; - } - dir = opendir(path); - if (!dir) { - fprintf(stderr, "Error opening directory %s: %s (%d)\n", - path, strerror(errno), errno); - return; + goto end; } @@ -121,2 +185,4 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) continue; + if (!ctx.cfg.scan_hidden_path) + continue; } @@ -139,2 +205,3 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) } +end: closedir(dir); @@ -142,2 +209,30 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) +#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) |