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

[ps-cgit] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 667a45111bf16c8fc7d8bf55303782f27ebd357a..d382ba3202604b04be2c3d515825b8c524b64dd7 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -15,12 +15,12 @@ static char *match_path;
 static unsigned char *matched_sha1;
 static int found_path;
 
-static int walk_tree(const unsigned char *sha1, const char *base,int baselen,
+static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        const char *pathname, unsigned mode, int stage, void *cbdata) {
-       if(strncmp(base,match_path,baselen)
-               || strcmp(match_path+baselen,pathname) )
+       if (strncmp(base, match_path, baselen)
+               || strcmp(match_path + baselen, pathname))
                return READ_TREE_RECURSIVE;
-       memmove(matched_sha1,sha1,20);
+       memmove(matched_sha1, sha1, 20);
        found_path = 1;
        return 0;
 }
@@ -32,16 +32,23 @@ int cgit_print_file(char *path, const char *head)
        char *buf;
        unsigned long size;
        struct commit *commit;
-       const char *paths[] = {path, NULL};
+       struct pathspec_item path_items = {
+               .match = path,
+               .len = strlen(path)
+       };
+       struct pathspec paths = {
+               .nr = 1,
+               .items = &path_items
+       };
        if (get_sha1(head, sha1))
                return -1;
        type = sha1_object_info(sha1, &size);
-       if(type == OBJ_COMMIT && path) {
+       if (type == OBJ_COMMIT && path) {
                commit = lookup_commit_reference(sha1);
                match_path = path;
                matched_sha1 = sha1;
                found_path = 0;
-               read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+               read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
                if (!found_path)
                        return -1;
                type = sha1_object_info(sha1, &size);
@@ -52,7 +59,7 @@ int cgit_print_file(char *path, const char *head)
        if (!buf)
                return -1;
        buf[size] = '\0';
-       write(htmlfd, buf, size);
+       html_raw(buf, size);
        return 0;
 }
 
@@ -63,15 +70,22 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
        char *buf;
        unsigned long size;
        struct commit *commit;
-       const char *paths[] = {path, NULL};
+       struct pathspec_item path_items = {
+               .match = path,
+               .len = strlen(path)
+       };
+       struct pathspec paths = {
+               .nr = 1,
+               .items = &path_items
+       };
 
        if (hex) {
-               if (get_sha1_hex(hex, sha1)){
+               if (get_sha1_hex(hex, sha1)) {
                        cgit_print_error(fmt("Bad hex value: %s", hex));
                        return;
                }
        } else {
-               if (get_sha1(head,sha1)) {
+               if (get_sha1(head, sha1)) {
                        cgit_print_error(fmt("Bad ref: %s", head));
                        return;
                }
@@ -79,11 +93,11 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 
        type = sha1_object_info(sha1, &size);
 
-       if((!hex) && type == OBJ_COMMIT && path) {
+       if ((!hex) && type == OBJ_COMMIT && path) {
                commit = lookup_commit_reference(sha1);
                match_path = path;
                matched_sha1 = sha1;
-               read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
+               read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, NULL);
                type = sha1_object_info(sha1,&size);
        }
 
@@ -108,5 +122,5 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
        }
        ctx.page.filename = path;
        cgit_print_http_headers(&ctx);
-       write(htmlfd, buf, size);
+       html_raw(buf, size);
 }