fix building with clang

[ps-cgit] / ui-repolist.c

diff --git a/ui-repolist.c b/ui-repolist.c
index 436a77432458a2613f6bf2b330b8ae28310d2e9b..d12e3dd3593fda4179740c4540aee02260f47007 100644 (file)
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,60 +1,88 @@
 /* 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) 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)
  */
 

-#include <time.h>
-

 #include "cgit.h"
 #include "cgit.h"

+#include "ui-repolist.h"

 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 

-time_t read_agefile(char *path)
+static time_t read_agefile(const char *path)

 {
 {

-       FILE *f;
-       static char buf[64], buf2[64];
+       time_t result;
+       size_t size;
+       char *buf = NULL;
+       struct strbuf date_buf = STRBUF_INIT;

 
 

-       if (!(f = fopen(path, "r")))
-               return -1;
-       if (fgets(buf, sizeof(buf), f) == NULL)
-               return -1;
-       fclose(f);
-       if (parse_date(buf, buf2, sizeof(buf2)))
-               return strtoul(buf2, NULL, 10);
-       else
+       if (readfile(path, &buf, &size)) {
+               free(buf);

                return 0;
                return 0;

+       }
+
+       if (parse_date(buf, &date_buf) == 0)
+               result = strtoul(date_buf.buf, NULL, 10);
+       else
+               result = 0;
+       free(buf);
+       strbuf_release(&date_buf);
+       return result;

 }
 
 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 stat s;

+       struct cgit_repo *r = (struct cgit_repo *)repo;

 
 

-       path = fmt("%s/%s", repo->path, ctx.cfg.agefile);
-       if (stat(path, &s) == 0) {
-               *mtime = read_agefile(path);
+       if (repo->mtime != -1) {
+               *mtime = repo->mtime;

                return 1;
        }
                return 1;
        }

+       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;
+                       goto end;
+               }
+       }

 
 

-       path = fmt("%s/refs/heads/%s", repo->path, repo->defbranch);
-       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;
                *mtime = s.st_mtime;

-               return 1;
+               r->mtime = *mtime;
+               goto end;

        }
        }

-       return 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;
+               goto end;
+       }
+
+       *mtime = 0;
+       r->mtime = *mtime;
+end:
+       strbuf_release(&path);
+       return (r->mtime != 0);

 }
 
 static void print_modtime(struct cgit_repo *repo)
 {
        time_t t;
        if (get_repo_modtime(repo, &t))
 }
 
 static void print_modtime(struct cgit_repo *repo)
 {
        time_t t;
        if (get_repo_modtime(repo, &t))

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

 }
 
 }
 

-int is_match(struct cgit_repo *repo)
+static int is_match(struct cgit_repo *repo)

 {
        if (!ctx.qry.search)
                return 1;
 {
        if (!ctx.qry.search)
                return 1;


@@ -69,39 +97,118 @@ int is_match(struct cgit_repo *repo)
        return 0;
 }
 
        return 0;
 }
 

-int is_in_url(struct cgit_repo *repo)
+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;
 }
 

-void print_header(int columns)
+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)

 {
 {

-       html("<tr class='nohover'>"
-            "<th class='left'>Name</th>"
-            "<th class='left'>Description</th>"
-            "<th class='left'>Owner</th>"
-            "<th class='left'><a href=\"?s=1\">Idle</a></th>");
+       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)
+{
+       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);
+       free(currenturl);
+}
+
+static void print_header(void)
+{
+       html("<tr class='nohover'>");
+       print_sort_header("Name", "name");
+       print_sort_header("Description", "desc");
+       if (ctx.cfg.enable_index_owner)
+               print_sort_header("Owner", "owner");
+       print_sort_header("Idle", "idle");

        if (ctx.cfg.enable_index_links)
                html("<th class='left'>Links</th>");
        html("</tr>\n");
 }
 
 
        if (ctx.cfg.enable_index_links)
                html("<th class='left'>Links</th>");
        html("</tr>\n");
 }
 
 

-void print_pager(int items, int pagelen, char *search)
+static void print_pager(int items, int pagelen, char *search, char *sort)

 {
 {

-       int i;
-       html("<div class='pager'>");
-       for(i = 0; i * pagelen < items; i++)
-               cgit_index_link(fmt("[%d]", i+1), fmt("Page %d", i+1), NULL,
-                               search, i * pagelen);
-       html("</div>");
+       int i, ofs;
+       char *class = NULL;
+       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, 0);
+               html("</li>");
+       }
+       html("</ul>");
+}
+
+static int cmp(const char *s1, const char *s2)
+{
+       if (s1 && s2) {
+               if (ctx.cfg.case_sensitive_sort)
+                       return strcmp(s1, s2);
+               else
+                       return strcasecmp(s1, s2);
+       }
+       if (s1 && !s2)
+               return -1;
+       if (s2 && !s1)
+               return 1;
+       return 0;

 }
 
 }
 

-static int cgit_reposort_modtime(const void *a, const void *b)
+static int sort_name(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+
+       return cmp(r1->name, r2->name);
+}
+
+static int sort_desc(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+
+       return cmp(r1->desc, r2->desc);
+}
+
+static int sort_owner(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+
+       return cmp(r1->owner, r2->owner);
+}
+
+static int sort_idle(const void *a, const void *b)

 {
        const struct cgit_repo *r1 = a;
        const struct cgit_repo *r2 = b;
 {
        const struct cgit_repo *r1 = a;
        const struct cgit_repo *r2 = b;


@@ -113,29 +220,83 @@ static int cgit_reposort_modtime(const void *a, const void *b)
        return t2 - t1;
 }
 
        return t2 - t1;
 }
 

-void cgit_print_repolist()
+static int sort_section(const void *a, const void *b)
+{
+       const struct cgit_repo *r1 = a;
+       const struct cgit_repo *r2 = b;
+       int result;
+
+       result = cmp(r1->section, r2->section);
+       if (!result) {
+               if (!strcmp(ctx.cfg.repository_sort, "age"))
+                       result = sort_idle(r1, r2);
+               if (!result)
+                       result = cmp(r1->name, r2->name);
+       }
+       return result;
+}
+
+struct sortcolumn {
+       const char *name;
+       int (*fn)(const void *a, const void *b);
+};
+
+static const struct sortcolumn sortcolumn[] = {
+       {"section", sort_section},
+       {"name", sort_name},
+       {"desc", sort_desc},
+       {"owner", sort_owner},
+       {"idle", sort_idle},
+       {NULL, NULL}
+};
+
+static int sort_repolist(char *field)
+{
+       const struct sortcolumn *column;
+
+       for (column = &sortcolumn[0]; column->name; column++) {
+               if (strcmp(field, column->name))
+                       continue;
+               qsort(cgit_repolist.repos, cgit_repolist.count,
+                       sizeof(struct cgit_repo), column->fn);
+               return 1;
+       }
+       return 0;
+}
+
+
+void cgit_print_repolist(void)

 {
 {

-       int i, columns = 4, hits = 0, header = 0;
-       char *last_group = NULL;
+       int i, columns = 3, hits = 0, header = 0;
+       char *last_section = NULL;
+       char *section;
+       char *repourl;
+       int sorted = 0;
+
+       if (!any_repos_visible()) {
+               cgit_print_error_page(404, "Not found", "No repositories found");
+               return;
+       }

 
        if (ctx.cfg.enable_index_links)
 
        if (ctx.cfg.enable_index_links)

-               columns++;
+               ++columns;
+       if (ctx.cfg.enable_index_owner)
+               ++columns;

 
        ctx.page.title = ctx.cfg.root_title;
 
        ctx.page.title = ctx.cfg.root_title;

-       cgit_print_http_headers(&ctx);
-       cgit_print_docstart(&ctx);
-       cgit_print_pageheader(&ctx);
-
-       if (ctx.cfg.index_header)
-               html_include(ctx.cfg.index_header);
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();

 
 

-       if(ctx.qry.sort)
-               qsort(cgit_repolist.repos,cgit_repolist.count,sizeof(struct cgit_repo),cgit_reposort_modtime);
+       if (ctx.qry.sort)
+               sorted = sort_repolist(ctx.qry.sort);
+       else if (ctx.cfg.section_sort)
+               sort_repolist("section");

 
        html("<table summary='repository list' class='list nowrap'>");
 
        html("<table summary='repository list' class='list nowrap'>");

-       for (i=0; i<cgit_repolist.count; i++) {
+       for (i = 0; i < cgit_repolist.count; i++) {

                ctx.repo = &cgit_repolist.repos[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)


@@ -143,50 +304,76 @@ void cgit_print_repolist()
                if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
                        continue;
                if (!header++)
                if (hits > ctx.qry.ofs + ctx.cfg.max_repo_count)
                        continue;
                if (!header++)

-                       print_header(columns);
-               if (!ctx.qry.sort &&
-                   ((last_group == NULL && ctx.repo->group != NULL) ||
-                   (last_group != NULL && ctx.repo->group == NULL) ||
-                   (last_group != NULL && ctx.repo->group != NULL &&
-                    strcmp(ctx.repo->group, last_group)))) {
-                       htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
+                       print_header();
+               section = ctx.repo->section;
+               if (section && !strcmp(section, ""))
+                       section = NULL;
+               if (!sorted &&
+                   ((last_section == NULL && section != NULL) ||
+                   (last_section != NULL && section == NULL) ||
+                   (last_section != NULL && section != NULL &&
+                    strcmp(section, last_section)))) {
+                       htmlf("<tr class='nohover-highlight'><td colspan='%d' class='reposection'>",

                              columns);
                              columns);

-                       html_txt(ctx.repo->group);
+                       html_txt(section);

                        html("</td></tr>");
                        html("</td></tr>");

-                       last_group = ctx.repo->group;
+                       last_section = section;

                }
                htmlf("<tr><td class='%s'>",
                }
                htmlf("<tr><td class='%s'>",

-                     ctx.repo->group ? "sublevel-repo" : "toplevel-repo");
-               cgit_summary_link(ctx.repo->name, ctx.repo->name, NULL, NULL);
+                     !sorted && section ? "sublevel-repo" : "toplevel-repo");
+               cgit_summary_link(ctx.repo->name, NULL, NULL, NULL);

                html("</td><td>");
                html("</td><td>");

-               html_link_open(cgit_repourl(ctx.repo->url), NULL, NULL);
-               html_ntxt(ctx.cfg.max_repodesc_len, ctx.repo->desc);
+               repourl = cgit_repourl(ctx.repo->url);
+               html_link_open(repourl, NULL, NULL);
+               free(repourl);
+               if (html_ntxt(ctx.repo->desc, ctx.cfg.max_repodesc_len) < 0)
+                       html("...");

                html_link_close();
                html("</td><td>");
                html_link_close();
                html("</td><td>");

-               html_txt(ctx.repo->owner);
-               html("</td><td>");
+               if (ctx.cfg.enable_index_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>");
                if (ctx.cfg.enable_index_links) {
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,
                print_modtime(ctx.repo);
                html("</td>");
                if (ctx.cfg.enable_index_links) {
                        html("<td>");
                        cgit_summary_link("summary", NULL, "button", NULL);
                        cgit_log_link("log", NULL, "button", NULL, NULL, NULL,

-                                     0, NULL, NULL);
+                                     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)
-               print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search);
+       if (hits > ctx.cfg.max_repo_count)
+               print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);

        cgit_print_docend();
 }
 
        cgit_print_docend();
 }
 

-void cgit_print_site_readme()
+void cgit_print_site_readme(void)

 {
 {

-       if (ctx.cfg.root_readme)
-               html_include(ctx.cfg.root_readme);
+       cgit_print_layout_start();
+       if (!ctx.cfg.root_readme)
+               goto done;
+       cgit_open_filter(ctx.cfg.about_filter, ctx.cfg.root_readme);
+       html_include(ctx.cfg.root_readme);
+       cgit_close_filter(ctx.cfg.about_filter);
+done:
+       cgit_print_layout_end();

 }
 }