manpage: fix sorting order

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index d38848984cf4f6b433ba4530872eccb3c550f526..7b6da2a491b83f08642ba1f32bcadb5d5d0224df 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -13,12 +13,12 @@
 
 struct walk_tree_context {
        const char *match_path;
 
 struct walk_tree_context {
        const char *match_path;

-       unsigned char *matched_sha1;
+       struct object_id *matched_oid;

        unsigned int found_path:1;
        unsigned int file_only:1;
 };
 
        unsigned int found_path:1;
        unsigned int file_only:1;
 };
 

-static int walk_tree(const unsigned char *sha1, struct strbuf *base,
+static int walk_tree(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;
                const char *pathname, unsigned mode, int stage, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;


@@ -28,17 +28,17 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base,
        if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
                || strcmp(walk_tree_ctx->match_path + base->len, pathname))
                return READ_TREE_RECURSIVE;
        if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
                || strcmp(walk_tree_ctx->match_path + base->len, pathname))
                return READ_TREE_RECURSIVE;

-       memmove(walk_tree_ctx->matched_sha1, sha1, 20);
+       oidcpy(walk_tree_ctx->matched_oid, oid);

        walk_tree_ctx->found_path = 1;
        return 0;
 }
 
 int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
 {
        walk_tree_ctx->found_path = 1;
        return 0;
 }
 
 int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
 {

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

        unsigned long size;
        struct pathspec_item path_items = {
        unsigned long size;
        struct pathspec_item path_items = {

-               .match = path,
+               .match = xstrdup(path),

                .len = strlen(path)
        };
        struct pathspec paths = {
                .len = strlen(path)
        };
        struct pathspec paths = {


@@ -47,22 +47,25 @@ int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
        };
        struct walk_tree_context walk_tree_ctx = {
                .match_path = path,
        };
        struct walk_tree_context walk_tree_ctx = {
                .match_path = path,

-               .matched_sha1 = sha1,
+               .matched_oid = &oid,

                .found_path = 0,
                .file_only = file_only
        };
 
                .found_path = 0,
                .file_only = file_only
        };
 

-       if (get_sha1(ref, sha1))
-               return 0;
-       if (sha1_object_info(sha1, &size) != OBJ_COMMIT)
-               return 0;
-       read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+       if (get_oid(ref, &oid))
+               goto done;
+       if (oid_object_info(the_repository, &oid, &size) != OBJ_COMMIT)
+               goto done;
+       read_tree_recursive(lookup_commit_reference(&oid)->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+
+done:
+       free(path_items.match);

        return walk_tree_ctx.found_path;
 }
 
 int cgit_print_file(char *path, const char *head, int file_only)
 {
        return walk_tree_ctx.found_path;
 }
 
 int cgit_print_file(char *path, const char *head, int file_only)
 {

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

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


@@ -77,24 +80,24 @@ int cgit_print_file(char *path, const char *head, int file_only)
        };
        struct walk_tree_context walk_tree_ctx = {
                .match_path = path,
        };
        struct walk_tree_context walk_tree_ctx = {
                .match_path = path,

-               .matched_sha1 = sha1,
+               .matched_oid = &oid,

                .found_path = 0,
                .file_only = file_only
        };
 
                .found_path = 0,
                .file_only = file_only
        };
 

-       if (get_sha1(head, sha1))
+       if (get_oid(head, &oid))

                return -1;
                return -1;

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

        if (type == OBJ_COMMIT) {
        if (type == OBJ_COMMIT) {

-               commit = lookup_commit_reference(sha1);
-               read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+               commit = lookup_commit_reference(&oid);
+               read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);

                if (!walk_tree_ctx.found_path)
                        return -1;
                if (!walk_tree_ctx.found_path)
                        return -1;

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

        }
        if (type == OBJ_BAD)
                return -1;
        }
        if (type == OBJ_BAD)
                return -1;

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

        if (!buf)
                return -1;
        buf[size] = '\0';
        if (!buf)
                return -1;
        buf[size] = '\0';


@@ -105,7 +108,7 @@ int cgit_print_file(char *path, const char *head, int file_only)
 
 void cgit_print_blob(const char *hex, char *path, const char *head, int file_only)
 {
 
 void cgit_print_blob(const char *hex, char *path, const char *head, int file_only)
 {

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

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


@@ -120,31 +123,31 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
        };
        struct walk_tree_context walk_tree_ctx = {
                .match_path = path,
        };
        struct walk_tree_context walk_tree_ctx = {
                .match_path = path,

-               .matched_sha1 = sha1,
+               .matched_oid = &oid,

                .found_path = 0,
                .file_only = file_only
        };
 
        if (hex) {
                .found_path = 0,
                .file_only = file_only
        };
 
        if (hex) {

-               if (get_sha1_hex(hex, sha1)) {
+               if (get_oid_hex(hex, &oid)) {

                        cgit_print_error_page(400, "Bad request",
                                        "Bad hex value: %s", hex);
                        return;
                }
        } else {
                        cgit_print_error_page(400, "Bad request",
                                        "Bad hex value: %s", hex);
                        return;
                }
        } else {

-               if (get_sha1(head, sha1)) {
+               if (get_oid(head, &oid)) {

                        cgit_print_error_page(404, "Not found",
                                        "Bad ref: %s", head);
                        return;
                }
        }
 
                        cgit_print_error_page(404, "Not found",
                                        "Bad ref: %s", head);
                        return;
                }
        }
 

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

 
        if ((!hex) && type == OBJ_COMMIT && path) {
 
        if ((!hex) && type == OBJ_COMMIT && path) {

-               commit = lookup_commit_reference(sha1);
-               read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
-               type = sha1_object_info(sha1,&size);
+               commit = lookup_commit_reference(&oid);
+               read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+               type = oid_object_info(the_repository, &oid, &size);

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


@@ -153,7 +156,7 @@ void cgit_print_blob(const char *hex, char *path, const char *head, int file_onl
                return;
        }
 
                return;
        }
 

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

        if (!buf) {
                cgit_print_error_page(500, "Internal server error",
                                "Error reading object %s", hex);
        if (!buf) {
                cgit_print_error_page(500, "Internal server error",
                                "Error reading object %s", hex);