Diffstat (limited to 'scan-tree.c')
| -rw-r--r-- | scan-tree.c | 73 |
1 files changed, 8 insertions, 65 deletions
diff --git a/scan-tree.c b/scan-tree.c index e987824..dbca797 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -1,12 +1,3 @@ -/* 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" @@ -47,20 +38,12 @@ 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; @@ -73,12 +56,11 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) path, strerror(errno), errno); return; } - if (!stat(fmt("%s/noweb", path), &st)) + 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 @@ -88,23 +70,12 @@ 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); - 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 = (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)) @@ -169,34 +140,6 @@ 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); |