syntax-highlighting: always use utf-8 to avoid ascii codec issues

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 5ae39269cc7278d6cbaa41df5ee35b032be1e0cc..3ff2320744b584464e196a25a66fed9be38ee64f 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -6,7 +6,6 @@
  *   (see COPYING for full license text)
  */
 
-#include <ctype.h>
 #include "cgit.h"
 #include "ui-tree.h"
 #include "html.h"
@@ -45,13 +44,12 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
        }
 
        if (ctx.repo->source_filter) {
+               char *filter_arg = xstrdup(name);
                html("<td class='lines'><pre><code>");
-               ctx.repo->source_filter->argv[1] = xstrdup(name);
-               cgit_open_filter(ctx.repo->source_filter);
+               cgit_open_filter(ctx.repo->source_filter, filter_arg);
                html_raw(buf, size);
                cgit_close_filter(ctx.repo->source_filter);
-               free(ctx.repo->source_filter->argv[1]);
-               ctx.repo->source_filter->argv[1] = NULL;
+               free(filter_arg);
                html("</code></pre></td></tr></table>\n");
                return;
        }
@@ -94,16 +92,19 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
-               cgit_print_error("Bad object name: %s", sha1_to_hex(sha1));
+               cgit_print_error_page(404, "Not found",
+                       "Bad object name: %s", sha1_to_hex(sha1));
                return;
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
-               cgit_print_error("Error reading object %s", sha1_to_hex(sha1));
+               cgit_print_error_page(500, "Internal server error",
+                       "Error reading object %s", sha1_to_hex(sha1));
                return;
        }
 
+       cgit_print_layout_start();
        htmlf("blob: %s (", sha1_to_hex(sha1));
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
                        rev, path);
@@ -122,9 +123,8 @@ static void print_object(const unsigned char *sha1, char *path, const char *base
 }
 
 
-static int ls_item(const unsigned char *sha1, const char *base, int baselen,
-                  const char *pathname, unsigned int mode, int stage,
-                  void *cbdata)
+static int ls_item(const unsigned char *sha1, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
        char *name;
@@ -143,6 +143,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                        htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                              name,
                              sha1_to_hex(sha1));
+                       free(name);
                        return 0;
                }
        }
@@ -168,7 +169,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        html("<td>");
        cgit_log_link("log", NULL, "button", ctx.qry.head,
                      walk_tree_ctx->curr_rev, fullpath.buf, 0, NULL, NULL,
-                     ctx.qry.showmsg);
+                     ctx.qry.showmsg, 0);
        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,
                                fullpath.buf);
@@ -182,8 +183,9 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        return 0;
 }
 
-static void ls_head()
+static void ls_head(void)
 {
+       cgit_print_layout_start();
        html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
@@ -193,9 +195,10 @@ static void ls_head()
        html("</tr>\n");
 }
 
-static void ls_tail()
+static void ls_tail(void)
 {
        html("</table>\n");
+       cgit_print_layout_end();
 }
 
 static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_context *walk_tree_ctx)
@@ -207,7 +210,8 @@ static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_cont
 
        tree = parse_tree_indirect(sha1);
        if (!tree) {
-               cgit_print_error("Not a tree object: %s", sha1_to_hex(sha1));
+               cgit_print_error_page(404, "Not found",
+                       "Not a tree object: %s", sha1_to_hex(sha1));
                return;
        }
 
@@ -217,16 +221,15 @@ static void ls_tree(const unsigned char *sha1, char *path, struct walk_tree_cont
 }
 
 
-static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
-                    const char *pathname, unsigned mode, int stage,
-                    void *cbdata)
+static int walk_tree(const unsigned char *sha1, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
        static char buffer[PATH_MAX];
 
        if (walk_tree_ctx->state == 0) {
-               memcpy(buffer, base, baselen);
-               strcpy(buffer + baselen, pathname);
+               memcpy(buffer, base->buf, base->len);
+               strcpy(buffer + base->len, pathname);
                if (strcmp(walk_tree_ctx->match_path, buffer))
                        return READ_TREE_RECURSIVE;
 
@@ -235,15 +238,15 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                        ls_head();
                        return READ_TREE_RECURSIVE;
                } else {
+                       walk_tree_ctx->state = 2;
                        print_object(sha1, buffer, pathname, walk_tree_ctx->curr_rev);
                        return 0;
                }
        }
-       ls_item(sha1, base, baselen, pathname, mode, stage, walk_tree_ctx);
+       ls_item(sha1, base, pathname, mode, stage, walk_tree_ctx);
        return 0;
 }
 
-
 /*
  * Show a tree or a blob
  *   rev:  the commit pointing at the root tree object
@@ -270,25 +273,31 @@ void cgit_print_tree(const char *rev, char *path)
                rev = ctx.qry.head;
 
        if (get_sha1(rev, sha1)) {
-               cgit_print_error("Invalid revision name: %s", rev);
+               cgit_print_error_page(404, "Not found",
+                       "Invalid revision name: %s", rev);
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit || parse_commit(commit)) {
-               cgit_print_error("Invalid commit reference: %s", rev);
+               cgit_print_error_page(404, "Not found",
+                       "Invalid commit reference: %s", rev);
                return;
        }
 
        walk_tree_ctx.curr_rev = xstrdup(rev);
 
        if (path == NULL) {
-               ls_tree(commit->tree->object.sha1, NULL, &walk_tree_ctx);
+               ls_tree(commit->tree->object.oid.hash, NULL, &walk_tree_ctx);
                goto cleanup;
        }
 
        read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
        if (walk_tree_ctx.state == 1)
                ls_tail();
+       else if (walk_tree_ctx.state == 2)
+               cgit_print_layout_end();
+       else
+               cgit_print_error_page(404, "Not found", "Path not found");
 
 cleanup:
        free(walk_tree_ctx.curr_rev);