ui-blog: fix oid handling

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 76fe71a9a4bfca98c8340deba3b8ee68cb69b9c3..7158bf7cf643b3b90c47cfab040796ff013ad2ea 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)


@@ -11,29 +10,31 @@
 #include "ui-repolist.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "ui-repolist.h"
 #include "html.h"
 #include "ui-shared.h"

-#include <strings.h>

 
 static time_t read_agefile(char *path)
 {
        time_t result;
        size_t size;
 
 static time_t read_agefile(char *path)
 {
        time_t result;
        size_t size;

-       char *buf;
-       static char buf2[64];
+       char *buf = NULL;
+       struct strbuf date_buf = STRBUF_INIT;

 
 

-       if (readfile(path, &buf, &size))
+       if (readfile(path, &buf, &size)) {
+               free(buf);

                return -1;
                return -1;

+       }

 
 

-       if (parse_date(buf, buf2, sizeof(buf2)) > 0)
-               result = strtoul(buf2, NULL, 10);
+       if (parse_date(buf, &date_buf) == 0)
+               result = strtoul(date_buf.buf, NULL, 10);

        else
                result = 0;
        free(buf);
        else
                result = 0;
        free(buf);

+       strbuf_release(&date_buf);

        return result;
 }
 
 static int get_repo_modtime(const struct cgit_repo *repo, time_t *mtime)
 {
        return result;
 }
 
 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 +42,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);
 }
 


@@ -74,7 +79,7 @@ static void print_modtime(struct cgit_repo *repo)
 {
        time_t t;
        if (get_repo_modtime(repo, &t))
 {
        time_t t;
        if (get_repo_modtime(repo, &t))

-               cgit_print_age(t, -1, NULL);
+               cgit_print_age(t, 0, -1);

 }
 
 static int is_match(struct cgit_repo *repo)
 }
 
 static int is_match(struct cgit_repo *repo)


@@ -96,22 +101,46 @@ 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;
 }
 
                return 1;
        return 0;
 }
 

+static int is_visible(struct cgit_repo *repo)
+{
+       if (repo->hide || repo->ignore)
+               return 0;
+       if (!(is_match(repo) && is_in_url(repo)))
+               return 0;
+       return 1;
+}
+
+static int any_repos_visible(void)
+{
+       int i;
+
+       for (i = 0; i < cgit_repolist.count; i++) {
+               if (is_visible(&cgit_repolist.repos[i]))
+                       return 1;
+       }
+       return 0;
+}
+

 static void print_sort_header(const char *title, const char *sort)
 {
 static void print_sort_header(const char *title, const char *sort)
 {

-       htmlf("<th class='left'><a href='%s?s=%s", cgit_rooturl(), sort);
+       char *currenturl = cgit_currenturl();
+       html("<th class='left'><a href='");
+       html_attr(currenturl);
+       htmlf("?s=%s", sort);

        if (ctx.qry.search) {
                html("&amp;q=");
                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);
        if (ctx.qry.search) {
                html("&amp;q=");
                html_url_arg(ctx.qry.search);
        }
        htmlf("'>%s</a></th>", title);

+       free(currenturl);

 }
 
 }
 

-static void print_header()
+static void print_header(void)

 {
        html("<tr class='nohover'>");
        print_sort_header("Name", "name");
 {
        html("<tr class='nohover'>");
        print_sort_header("Name", "name");


@@ -134,7 +163,7 @@ static void print_pager(int items, int pagelen, char *search, char *sort)
                class = (ctx.qry.ofs == ofs) ? "current" : NULL;
                html("<li>");
                cgit_index_link(fmt("[%d]", i + 1), fmt("Page %d", i + 1),
                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);
+                               class, search, sort, ofs, 0);

                html("</li>");
        }
        html("</ul>");
                html("</li>");
        }
        html("</ul>");


@@ -217,7 +246,7 @@ struct sortcolumn {
        int (*fn)(const void *a, const void *b);
 };
 
        int (*fn)(const void *a, const void *b);
 };
 

-struct sortcolumn sortcolumn[] = {
+static const struct sortcolumn sortcolumn[] = {

        {"section", sort_section},
        {"name", sort_name},
        {"desc", sort_desc},
        {"section", sort_section},
        {"name", sort_name},
        {"desc", sort_desc},


@@ -228,7 +257,7 @@ struct sortcolumn sortcolumn[] = {
 
 static int sort_repolist(char *field)
 {
 
 static int sort_repolist(char *field)
 {

-       struct sortcolumn *column;
+       const struct sortcolumn *column;

 
        for (column = &sortcolumn[0]; column->name; column++) {
                if (strcmp(field, column->name))
 
        for (column = &sortcolumn[0]; column->name; column++) {
                if (strcmp(field, column->name))


@@ -241,22 +270,28 @@ static int sort_repolist(char *field)
 }
 
 
 }
 
 

-void cgit_print_repolist()
+void cgit_print_repolist(void)

 {
        int i, columns = 3, hits = 0, header = 0;
        char *last_section = NULL;
        char *section;
 {
        int i, columns = 3, hits = 0, header = 0;
        char *last_section = NULL;
        char *section;

+       char *repourl;

        int sorted = 0;
 
        int sorted = 0;
 

+       if (!any_repos_visible()) {
+               cgit_print_error_page(404, "Not found", "No repositories found");
+               return;
+       }
+

        if (ctx.cfg.enable_index_links)
                ++columns;
        if (ctx.cfg.enable_index_owner)
                ++columns;
 
        ctx.page.title = ctx.cfg.root_title;
        if (ctx.cfg.enable_index_links)
                ++columns;
        if (ctx.cfg.enable_index_owner)
                ++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);


@@ -269,7 +304,7 @@ void cgit_print_repolist()
        html("<table summary='repository list' class='list nowrap'>");
        for (i = 0; i < cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];
        html("<table summary='repository list' class='list nowrap'>");
        for (i = 0; i < cgit_repolist.count; i++) {
                ctx.repo = &cgit_repolist.repos[i];

-               if (!(is_match(ctx.repo) && is_in_url(ctx.repo)))
+               if (!is_visible(ctx.repo))

                        continue;
                hits++;
                if (hits <= ctx.qry.ofs)
                        continue;
                hits++;
                if (hits <= ctx.qry.ofs)


@@ -296,12 +331,28 @@ void cgit_print_repolist()
                      !sorted && section ? "sublevel-repo" : "toplevel-repo");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");
                      !sorted && section ? "sublevel-repo" : "toplevel-repo");
                cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
                html("</td><td>");

-               html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
+               repourl = cgit_repourl(ctx.repo->url);
+               html_link_open(repourl, NULL, NULL);
+               free(repourl);

                html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                html_link_close();
                html("</td><td>");
                if (ctx.cfg.enable_index_owner) {
                html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
                html_link_close();
                html("</td><td>");
                if (ctx.cfg.enable_index_owner) {

-                       html_txt(ctx.repo->owner);
+                       if (ctx.repo->owner_filter) {
+                               cgit_open_filter(ctx.repo->owner_filter);
+                               html_txt(ctx.repo->owner);
+                               cgit_close_filter(ctx.repo->owner_filter);
+                       } else {
+                               char *currenturl = cgit_currenturl();
+                               html("<a href='");
+                               html_attr(currenturl);
+                               html("?q=");
+                               html_url_arg(ctx.repo->owner);
+                               html("'>");
+                               html_txt(ctx.repo->owner);
+                               html("</a>");
+                               free(currenturl);
+                       }

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


@@ -310,27 +361,26 @@ void cgit_print_repolist()
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,

-                                     0, NULL, NULL, ctx.qry.showmsg);
+                                     0, NULL, NULL, ctx.qry.showmsg, 0);

                        cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                        html("</td>");
                }
                html("</tr>\n");
        }
        html("</table>");
                        cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
                        html("</td>");
                }
                html("</tr>\n");
        }
        html("</table>");

-       if (!hits)
-               cgit_print_error("No repositories found");
-       else if (hits > ctx.cfg.max_repo_count)
+       if (hits > ctx.cfg.max_repo_count)

                print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
        cgit_print_docend();
 }
 
                print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
        cgit_print_docend();
 }
 

-void cgit_print_site_readme()
+void cgit_print_site_readme(void)

 {
 {

+       cgit_print_layout_start();

        if (!ctx.cfg.root_readme)
        if (!ctx.cfg.root_readme)

-               return;
-       if (ctx.cfg.about_filter)
-               cgit_open_filter(ctx.cfg.about_filter);
+               goto done;
+       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);
+done:
+       cgit_print_layout_end();

 }
 }