Merge branch 'stable'

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index eda8c677805fc01c7e81134a9bd615370e2fa7d2..378d795e854a3965c38673939fd3785f6e3fe92e 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -155,6 +155,8 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
                config_fn = fn;
                parse_configfile(xstrdup(p), &repo_config);
        }
+
+       free(rel);
 }
 
 static void scan_path(const char *base, const char *path, repo_config_fn fn)
@@ -183,6 +185,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) {
@@ -217,6 +221,7 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn
        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);