ui-shared: currenturl should take into account leading slash

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 5ae39269cc7278d6cbaa41df5ee35b032be1e0cc..bbc468ef7ec03395dfc04daa240e8c1330fcd41e 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -45,13 +45,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);
+               cgit_open_filter(ctx.repo->source_filter, filter_arg);

                html_raw(buf, size);
                cgit_close_filter(ctx.repo->source_filter);
                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;
        }
                html("</code></pre></td></tr></table>\n");
                return;
        }


@@ -122,9 +121,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;
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
        char *name;


@@ -182,7 +180,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        return 0;
 }
 
        return 0;
 }
 

-static void ls_head()
+static void ls_head(void)

 {
        html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");
 {
        html("<table summary='tree listing' class='list'>\n");
        html("<tr class='nohover'>");


@@ -193,7 +191,7 @@ static void ls_head()
        html("</tr>\n");
 }
 
        html("</tr>\n");
 }
 

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

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


@@ -217,16 +215,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) {
 {
        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;
 
                if (strcmp(walk_tree_ctx->match_path, buffer))
                        return READ_TREE_RECURSIVE;
 


@@ -239,11 +236,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                        return 0;
                }
        }
                        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;
 }
 
        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