ui-patch: Flush stdout after outputting data

[ps-cgit] / scan-tree.c

diff --git a/scan-tree.c b/scan-tree.c
index a1ec8fb7ac73cbc4416245087390849d199f822c..87fa0c78a96273c4f2504ae0132c340f6ee9ba4d 100644 (file)
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -1,7 +1,6 @@
 /* scan-tree.c
- * 
- * Copyright (C) 2008-2009 Lars Hjemli
- * Copyright (C) 2010, 2012 Jason A. Donenfeld <Jason@zx2c4.com>
+ *
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -62,7 +61,7 @@ static int gitconfig_config(const char *key, const char *value, void *cb)
                config_fn(repo, "desc", value);
        else if (!strcmp(key, "gitweb.category"))
                config_fn(repo, "section", value);
-       else if (!prefixcmp(key, "cgit."))
+       else if (starts_with(key, "cgit."))
                config_fn(repo, key + 5, value);
 
        return 0;
@@ -106,7 +105,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
                return;
        strbuf_setlen(path, pathlen);
 
-       if (strncmp(base, path->buf, strlen(base)))
+       if (!starts_with(path->buf, base))
                strbuf_addbuf(&rel, path);
        else
                strbuf_addstr(&rel, path->buf + strlen(base) + 1);
@@ -116,6 +115,7 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
        else if (rel.len && rel.buf[rel.len - 1] == '/')
                strbuf_setlen(&rel, rel.len - 1);
 
+       fprintf(stderr, "add_repo(): %s\n", rel.buf);
        repo = cgit_add_repo(rel.buf);
        config_fn = fn;
        if (ctx.cfg.enable_git_config) {
@@ -147,28 +147,23 @@ static void add_repo(const char *base, struct strbuf *path, repo_config_fn fn)
                strbuf_setlen(path, pathlen);
        }
 
-       if (!repo->readme) {
-               strbuf_addstr(path, "README.html");
-               if (!stat(path->buf, &st))
-                       repo->readme = "README.html";
-               strbuf_setlen(path, pathlen);
-       }
        if (ctx.cfg.section_from_path) {
-               n  = ctx.cfg.section_from_path;
+               n = ctx.cfg.section_from_path;
                if (n > 0) {
-                       slash = rel.buf;
-                       while (slash && n && (slash = strchr(slash, '/')))
+                       slash = rel.buf - 1;
+                       while (slash && n && (slash = strchr(slash + 1, '/')))
                                n--;
                } else {
                        slash = rel.buf + rel.len;
-                       while (slash && n && (slash = xstrrchr(rel.buf, slash, '/')))
+                       while (slash && n && (slash = xstrrchr(rel.buf, slash - 1, '/')))
                                n++;
                }
                if (slash && !n) {
                        *slash = '\0';
                        repo->section = xstrdup(rel.buf);
                        *slash = '/';
-                       if (!prefixcmp(repo->name, repo->section)) {
+                       fprintf(stderr, "repo->name %s, repo->section %s\n", repo->name, repo->section);
+                       if (starts_with(repo->name, repo->section)) {
                                repo->name += strlen(repo->section);
                                if (*repo->name == '/')
                                        repo->name++;
@@ -191,6 +186,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
        size_t pathlen = strlen(path);
        struct stat st;
 
+       fprintf(stderr, "scan_path(): %s\n", path);
        if (!dir) {
                fprintf(stderr, "Error opening directory %s: %s (%d)\n",
                        path, strerror(errno), errno);
@@ -199,6 +195,7 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn)
 
        strbuf_add(&pathbuf, path, strlen(path));
        if (is_git_dir(pathbuf.buf)) {
+               fprintf(stderr, "scan_path() is_git_dir: %s\n", path);
                add_repo(base, &pathbuf, fn);
                goto end;
        }
@@ -236,8 +233,6 @@ end:
        closedir(dir);
 }
 
-#define lastc(s) s[strlen(s) - 1]
-
 void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn)
 {
        struct strbuf line = STRBUF_INIT;