cgit.c: Remove parameter from guess_defbranch()

[cgit.git] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index e9878248346eaf8d48f6a5c8d3053fcf51d5270c..10d90f49a5debc4361162b2b873dfd645bc13d6f 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,7 +1,7 @@
 /* scan-tree.c
  * 
  * Copyright (C) 2008-2009 Lars Hjemli
 /* 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)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -47,25 +47,39 @@ 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)
+static int gitconfig_config(const char *key, const char *value, void *cb)

 {
        if (!strcmp(key, "gitweb.owner"))
 {
        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;
 }
 
        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;
 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)) {
        size_t size;
 
        if (stat(path, &st)) {


@@ -73,27 +87,31 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                        path, strerror(errno), errno);
                return;
        }
                        path, strerror(errno), errno);
                return;
        }

+
+       if (ctx.cfg.strict_export && stat(fmt("%s/%s", path, ctx.cfg.strict_export), &st))
+               return;
+

        if (!stat(fmt("%s/noweb", path), &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)
        if (base == path)

-               p = fmt("%s", path);
+               rel = xstrdup(fmt("%s", path));

        else
        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(rel);
+       config_fn = fn;
+       if (ctx.cfg.enable_git_config)
+               git_config_from_file(gitconfig_config, fmt("%s/config", path), NULL);

 
 

-       repo = cgit_add_repo(xstrdup(p));

        if (ctx.cfg.remove_suffix)
                if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
                        *p = '\0';
        if (ctx.cfg.remove_suffix)
                if ((p = strrchr(repo->url, '.')) && !strcmp(p, ".git"))
                        *p = '\0';

-       repo->name = repo->url;

        repo->path = xstrdup(path);
        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);
                if ((pwd = getpwuid(st.st_uid)) == NULL) {
                        fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
                                path, strerror(errno), errno);


@@ -102,52 +120,79 @@ 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';
                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);
+       }

 
 

-       p = fmt("%s/README.html", path);
-       if (!stat(p, &st))
-               repo->readme = "README.html";
+       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);
 
        p = fmt("%s/cgitrc", path);

-       if (!stat(p, &st)) {
-               config_fn = fn;
+       if (!stat(p, &st))

                parse_configfile(xstrdup(p), &repo_config);
                parse_configfile(xstrdup(p), &repo_config);

-       }
+
+
+       free(rel);

 }
 
 static void scan_path(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;
 
        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);
        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);
        }
        if (is_git_dir(fmt("%s/.git", path))) {
                add_repo(base, fmt("%s/.git", path), fn);

-               return;
+               goto end;

        }
        }

-       dir = opendir(path);
-       if (!dir) {
-               fprintf(stderr, "Error opening directory %s: %s (%d)\n",
-                       path, strerror(errno), errno);
-               return;
-       }
-       while((ent = readdir(dir)) != NULL) {
+       while ((ent = readdir(dir)) != NULL) {

                if (ent->d_name[0] == '.') {
                        if (ent->d_name[1] == '\0')
                                continue;
                        if (ent->d_name[1] == '.' && ent->d_name[2] == '\0')
                                continue;
                if (ent->d_name[0] == '.') {
                        if (ent->d_name[1] == '\0')
                                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) {
                }
                buf = malloc(strlen(path) + strlen(ent->d_name) + 2);
                if (!buf) {


@@ -166,6 +211,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                        scan_path(base, buf, fn);
                free(buf);
        }
                        scan_path(base, buf, fn);
                free(buf);
        }

+end:

        closedir(dir);
 }
 
        closedir(dir);
 }
 


@@ -176,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;
        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);
        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);
        }
        while (fgets(line, sizeof(line), projects) != NULL) {
                for (z = &lastc(line);