filters/syntax-highlighting.sh: work around highlight --force bug

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 7efae7ab04982bf6d5f557cba1d9cdc9b91f9ede..d7d75bf0cf56b8581fb382b7ee2f996e38a32758 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -133,7 +133,7 @@ char *cgit_currurl()
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 
-static void site_url(const char *page, const char *search, int ofs)
+static void site_url(const char *page, const char *search, const char *sort, int ofs)
 {
        char *delim = "?";
 
@@ -154,6 +154,12 @@ static void site_url(const char *page, const char *search, int ofs)
                html_attr(search);
                delim = "&";
        }
+       if (sort) {
+               html(delim);
+               html("s=");
+               html_attr(sort);
+               delim = "&";
+       }
        if (ofs) {
                html(delim);
                htmlf("ofs=%d", ofs);
@@ -161,7 +167,7 @@ static void site_url(const char *page, const char *search, int ofs)
 }
 
 static void site_link(const char *page, const char *name, const char *title,
-                     const char *class, const char *search, int ofs)
+                     const char *class, const char *search, const char *sort, int ofs)
 {
        html("<a");
        if (title) {
@@ -175,16 +181,16 @@ static void site_link(const char *page, const char *name, const char *title,
                html("'");
        }
        html(" href='");
-       site_url(page, search, ofs);
+       site_url(page, search, sort, ofs);
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
 void cgit_index_link(const char *name, const char *title, const char *class,
-                    const char *pattern, int ofs)
+                    const char *pattern, const char *sort, int ofs)
 {
-       site_link(NULL, name, title, class, pattern, ofs);
+       site_link(NULL, name, title, class, pattern, sort, ofs);
 }
 
 static char *repolink(const char *title, const char *class, const char *page,
@@ -288,7 +294,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
        char *delim;
 
        delim = repolink(title, class, "log", head, path);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(rev);
@@ -332,7 +338,7 @@ void cgit_commit_link(char *name, const char *title, const char *class,
        char *delim;
 
        delim = repolink(title, class, "commit", head, path);
-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_url_arg(rev);
@@ -428,7 +434,7 @@ void cgit_self_link(char *name, const char *title, const char *class,
                    struct cgit_context *ctx)
 {
        if (!strcmp(ctx->qry.page, "repolist"))
-               return cgit_index_link(name, title, class, ctx->qry.search,
+               return cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,
                                       ctx->qry.ofs);
        else if (!strcmp(ctx->qry.page, "summary"))
                return cgit_summary_link(name, title, class, ctx->qry.head);
@@ -574,7 +580,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.size)
-               htmlf("Content-Length: %ld\n", ctx->page.size);
+               htmlf("Content-Length: %zd\n", ctx->page.size);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
@@ -613,7 +619,7 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }
-       if (host && ctx->repo) {
+       if (host && ctx->repo && ctx->qry.head) {
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
@@ -782,7 +788,7 @@ static void print_header(struct cgit_context *ctx)
 
        html("<td class='main'>");
        if (ctx->repo) {
-               cgit_index_link("index", NULL, NULL, NULL, 0);
+               cgit_index_link("index", NULL, NULL, NULL, NULL, 0);
                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
@@ -858,10 +864,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
-               site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
+               site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, NULL, 0);
                if (ctx->cfg.root_readme)
                        site_link("about", "about", NULL, hc(ctx, "about"),
-                                 NULL, 0);
+                                 NULL, NULL, 0);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());