Bump version.

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 76fe71a9a4bfca98c8340deba3b8ee68cb69b9c3..c2bcce177c23da9dabf9f5becbec3c71a0abc3c0 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,7 +1,6 @@
 /* ui-repolist.c: functions for generating the repolist page
  *
 /* 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)
  *
  * 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)
 {
 
 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;
 
        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;
        }
                *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;
                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;
                *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;
                *mtime = s.st_mtime;
                r->mtime = *mtime;

-               return 1;
+               goto end;

        }
 
        *mtime = 0;
        r->mtime = *mtime;
        }
 
        *mtime = 0;
        r->mtime = *mtime;

+end:
+       strbuf_release(&path);

        return (r->mtime != 0);
 }
 
        return (r->mtime != 0);
 }
 


@@ -96,14 +99,16 @@ static int is_in_url(struct cgit_repo *repo)
 {
        if (!ctx.qry.url)
                return 1;
 {
        if (!ctx.qry.url)
                return 1;

-       if (repo->url && !prefixcmp(repo->url, ctx.qry.url))
+       if (repo->url && starts_with(repo->url, ctx.qry.url))

                return 1;
        return 0;
 }
 
 static void print_sort_header(const char *title, const char *sort)
 {
                return 1;
        return 0;
 }
 
 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);
        if (ctx.qry.search) {
                html("&amp;q=");
                html_url_arg(ctx.qry.search);


@@ -254,9 +259,9 @@ void cgit_print_repolist()
                ++columns;
 
        ctx.page.title = ctx.cfg.root_title;
                ++columns;
 
        ctx.page.title = ctx.cfg.root_title;

-       cgit_print_http_headers(&ctx);
-       cgit_print_docstart(&ctx);
-       cgit_print_pageheader(&ctx);
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();

 
        if (ctx.cfg.index_header)
                html_include(ctx.cfg.index_header);
 
        if (ctx.cfg.index_header)
                html_include(ctx.cfg.index_header);


@@ -301,7 +306,13 @@ void cgit_print_repolist()
                html_link_close();
                html("</td><td>");
                if (ctx.cfg.enable_index_owner) {
                html_link_close();
                html("</td><td>");
                if (ctx.cfg.enable_index_owner) {

+                       html("<a href='");
+                       html_attr(cgit_rooturl());
+                       html("?q=");
+                       html_url_arg(ctx.repo->owner);
+                       html("'>");

                        html_txt(ctx.repo->owner);
                        html_txt(ctx.repo->owner);

+                       html("</a>");

                        html("</td><td>");
                }
                print_modtime(ctx.repo);
                        html("</td><td>");
                }
                print_modtime(ctx.repo);


@@ -328,9 +339,7 @@ void cgit_print_site_readme()
 {
        if (!ctx.cfg.root_readme)
                return;
 {
        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);
        html_include(ctx.cfg.root_readme);

-       if (ctx.cfg.about_filter)
-               cgit_close_filter(ctx.cfg.about_filter);
+       cgit_close_filter(ctx.cfg.about_filter);

 }
 }