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 c90ae59ad37e2719d9954ef8a005bb212e016746..9c865423fdddd58a0777c50f05c559ea8a277dce 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -8,11 +8,14 @@
 
 #include <stdio.h>
 #include "cgit.h"
+#include "ui-plain.h"
 #include "html.h"
 #include "ui-shared.h"
 
-int match_baselen;
-int match;
+struct walk_tree_context {
+       int match_baselen;
+       int match;
+};
 
 static char *get_mimetype_from_file(const char *filename, const char *ext)
 {
@@ -92,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,
@@ -138,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,
@@ -155,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)
@@ -166,18 +172,20 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                     const char *pathname, unsigned mode, int stage,
                     void *cbdata)
 {
-       if (baselen == match_baselen) {
+       struct walk_tree_context *walk_tree_ctx = cbdata;
+
+       if (baselen == walk_tree_ctx->match_baselen) {
                if (S_ISREG(mode)) {
                        if (print_object(sha1, pathname))
-                               match = 1;
+                               walk_tree_ctx->match = 1;
                } else if (S_ISDIR(mode)) {
                        print_dir(sha1, base, baselen, pathname);
-                       match = 2;
+                       walk_tree_ctx->match = 2;
                        return READ_TREE_RECURSIVE;
                }
-       } else if (baselen > match_baselen) {
+       } else if (baselen > walk_tree_ctx->match_baselen) {
                print_dir_entry(sha1, base, baselen, pathname, mode);
-               match = 2;
+               walk_tree_ctx->match = 2;
        } else if (S_ISDIR(mode)) {
                return READ_TREE_RECURSIVE;
        }
@@ -206,6 +214,9 @@ void cgit_print_plain(struct cgit_context *ctx)
                .nr = 1,
                .items = &path_items
        };
+       struct walk_tree_context walk_tree_ctx = {
+               .match = 0
+       };
 
        if (!rev)
                rev = ctx->qry.head;
@@ -221,15 +232,15 @@ void cgit_print_plain(struct cgit_context *ctx)
        }
        if (!path_items.match) {
                path_items.match = "";
-               match_baselen = -1;
+               walk_tree_ctx.match_baselen = -1;
                print_dir(commit->tree->object.sha1, "", 0, "");
-               match = 2;
+               walk_tree_ctx.match = 2;
        }
        else
-               match_baselen = basedir_len(path_items.match);
-       read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
-       if (!match)
+               walk_tree_ctx.match_baselen = basedir_len(path_items.match);
+       read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+       if (!walk_tree_ctx.match)
                html_status(404, "Not found", 0);
-       else if (match == 2)
+       else if (walk_tree_ctx.match == 2)
                print_dir_tail();
 }