t0107: Skip ZIP tests if unzip(1) isn't available

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 8ef4ec6ba525351a6ec6d906e5e3e5e795139c6b..9c865423fdddd58a0777c50f05c559ea8a277dce 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -8,6 +8,7 @@
 
 #include <stdio.h>
 #include "cgit.h"
+#include "ui-plain.h"
 #include "html.h"
 #include "ui-shared.h"
 
@@ -94,22 +95,23 @@ static int print_object(const unsigned char *sha1, const char *path)
                else
                        ctx.page.mimetype = "text/plain";
        }
-       ctx.page.filename = fmt("%s", path);
+       ctx.page.filename = path;
        ctx.page.size = size;
        ctx.page.etag = sha1_to_hex(sha1);
        cgit_print_http_headers(&ctx);
        html_raw(buf, size);
+       /* If we allocated this, then casting away const is safe. */
        if (freemime)
-               free(ctx.page.mimetype);
+               free((char*) ctx.page.mimetype);
        return 1;
 }
 
 static char *buildpath(const char *base, int baselen, const char *path)
 {
        if (path[0])
-               return fmt("%.*s%s/", baselen, base, path);
+               return fmtalloc("%.*s%s/", baselen, base, path);
        else
-               return fmt("%.*s/", baselen, base);
+               return fmtalloc("%.*s/", baselen, base);
 }
 
 static void print_dir(const unsigned char *sha1, const char *base,
@@ -140,6 +142,7 @@ static void print_dir(const unsigned char *sha1, const char *base,
                                fullpath);
                html("</li>\n");
        }
+       free(fullpath);
 }
 
 static void print_dir_entry(const unsigned char *sha1, const char *base,
@@ -157,6 +160,7 @@ static void print_dir_entry(const unsigned char *sha1, const char *base,
                cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
        html("</li>\n");
+       free(fullpath);
 }
 
 static void print_dir_tail(void)