cgit.c: Remove parameter from guess_defbranch()

[cgit.git] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 627af1b23240dbb8401d61d8e897afaf0eb05ca4..10d90f49a5debc4361162b2b873dfd645bc13d6f 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,7 +1,7 @@
 /* scan-tree.c
  * 
  * Copyright (C) 2008-2009 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2010, 2012 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -47,17 +47,23 @@ 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)
+static int gitconfig_config(const char *key, const char *value, void *cb)
 {
        if (!strcmp(key, "gitweb.owner"))
-               owner = xstrdup(value);
+               config_fn(repo, "owner", value);
+       else if (!strcmp(key, "gitweb.description"))
+               config_fn(repo, "desc", value);
+       else if (!strcmp(key, "gitweb.category"))
+               config_fn(repo, "section", value);
+       else if (!prefixcmp(key, "cgit."))
+               config_fn(repo, key + 5, value);
+
        return 0;
 }
 
@@ -88,9 +94,6 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        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)
                rel = xstrdup(fmt("%s", path));
        else
@@ -100,12 +103,15 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                rel[strlen(rel) - 5] = '\0';
 
        repo = cgit_add_repo(rel);
+       config_fn = fn;
+       if (ctx.cfg.enable_git_config)
+               git_config_from_file(gitconfig_config, fmt("%s/config", path), NULL);
+
        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) {
+       while (!repo->owner) {
                if ((pwd = getpwuid(st.st_uid)) == NULL) {
                        fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
                                path, strerror(errno), errno);
@@ -114,13 +120,14 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                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 = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name);
        }
-       repo->owner = owner;
 
-       p = fmt("%s/description", path);
-       if (!stat(p, &st))
-               readfile(p, &repo->desc, &size);
+       if (repo->desc == cgit_default_repo_desc || !repo->desc) {
+               p = fmt("%s/description", path);
+               if (!stat(p, &st))
+                       readfile(p, &repo->desc, &size);
+       }
 
        if (!repo->readme) {
                p = fmt("%s/README.html", path);
@@ -151,10 +158,11 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        }
 
        p = fmt("%s/cgitrc", path);
-       if (!stat(p, &st)) {
-               config_fn = fn;
+       if (!stat(p, &st))
                parse_configfile(xstrdup(p), &repo_config);
-       }
+
+
+       free(rel);
 }
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
@@ -177,7 +185,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                add_repo(base, fmt("%s/.git", path), fn);
                goto end;
        }
-       while((ent = readdir(dir)) != NULL) {
+       while ((ent = readdir(dir)) != NULL) {
                if (ent->d_name[0] == '.') {
                        if (ent->d_name[1] == '\0')
                                continue;
@@ -214,11 +222,12 @@ 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);
+               return;
        }
        while (fgets(line, sizeof(line), projects) != NULL) {
                for (z = &lastc(line);