X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9a725f4f0991710336584bb284a83dcf5fa5bf1e..334aed8ab42b9513af0f4458081abc033d66c535:/scan-tree.c diff --git a/scan-tree.c b/scan-tree.c index a1ec8fb..7cd8f08 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -1,7 +1,7 @@ /* scan-tree.c * * Copyright (C) 2008-2009 Lars Hjemli - * Copyright (C) 2010, 2012 Jason A. Donenfeld + * Copyright (C) 2010-2013 Jason A. Donenfeld * * Licensed under GNU General Public License v2 * (see COPYING for full license text) @@ -147,21 +147,15 @@ 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) {