Use absolute path for scanned repo readme

[cgit.git] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 95dc65b3ce1fdd9a27e9e0bfccfa78e54f562f23..ebfd41e5f16c8fc83b8ea17a9634eaf607a8ddb3 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,4 +1,5 @@
 #include "cgit.h"
+#include "configfile.h"
 #include "html.h"
 
 #define MAX_PATH 4096
@@ -35,9 +36,16 @@ static int is_git_dir(const char *path)
        return 1;
 }
 
-static void add_repo(const char *base, const char *path)
+struct cgit_repo *repo;
+repo_config_fn config_fn;
+
+static void repo_config(const char *name, const char *value)
+{
+       config_fn(repo, name, value);
+}
+
+static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
-       struct cgit_repo *repo;
        struct stat st;
        struct passwd *pwd;
        char *p;
@@ -64,6 +72,9 @@ static void add_repo(const char *base, const char *path)
        repo = cgit_add_repo(xstrdup(p));
        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) : "");
 
        p = fmt("%s/description", path);
@@ -72,10 +83,16 @@ static void add_repo(const char *base, const char *path)
 
        p = fmt("%s/README.html", path);
        if (!stat(p, &st))
-               repo->readme = "README.html";
+               repo->readme = xstrdup(p);
+
+       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)
+static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
        DIR *dir;
        struct dirent *ent;
@@ -83,7 +100,11 @@ static void scan_path(const char *base, const char *path)
        struct stat st;
 
        if (is_git_dir(path)) {
-               add_repo(base, path);
+               add_repo(base, path, fn);
+               return;
+       }
+       if (is_git_dir(fmt("%s/.git", path))) {
+               add_repo(base, fmt("%s/.git", path), fn);
                return;
        }
        dir = opendir(path);
@@ -113,13 +134,13 @@ static void scan_path(const char *base, const char *path)
                        continue;
                }
                if (S_ISDIR(st.st_mode))
-                       scan_path(base, buf);
+                       scan_path(base, buf, fn);
                free(buf);
        }
        closedir(dir);
 }
 
-void scan_tree(const char *path)
+void scan_tree(const char *path, repo_config_fn fn)
 {
-       scan_path(path, path);
+       scan_path(path, path, fn);
 }