tests: add tests for links with space in path and/or args

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index ae29615a32d04ac8c3e933815e61b64543fdecee..5aa911956aa3cbf344b437e15aad761f5cd11d86 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -574,7 +574,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)
        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);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);


@@ -756,17 +756,27 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
 
 static void print_header(struct cgit_context *ctx)
 {
 
 static void print_header(struct cgit_context *ctx)
 {

+       char *logo = NULL, *logo_link = NULL;
+

        html("<table id='header'>\n");
        html("<tr>\n");
 
        html("<table id='header'>\n");
        html("<tr>\n");
 

-       if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+       if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
+               logo = ctx->repo->logo;
+       else
+               logo = ctx->cfg.logo;
+       if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
+               logo_link = ctx->repo->logo_link;
+       else
+               logo_link = ctx->cfg.logo_link;
+       if (logo && *logo) {

                html("<td class='logo' rowspan='2'><a href='");
                html("<td class='logo' rowspan='2'><a href='");

-               if (ctx->cfg.logo_link)
-                       html_attr(ctx->cfg.logo_link);
+               if (logo_link && *logo_link)
+                       html_attr(logo_link);

                else
                        html_attr(cgit_rooturl());
                html("'><img src='");
                else
                        html_attr(cgit_rooturl());
                html("'><img src='");

-               html_attr(ctx->cfg.logo);
+               html_attr(logo);

                html("' alt='cgit logo'/></a></td>\n");
        }
 
                html("' alt='cgit logo'/></a></td>\n");
        }