]> gitweb.ps.run Git - ps-cgit/blobdiff - ui-repolist.c
authors: specify maintainers
[ps-cgit] / ui-repolist.c
index 76fe71a9a4bfca98c8340deba3b8ee68cb69b9c3..7b1fec307f2f0927034d9b8299d2bd9a379730cb 100644 (file)
@@ -1,7 +1,6 @@
 /* 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)
@@ -33,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;
 
@@ -41,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);
 }
 
@@ -103,7 +106,9 @@ static int is_in_url(struct cgit_repo *repo)
 
 static void print_sort_header(const char *title, const char *sort)
 {
-       htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
+       html("<th class='left'><a href='");
+       html_attr(cgit_rooturl());
+       htmlf("?s=%s", sort);
        if (ctx.qry.search) {
                html("&amp;q=");
                html_url_arg(ctx.qry.search);
@@ -329,7 +334,7 @@ void cgit_print_site_readme()
        if (!ctx.cfg.root_readme)
                return;
        if (ctx.cfg.about_filter)
-               cgit_open_filter(ctx.cfg.about_filter);
+               cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme);
        html_include(ctx.cfg.root_readme);
        if (ctx.cfg.about_filter)
                cgit_close_filter(ctx.cfg.about_filter);