Add support for cloning over http

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 2f052c71e13077ca2caed29a419401b39062ed6b..9a837e2a058c28f8b371a73d04e725ec9dab8951 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -62,7 +62,8 @@ static void print_object(const unsigned char *sha1, char *path)
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,

-                  const char *pathname, unsigned int mode, int stage)
+                  const char *pathname, unsigned int mode, int stage,
+                  void *cbdata)

 {
        char *name;
        char *fullpath;
 {
        char *name;
        char *fullpath;


@@ -73,12 +74,14 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
                       ctx.qry.path ? "/" : "", name);
 
        fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
                       ctx.qry.path ? "/" : "", name);
 

-       type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
-               htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
-                     name,
-                     sha1_to_hex(sha1));
-               return 0;
+       if (!S_ISGITLINK(mode)) {
+               type = sha1_object_info(sha1, &size);
+               if (type == OBJ_BAD) {
+                       htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+                             name,
+                             sha1_to_hex(sha1));
+                       return 0;
+               }

        }
 
        html("<tr><td class='ls-mode'>");
        }
 
        html("<tr><td class='ls-mode'>");


@@ -141,13 +144,14 @@ static void ls_tree(const unsigned char *sha1, char *path)
        }
 
        ls_head();
        }
 
        ls_head();

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

        ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,

-                    const char *pathname, unsigned mode, int stage)
+                    const char *pathname, unsigned mode, int stage,
+                    void *cbdata)

 {
        static int state;
        static char buffer[PATH_MAX];
 {
        static int state;
        static char buffer[PATH_MAX];


@@ -174,7 +178,7 @@ 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);
+       ls_item(sha1, base, baselen, pathname, mode, stage, NULL);

        return 0;
 }
 
        return 0;
 }
 


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

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

        ls_tail();
 }
        ls_tail();
 }