ui-snapshot.c: Fill argv[0] with dummy.

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index b1adcc7b21e5044f489f751c21852400a329f322..4d932a0fbdcd82ba14a449e3f731931f8907542c 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -27,10 +27,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++;


@@ -202,6 +202,9 @@ static void ls_tail()
 static void ls_tree(const unsigned char *sha1, char *path)
 {
        struct tree *tree;
 static void ls_tree(const unsigned char *sha1, char *path)
 {
        struct tree *tree;

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

 
        tree = parse_tree_indirect(sha1);
        if (!tree) {
 
        tree = parse_tree_indirect(sha1);
        if (!tree) {


@@ -211,7 +214,7 @@ static void ls_tree(const unsigned char *sha1, char *path)
        }
 
        ls_head();
        }
 
        ls_head();

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

        ls_tail();
 }
 
        ls_tail();
 }
 


@@ -225,7 +228,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 
        if (state == 0) {
                memcpy(buffer, base, baselen);
 
        if (state == 0) {
                memcpy(buffer, base, baselen);

-               strcpy(buffer+baselen, pathname);
+               strcpy(buffer + baselen, pathname);

                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;
 
                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;
 


@@ -252,7 +255,14 @@ void cgit_print_tree(const char *rev, char *path)
 {
        unsigned char sha1[20];
        struct commit *commit;
 {
        unsigned char sha1[20];
        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
+       };

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


@@ -274,6 +284,6 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        match_path = path;
        }
 
        match_path = path;

-       read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+       read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);

        ls_tail();
 }
        ls_tail();
 }