filter: make exit status local

[cgit.git] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 66c88c4b639b68b95001d57cec234e83a41d0af0..d4ee2798c0d9be1ec02a308b4072ac97b0889c42 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,13 +1,13 @@
 /* ui-repolist.c: functions for generating the repolist page
  *
- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 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)
  */
 
 #include "cgit.h"
+#include "ui-repolist.h"
 #include "html.h"
 #include "ui-shared.h"
 #include <strings.h>
@@ -32,7 +32,7 @@ static time_t read_agefile(char *path)
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {
-       char *path;
+       struct strbuf path = STRBUF_INIT;
        struct stat s;
        struct cgit_repo *r = (struct cgit_repo *)repo;
 
@@ -40,32 +40,36 @@ static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
                *mtime = repo->mtime;
                return 1;
        }
-       path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
-       if (stat(path, &s) == 0) {
-               *mtime = read_agefile(path);
+       strbuf_addf(&path, "%s/%s", repo->path, ctx.cfg.agefile);
+       if (stat(path.buf, &s) == 0) {
+               *mtime = read_agefile(path.buf);
                if (*mtime) {
                        r->mtime = *mtime;
-                       return 1;
+                       goto end;
                }
        }
 
-       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch ?
-                  repo->defbranch : "master");
-       if (stat(path, &s) == 0) {
+       strbuf_reset(&path);
+       strbuf_addf(&path, "%s/refs/heads/%s", repo->path,
+                   repo->defbranch ? repo->defbranch : "master");
+       if (stat(path.buf, &s) == 0) {
                *mtime = s.st_mtime;
                r->mtime = *mtime;
-               return 1;
+               goto end;
        }
 
-       path = fmt("%s/%s", repo->path, "packed-refs");
-       if (stat(path, &s) == 0) {
+       strbuf_reset(&path);
+       strbuf_addf(&path, "%s/%s", repo->path, "packed-refs");
+       if (stat(path.buf, &s) == 0) {
                *mtime = s.st_mtime;
                r->mtime = *mtime;
-               return 1;
+               goto end;
        }
 
        *mtime = 0;
        r->mtime = *mtime;
+end:
+       strbuf_release(&path);
        return (r->mtime != 0);
 }
 
@@ -128,13 +132,15 @@ static void print_pager(int items, int pagelen, char *search, char *sort)
 {
        int i, ofs;
        char *class = NULL;
-       html("<div class='pager'>");
+       html("<ul class='pager'>");
        for (i = 0, ofs = 0; ofs < items; i++, ofs = i * pagelen) {
                class = (ctx.qry.ofs == ofs) ? "current" : NULL;
+               html("<li>");
                cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
                                class, search, sort, ofs);
+               html("</li>");
        }
-       html("</div>");
+       html("</ul>");
 }
 
 static int cmp(const char *s1, const char *s2)
@@ -325,9 +331,13 @@ void cgit_print_site_readme()
 {
        if (!ctx.cfg.root_readme)
                return;
-       if (ctx.cfg.about_filter)
+       if (ctx.cfg.about_filter) {
+               ctx.cfg.about_filter->argv[1] = ctx.cfg.root_readme;
                cgit_open_filter(ctx.cfg.about_filter);
+       }
        html_include(ctx.cfg.root_readme);
-       if (ctx.cfg.about_filter)
+       if (ctx.cfg.about_filter) {
                cgit_close_filter(ctx.cfg.about_filter);
+               ctx.cfg.about_filter->argv[1] = NULL;
+       }
 }