1 files changed, 121 insertions, 26 deletions

diff --git a/scan-tree.c b/scan-tree.c
index ebfd41e..627af1b 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,3 +1,12 @@
+/* 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"
@@ -38,17 +47,33 @@ 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 char *xstrrchr(char *s, char *from, int c)
+{
+        while (from >= s && *from != c)
+                from--;
+        return from < s ? NULL : from;
+}
+
 static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
         struct stat st;
         struct passwd *pwd;
-        char *p;
+        char *rel, *p, *slash;
+        int n;
         size_t size;
 
         if (stat(path, &st)) {
@@ -56,34 +81,74 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                         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 (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st))
                 return;
-        }
+
+        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);
+                rel = xstrdup(fmt("%s", path));
         else
-                p = fmt("%s", path + strlen(base) + 1);
+                rel = xstrdup(fmt("%s", path + strlen(base) + 1));
 
-        if (!strcmp(p + strlen(p) - 5, "/.git"))
-                p[strlen(p) - 5] = '\0';
+        if (!strcmp(rel + strlen(rel) - 5, "/.git"))
+                rel[strlen(rel) - 5] = '\0';
 
-        repo = cgit_add_repo(xstrdup(p));
+        repo = cgit_add_repo(rel);
+        if (ctx.cfg.remove_suffix)
+                if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
+                        *p = '\0';
         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))
                 readfile(p, &repo->desc, &size);
 
-        p = fmt("%s/README.html", path);
-        if (!stat(p, &st))
-                repo->readme = xstrdup(p);
+        if (!repo->readme) {
+                p = fmt("%s/README.html", path);
+                if (!stat(p, &st))
+                        repo->readme = "README.html";
+        }
+        if (ctx.cfg.section_from_path) {
+                n  = ctx.cfg.section_from_path;
+                if (n > 0) {
+                        slash = rel;
+                        while (slash && n && (slash = strchr(slash, '/')))
+                                n--;
+                } else {
+                        slash = rel + strlen(rel);
+                        while (slash && n && (slash = xstrrchr(rel, slash, '/')))
+                                n++;
+                }
+                if (slash && !n) {
+                        *slash = '\0';
+                        repo->section = xstrdup(rel);
+                        *slash = '/';
+                        if (!prefixcmp(repo->name, repo->section)) {
+                                repo->name += strlen(repo->section);
+                                if (*repo->name == '/')
+                                        repo->name++;
+                        }
+                }
+        }
 
         p = fmt("%s/cgitrc", path);
         if (!stat(p, &st)) {
@@ -94,24 +159,23 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
 {
-        DIR *dir;
+        DIR *dir = opendir(path);
         struct dirent *ent;
         char *buf;
         struct stat st;
 
+        if (!dir) {
+                fprintf(stderr, "Error opening directory %s: %s (%d)\n",
+                        path, strerror(errno), errno);
+                return;
+        }
         if (is_git_dir(path)) {
                 add_repo(base, path, fn);
-                return;
+                goto end;
         }
         if (is_git_dir(fmt("%s/.git", path))) {
                 add_repo(base, fmt("%s/.git", path), fn);
-                return;
-        }
-        dir = opendir(path);
-        if (!dir) {
-                fprintf(stderr, "Error opening directory %s: %s (%d)\n",
-                        path, strerror(errno), errno);
-                return;
+                goto end;
         }
         while((ent = readdir(dir)) != NULL) {
                 if (ent->d_name[0] == '.') {
@@ -119,6 +183,8 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                                 continue;
                         if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
                                 continue;
+                        if (!ctx.cfg.scan_hidden_path)
+                                continue;
                 }
                 buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
                 if (!buf) {
@@ -137,9 +203,38 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                         scan_path(base, buf, fn);
                 free(buf);
         }
+end:
         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);