|
|
|
@@ -1,25 +1,24 @@ |
1 | /* ui-plain.c: functions for output of plain blobs by path |
1 | /* ui-plain.c: functions for output of plain blobs by path |
2 | * |
2 | * |
3 | * Copyright (C) 2008 Lars Hjemli |
3 | * Copyright (C) 2008 Lars Hjemli |
4 | * |
4 | * |
5 | * Licensed under GNU General Public License v2 |
5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) |
6 | * (see COPYING for full license text) |
7 | */ |
7 | */ |
8 | |
8 | |
9 | #include "cgit.h" |
9 | #include "cgit.h" |
10 | #include "html.h" |
10 | #include "html.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
12 | |
12 | |
13 | char *curr_rev; |
| |
14 | char *match_path; |
13 | char *match_path; |
15 | int match; |
14 | int match; |
16 | |
15 | |
17 | static void print_object(const unsigned char *sha1, const char *path) |
16 | static void print_object(const unsigned char *sha1, const char *path) |
18 | { |
17 | { |
19 | enum object_type type; |
18 | enum object_type type; |
20 | char *buf, *ext; |
19 | char *buf, *ext; |
21 | unsigned long size; |
20 | unsigned long size; |
22 | struct string_list_item *mime; |
21 | struct string_list_item *mime; |
23 | |
22 | |
24 | type = sha1_object_info(sha1, &size); |
23 | type = sha1_object_info(sha1, &size); |
25 | if (type == OBJ_BAD) { |
24 | if (type == OBJ_BAD) { |
@@ -68,25 +67,24 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, |
68 | } |
67 | } |
69 | |
68 | |
70 | void cgit_print_plain(struct cgit_context *ctx) |
69 | void cgit_print_plain(struct cgit_context *ctx) |
71 | { |
70 | { |
72 | const char *rev = ctx->qry.sha1; |
71 | const char *rev = ctx->qry.sha1; |
73 | unsigned char sha1[20]; |
72 | unsigned char sha1[20]; |
74 | struct commit *commit; |
73 | struct commit *commit; |
75 | const char *paths[] = {ctx->qry.path, NULL}; |
74 | const char *paths[] = {ctx->qry.path, NULL}; |
76 | |
75 | |
77 | if (!rev) |
76 | if (!rev) |
78 | rev = ctx->qry.head; |
77 | rev = ctx->qry.head; |
79 | |
78 | |
80 | curr_rev = xstrdup(rev); |
| |
81 | if (get_sha1(rev, sha1)) { |
79 | if (get_sha1(rev, sha1)) { |
82 | html_status(404, "Not found", 0); |
80 | html_status(404, "Not found", 0); |
83 | return; |
81 | return; |
84 | } |
82 | } |
85 | commit = lookup_commit_reference(sha1); |
83 | commit = lookup_commit_reference(sha1); |
86 | if (!commit || parse_commit(commit)) { |
84 | if (!commit || parse_commit(commit)) { |
87 | html_status(404, "Not found", 0); |
85 | html_status(404, "Not found", 0); |
88 | return; |
86 | return; |
89 | } |
87 | } |
90 | match_path = ctx->qry.path; |
88 | match_path = ctx->qry.path; |
91 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
89 | read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); |
92 | if (!match) |
90 | if (!match) |
|