Merge branch 'stable'

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 47f3988b3723673b0ed06b104f41822711db46cf..e9878248346eaf8d48f6a5c8d3053fcf51d5270c 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,4 +1,14 @@
+/* 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"
 
 #define MAX_PATH 4096
@@ -35,36 +45,40 @@ static int is_git_dir(const char *path)
        return 1;
 }
 
-char *readfile(const char *path)
+struct cgit_repo *repo;
+repo_config_fn config_fn;
+char *owner;
+
+static void repo_config(const char *name, const char *value)
 {
-       FILE *f;
-       static char buf[MAX_PATH];
+       config_fn(repo, name, value);
+}
 
-       if (!(f = fopen(path, "r")))
-               return NULL;
-       buf[0] = 0;
-       fgets(buf, MAX_PATH, f);
-       fclose(f);
-       return buf;
+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)
+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;
+       size_t size;
 
        if (stat(path, &st)) {
                fprintf(stderr, "Error accessing %s: %s (%d)\n",
                        path, strerror(errno), errno);
                return;
        }
-       if ((pwd = getpwuid(st.st_uid)) == NULL) {
-               fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
-                       path, strerror(errno), errno);
+       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);
        else
@@ -74,20 +88,40 @@ static void add_repo(const char *base, const char *path)
                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->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))
-               repo->desc = xstrdup(readfile(p));
+               readfile(p, &repo->desc, &size);
 
        p = fmt("%s/README.html", path);
        if (!stat(p, &st))
                repo->readme = "README.html";
+
+       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;
@@ -95,7 +129,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);
@@ -125,13 +163,41 @@ 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)
+#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);
+       scan_path(path, path, fn);
 }