Always #include corresponding .h in .c files

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 3d4e417edd8cf45631f7715d6c8f735d902def9a..0d3e0ade7d0be88e7b7b612fbf7ee1ba69f9f023 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,13 +1,14 @@
 /* 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)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "scan-tree.h"

 #include "configfile.h"
 #include "html.h"
 
 #include "configfile.h"
 #include "html.h"
 


@@ -47,25 +48,26 @@ 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;
-char *desc;

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

 {
 {

-       if (ctx.cfg.enable_gitweb_owner && !strcmp(key, "gitweb.owner"))
-               owner = xstrdup(value);
-       else if (ctx.cfg.enable_gitweb_desc && !strcmp(key, "gitweb.description"))
-               desc = xstrdup(value);
+       if (!strcmp(key, "gitweb.owner"))
+               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)
 static char *xstrrchr(char *s, char *from, int c)
 {
        while (from >= s && *from != c)


@@ -93,10 +95,6 @@ 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;
 

-       owner = NULL;
-       desc = NULL;
-       git_config_from_file(gitweb_config, fmt("%s/config", path), NULL);
-       

        if (base == path)
                rel = xstrdup(fmt("%s", path));
        else
        if (base == path)
                rel = xstrdup(fmt("%s", path));
        else


@@ -106,12 +104,15 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                rel[strlen(rel) - 5] = '\0';
 
        repo = cgit_add_repo(rel);
                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);
+

        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);


@@ -120,13 +121,10 @@ 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;

 
 

-       if (desc)
-               repo->desc = desc;
-       else {
+       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/description", path);
                if (!stat(p, &st))
                        readfile(p, &repo->desc, &size);


@@ -161,10 +159,9 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
        }
 
        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);
 }
 
        free(rel);
 }


@@ -189,7 +186,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
                add_repo(base, fmt("%s/.git", path), fn);
                goto end;
        }
                add_repo(base, fmt("%s/.git", path), fn);
                goto end;
        }

-       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[0] == '.') {
                        if (ent->d_name[1] == '\0')
                                continue;


@@ -226,7 +223,7 @@ 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",
        projects = fopen(projectsfile, "r");
        if (!projects) {
                fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n",