Merge branch 'stable'

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 9bf9b38b6af6dc891db10a686c3bf097bdcf658b..e9878248346eaf8d48f6a5c8d3053fcf51d5270c 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -47,12 +47,20 @@ static int is_git_dir(const char *path)
 
 struct cgit_repo *repo;
 repo_config_fn config_fn;
 
 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 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;
 static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
        struct stat st;


@@ -67,11 +75,10 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        }
        if (!stat(fmt("%s/noweb", path), &st))
                return;
        }
        if (!stat(fmt("%s/noweb", path), &st))
                return;

-       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
        if (base == path)
                p = fmt("%s", path);
        else


@@ -81,12 +88,23 @@ 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));
                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);
        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;

 
        p = fmt("%s/description", path);
        if (!stat(p, &st))
 
        p = fmt("%s/description", path);
        if (!stat(p, &st))