ui-diff,ui-tag: don't use htmlf with non-formatted strings

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index f53ab6414b9ad50c8f4210eaab8afc169a5c4a00..df8ad82ca4914a5b469986545f1543bf1480f511 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,25 +1,26 @@
 /* ui-tree.c: functions for tree output
  *
 /* ui-tree.c: functions for tree output
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2017 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 

-#include <ctype.h>

 #include "cgit.h"
 #include "cgit.h"

+#include "ui-tree.h"

 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 

-char *curr_rev;
-char *match_path;
-int header = 0;
+struct walk_tree_context {
+       char *curr_rev;
+       char *match_path;
+       int state;
+};

 
 static void print_text_buffer(const char *name, char *buf, unsigned long size)
 {
        unsigned long lineno, idx;
 
 static void print_text_buffer(const char *name, char *buf, unsigned long size)
 {
        unsigned long lineno, idx;

-       const char *numberfmt =
-               "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n";
+       const char *numberfmt = "<a id='n%1$d' href='#n%1$d'>%1$d</a>\n";

 
        html("<table summary='blob content' class='blob'>\n");
 
 
        html("<table summary='blob content' class='blob'>\n");
 


@@ -27,10 +28,10 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
                html("<tr><td class='linenumbers'><pre>");
                idx = 0;
                lineno = 0;
                html("<tr><td class='linenumbers'><pre>");
                idx = 0;
                lineno = 0;

-       
+

                if (size) {
                        htmlf(numberfmt, ++lineno);
                if (size) {
                        htmlf(numberfmt, ++lineno);

-                       while(idx < size - 1) { // skip absolute last newline
+                       while (idx < size - 1) { // skip absolute last newline

                                if (buf[idx] == '\n')
                                        htmlf(numberfmt, ++lineno);
                                idx++;
                                if (buf[idx] == '\n')
                                        htmlf(numberfmt, ++lineno);
                                idx++;


@@ -43,11 +44,12 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size)
        }
 
        if (ctx.repo->source_filter) {
        }
 
        if (ctx.repo->source_filter) {

+               char *filter_arg = xstrdup(name);

                html("<td class='lines'><pre><code>");
                html("<td class='lines'><pre><code>");

-               ctx.repo->source_filter->argv[1] = xstrdup(name);
-               cgit_open_filter(ctx.repo->source_filter);
-               write(STDOUT_FILENO, buf, size);
+               cgit_open_filter(ctx.repo->source_filter, filter_arg);
+               html_raw(buf, size);

                cgit_close_filter(ctx.repo->source_filter);
                cgit_close_filter(ctx.repo->source_filter);

+               free(filter_arg);

                html("</code></pre></td></tr></table>\n");
                return;
        }
                html("</code></pre></td></tr></table>\n");
                return;
        }


@@ -67,7 +69,7 @@ static void print_binary_buffer(char *buf, unsigned long size)
        html("<table summary='blob content' class='bin-blob'>\n");
        html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
        for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {
        html("<table summary='blob content' class='bin-blob'>\n");
        html("<tr><th>ofs</th><th>hex dump</th><th>ascii</th></tr>");
        for (ofs = 0; ofs < size; ofs += ROWLEN, buf += ROWLEN) {

-               htmlf("<tr><td class='right'>%04x</td><td class='hex'>", ofs);
+               htmlf("<tr><td class='right'>%04lx</td><td class='hex'>", ofs);

                for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
                        htmlf("%*s%02x",
                              idx == 16 ? 4 : 1, "",
                for (idx = 0; idx < ROWLEN && ofs + idx < size; idx++)
                        htmlf("%*s%02x",
                              idx == 16 ? 4 : 1, "",


@@ -82,58 +84,141 @@ static void print_binary_buffer(char *buf, unsigned long size)
        html("</table>\n");
 }
 
        html("</table>\n");
 }
 

-static void print_object(const unsigned char *sha1, char *path, const char *basename)
+static void print_object(const struct object_id *oid, char *path, const char *basename, const char *rev)

 {
        enum object_type type;
        char *buf;
        unsigned long size;
 
 {
        enum object_type type;
        char *buf;
        unsigned long size;
 

-       type = sha1_object_info(sha1, &size);
+       type = oid_object_info(the_repository, oid, &size);

        if (type == OBJ_BAD) {
        if (type == OBJ_BAD) {

-               cgit_print_error(fmt("Bad object name: %s",
-                                    sha1_to_hex(sha1)));
+               cgit_print_error_page(404, "Not found",
+                       "Bad object name: %s", oid_to_hex(oid));

                return;
        }
 
                return;
        }
 

-       buf = read_sha1_file(sha1, &type, &size);
+       buf = read_object_file(oid, &type, &size);

        if (!buf) {
        if (!buf) {

-               cgit_print_error(fmt("Error reading object %s",
-                                    sha1_to_hex(sha1)));
+               cgit_print_error_page(500, "Internal server error",
+                       "Error reading object %s", oid_to_hex(oid));

                return;
        }
 
                return;
        }
 

-       html(" (");
+       cgit_set_title_from_path(path);
+
+       cgit_print_layout_start();
+       htmlf("blob: %s (", oid_to_hex(oid));

        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
        cgit_plain_link("plain", NULL, NULL, ctx.qry.head,

-                       curr_rev, path);
-       htmlf(")<br/>blob: %s\n", sha1_to_hex(sha1));
+                       rev, path);
+       if (ctx.cfg.enable_blame) {
+               html(") (");
+               cgit_blame_link("blame", NULL, NULL, ctx.qry.head,
+                               rev, path);
+       }
+       html(")\n");
+
+       if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
+               htmlf("<div class='error'>blob size (%ldKB) exceeds display size limit (%dKB).</div>",
+                               size / 1024, ctx.cfg.max_blob_size);
+               return;
+       }

 
        if (buffer_is_binary(buf, size))
                print_binary_buffer(buf, size);
        else
                print_text_buffer(basename, buf, size);
 
        if (buffer_is_binary(buf, size))
                print_binary_buffer(buf, size);
        else
                print_text_buffer(basename, buf, size);

+
+       free(buf);

 }
 
 }
 

+struct single_tree_ctx {
+       struct strbuf *path;
+       struct object_id oid;
+       char *name;
+       size_t count;
+};
+
+static int single_tree_cb(const struct object_id *oid, struct strbuf *base,
+                         const char *pathname, unsigned mode, int stage,
+                         void *cbdata)
+{
+       struct single_tree_ctx *ctx = cbdata;
+
+       if (++ctx->count > 1)
+               return -1;
+
+       if (!S_ISDIR(mode)) {
+               ctx->count = 2;
+               return -1;
+       }
+
+       ctx->name = xstrdup(pathname);
+       oidcpy(&ctx->oid, oid);
+       strbuf_addf(ctx->path, "/%s", pathname);
+       return 0;
+}
+
+static void write_tree_link(const struct object_id *oid, char *name,
+                           char *rev, struct strbuf *fullpath)
+{
+       size_t initial_length = fullpath->len;
+       struct tree *tree;
+       struct single_tree_ctx tree_ctx = {
+               .path = fullpath,
+               .count = 1,
+       };
+       struct pathspec paths = {
+               .nr = 0
+       };
+
+       oidcpy(&tree_ctx.oid, oid);
+
+       while (tree_ctx.count == 1) {
+               cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head, rev,
+                              fullpath->buf);
+
+               tree = lookup_tree(the_repository, &tree_ctx.oid);
+               if (!tree)
+                       return;
+
+               free(tree_ctx.name);
+               tree_ctx.name = NULL;
+               tree_ctx.count = 0;
+
+               read_tree_recursive(tree, "", 0, 1, &paths, single_tree_cb,
+                                   &tree_ctx);
+
+               if (tree_ctx.count != 1)
+                       break;
+
+               html(" / ");
+               name = tree_ctx.name;
+       }
+
+       strbuf_setlen(fullpath, initial_length);
+}

 
 

-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 struct object_id *oid, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)

 {
 {

+       struct walk_tree_context *walk_tree_ctx = cbdata;

        char *name;
        char *name;

-       char *fullpath;
-       char *class;
+       struct strbuf fullpath = STRBUF_INIT;
+       struct strbuf class = STRBUF_INIT;

        enum object_type type;
        unsigned long size = 0;
 
        name = xstrdup(pathname);
        enum object_type type;
        unsigned long size = 0;
 
        name = xstrdup(pathname);

-       fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
-                      ctx.qry.path ? "/" : "", name);
+       strbuf_addf(&fullpath, "%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+                   ctx.qry.path ? "/" : "", name);

 
        if (!S_ISGITLINK(mode)) {
 
        if (!S_ISGITLINK(mode)) {

-               type = sha1_object_info(sha1, &size);
+               type = oid_object_info(the_repository, oid, &size);

                if (type == OBJ_BAD) {
                        htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                              name,
                if (type == OBJ_BAD) {
                        htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                              name,

-                             sha1_to_hex(sha1));
+                             oid_to_hex(oid));
+                       free(name);

                        return 0;
                }
        }
                        return 0;
                }
        }


@@ -142,40 +227,43 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        cgit_print_filemode(mode);
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
        cgit_print_filemode(mode);
        html("</td><td>");
        if (S_ISGITLINK(mode)) {

-               htmlf("<a class='ls-mod' href='");
-               html_attr(fmt(ctx.repo->module_link,
-                             name,
-                             sha1_to_hex(sha1)));
-               html("'>");
-               html_txt(name);
-               html("</a>");
+               cgit_submodule_link("ls-mod", fullpath.buf, oid_to_hex(oid));

        } else if (S_ISDIR(mode)) {
        } else if (S_ISDIR(mode)) {

-               cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
-                              curr_rev, fullpath);
+               write_tree_link(oid, name, walk_tree_ctx->curr_rev,
+                               &fullpath);

        } else {
        } else {

-               class = strrchr(name, '.');
-               if (class != NULL) {
-                       class = fmt("ls-blob %s", class + 1);
-               } else
-                       class = "ls-blob";
-               cgit_tree_link(name, NULL, class, ctx.qry.head,
-                              curr_rev, fullpath);
+               char *ext = strrchr(name, '.');
+               strbuf_addstr(&class, "ls-blob");
+               if (ext)
+                       strbuf_addf(&class, " %s", ext + 1);
+               cgit_tree_link(name, NULL, class.buf, ctx.qry.head,
+                              walk_tree_ctx->curr_rev, fullpath.buf);

        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");

-       cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
-                     fullpath, 0, NULL, NULL, ctx.qry.showmsg);
+       cgit_log_link("log", NULL, "button", ctx.qry.head,
+                     walk_tree_ctx->curr_rev, fullpath.buf, 0, NULL, NULL,
+                     ctx.qry.showmsg, 0);

        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,
        if (ctx.repo->max_stats)
                cgit_stats_link("stats", NULL, "button", ctx.qry.head,

-                               fullpath);
+                               fullpath.buf);
+       if (!S_ISGITLINK(mode))
+               cgit_plain_link("plain", NULL, "button", ctx.qry.head,
+                               walk_tree_ctx->curr_rev, fullpath.buf);
+       if (!S_ISDIR(mode) && ctx.cfg.enable_blame)
+               cgit_blame_link("blame", NULL, "button", ctx.qry.head,
+                               walk_tree_ctx->curr_rev, fullpath.buf);

        html("</td></tr>\n");
        free(name);
        html("</td></tr>\n");
        free(name);

+       strbuf_release(&fullpath);
+       strbuf_release(&class);

        return 0;
 }
 
        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>");
        html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");


@@ -183,68 +271,64 @@ static void ls_head()
        html("<th class='right'>Size</th>");
        html("<th/>");
        html("</tr>\n");
        html("<th class='right'>Size</th>");
        html("<th/>");
        html("</tr>\n");

-       header = 1;

 }
 
 }
 

-static void ls_tail()
+static void ls_tail(void)

 {
 {

-       if (!header)
-               return;

        html("</table>\n");
        html("</table>\n");

-       header = 0;
+       cgit_print_layout_end();

 }
 
 }
 

-static void ls_tree(const unsigned char *sha1, char *path)
+static void ls_tree(const struct object_id *oid, char *path, struct walk_tree_context *walk_tree_ctx)

 {
        struct tree *tree;
 {
        struct tree *tree;

+       struct pathspec paths = {
+               .nr = 0
+       };

 
 

-       tree = parse_tree_indirect(sha1);
+       tree = parse_tree_indirect(oid);

        if (!tree) {
        if (!tree) {

-               cgit_print_error(fmt("Not a tree object: %s",
-                                    sha1_to_hex(sha1)));
+               cgit_print_error_page(404, "Not found",
+                       "Not a tree object: %s", oid_to_hex(oid));

                return;
        }
 
        ls_head();
                return;
        }
 
        ls_head();

-       read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
+       read_tree_recursive(tree, "", 0, 1, &paths, ls_item, walk_tree_ctx);

        ls_tail();
 }
 
 
        ls_tail();
 }
 
 

-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 struct object_id *oid, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)

 {
 {

-       static int state;
-       static char buffer[PATH_MAX];
-       char *url;
-
-       if (state == 0) {
-               memcpy(buffer, base, baselen);
-               strcpy(buffer+baselen, pathname);
-               url = cgit_pageurl(ctx.qry.repo, "tree",
-                                  fmt("h=%s&amp;path=%s", curr_rev, buffer));
-               html("/");
-               cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
-                              curr_rev, buffer);
-
-               if (strcmp(match_path, buffer))
+       struct walk_tree_context *walk_tree_ctx = cbdata;
+
+       if (walk_tree_ctx->state == 0) {
+               struct strbuf buffer = STRBUF_INIT;
+
+               strbuf_addbuf(&buffer, base);
+               strbuf_addstr(&buffer, pathname);
+               if (strcmp(walk_tree_ctx->match_path, buffer.buf))

                        return READ_TREE_RECURSIVE;
 
                if (S_ISDIR(mode)) {
                        return READ_TREE_RECURSIVE;
 
                if (S_ISDIR(mode)) {

-                       state = 1;
+                       walk_tree_ctx->state = 1;
+                       cgit_set_title_from_path(buffer.buf);
+                       strbuf_release(&buffer);

                        ls_head();
                        return READ_TREE_RECURSIVE;
                } else {
                        ls_head();
                        return READ_TREE_RECURSIVE;
                } else {

-                       print_object(sha1, buffer, pathname);
+                       walk_tree_ctx->state = 2;
+                       print_object(oid, buffer.buf, pathname, walk_tree_ctx->curr_rev);
+                       strbuf_release(&buffer);

                        return 0;
                }
        }
                        return 0;
                }
        }

-       ls_item(sha1, base, baselen, pathname, mode, stage, NULL);
+       ls_item(oid, base, pathname, mode, stage, walk_tree_ctx);

        return 0;
 }
 
        return 0;
 }
 

-

 /*
  * Show a tree or a blob
  *   rev:  the commit pointing at the root tree object
 /*
  * Show a tree or a blob
  *   rev:  the commit pointing at the root tree object


@@ -252,34 +336,51 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
  */
 void cgit_print_tree(const char *rev, char *path)
 {
  */
 void cgit_print_tree(const char *rev, char *path)
 {

-       unsigned char sha1[20];
+       struct object_id oid;

        struct commit *commit;
        struct commit *commit;

-       const char *paths[] = {path, NULL};
+       struct pathspec_item path_items = {
+               .match = path,
+               .len = path ? strlen(path) : 0
+       };
+       struct pathspec paths = {
+               .nr = path ? 1 : 0,
+               .items = &path_items
+       };
+       struct walk_tree_context walk_tree_ctx = {
+               .match_path = path,
+               .state = 0
+       };

 
        if (!rev)
                rev = ctx.qry.head;
 
 
        if (!rev)
                rev = ctx.qry.head;
 

-       curr_rev = xstrdup(rev);
-       if (get_sha1(rev, sha1)) {
-               cgit_print_error(fmt("Invalid revision name: %s", rev));
+       if (get_oid(rev, &oid)) {
+               cgit_print_error_page(404, "Not found",
+                       "Invalid revision name: %s", rev);

                return;
        }
                return;
        }

-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(the_repository, &oid);

        if (!commit || parse_commit(commit)) {
        if (!commit || parse_commit(commit)) {

-               cgit_print_error(fmt("Invalid commit reference: %s", rev));
+               cgit_print_error_page(404, "Not found",
+                       "Invalid commit reference: %s", rev);

                return;
        }
 
                return;
        }
 

-       html("path: <a href='");
-       html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
-       html("'>root</a>");
+       walk_tree_ctx.curr_rev = xstrdup(rev);

 
        if (path == NULL) {
 
        if (path == NULL) {

-               ls_tree(commit->tree->object.sha1, NULL);
-               return;
+               ls_tree(&commit->maybe_tree->object.oid, NULL, &walk_tree_ctx);
+               goto cleanup;

        }
 
        }
 

-       match_path = path;
-       read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
-       ls_tail();
+       read_tree_recursive(commit->maybe_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);

 }
 }