tests: add tests for xz compressed snapshots

[cgit.git] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index 2e87999b11b8f10fdbeab0c9b2b20e22b7b46184..6a2f65a86b2cda7826df470836f9757ba86abf98 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -10,6 +10,7 @@
 #include "scan-tree.h"
 #include "configfile.h"
 #include "html.h"
+#include <config.h>
 
 /* return 1 if path contains a objects/ directory and a HEAD file */
 static int is_git_dir(const char *path)
@@ -48,13 +49,15 @@ out:
 static struct cgit_repo *repo;
 static repo_config_fn config_fn;
 
-static void repo_config(const char *name, const char *value)
+static void scan_tree_repo_config(const char *name, const char *value)
 {
        config_fn(repo, name, value);
 }
 
 static int gitconfig_config(const char *key, const char *value, void *cb)
 {
+       const char *name;
+
        if (!strcmp(key, "gitweb.owner"))
                config_fn(repo, "owner", value);
        else if (!strcmp(key, "gitweb.description"))
@@ -63,8 +66,8 @@ static int gitconfig_config(const char *key, const char *value, void *cb)
                config_fn(repo, "section", value);
        else if (!strcmp(key, "gitweb.homepage"))
                config_fn(repo, "homepage", value);
-       else if (starts_with(key, "cgit."))
-               config_fn(repo, key + 5, value);
+       else if (skip_prefix(key, "cgit.", &name))
+               config_fn(repo, name, value);
 
        return 0;
 }
@@ -176,7 +179,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
 
        strbuf_addstr(path, "cgitrc");
        if (!stat(path->buf, &st))
-               parse_configfile(path->buf, &repo_config);
+               parse_configfile(path->buf, &scan_tree_repo_config);
 
        strbuf_release(&rel);
 }
@@ -246,7 +249,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
                        projectsfile, strerror(errno), errno);
                return;
        }
-       while (strbuf_getline(&line, projects, '\n') != EOF) {
+       while (strbuf_getline(&line, projects) != EOF) {
                if (!line.len)
                        continue;
                strbuf_insert(&line, 0, "/", 1);