summaryrefslogtreecommitdiffabout
path: root/ui-plain.c
Unidiff
Diffstat (limited to 'ui-plain.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 35888a0..be559e0 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,82 +1,79 @@
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
13char *curr_rev; 13char *curr_rev;
14char *match_path; 14char *match_path;
15int match; 15int match;
16 16
17static void print_object(const unsigned char *sha1, const char *path) 17static void print_object(const unsigned char *sha1, const char *path)
18{ 18{
19 enum object_type type; 19 enum object_type type;
20 char *buf; 20 char *buf;
21 size_t size; 21 size_t size;
22 22
23 type = sha1_object_info(sha1, &size); 23 type = sha1_object_info(sha1, &size);
24 if (type == OBJ_BAD) { 24 if (type == OBJ_BAD) {
25 html_status(404, "Not found", 0); 25 html_status(404, "Not found", 0);
26 return; 26 return;
27 } 27 }
28 28
29 buf = read_sha1_file(sha1, &type, &size); 29 buf = read_sha1_file(sha1, &type, &size);
30 if (!buf) { 30 if (!buf) {
31 html_status(404, "Not found", 0); 31 html_status(404, "Not found", 0);
32 return; 32 return;
33 } 33 }
34 ctx.page.mimetype = "text/plain"; 34 ctx.page.mimetype = "text/plain";
35 ctx.page.filename = fmt("%s", path); 35 ctx.page.filename = fmt("%s", path);
36 ctx.page.size = size; 36 ctx.page.size = size;
37 cgit_print_http_headers(&ctx); 37 cgit_print_http_headers(&ctx);
38 html_raw(buf, size); 38 html_raw(buf, size);
39 match = 1; 39 match = 1;
40} 40}
41 41
42static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 42static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
43 const char *pathname, unsigned mode, int stage, 43 const char *pathname, unsigned mode, int stage,
44 void *cbdata) 44 void *cbdata)
45{ 45{
46 fprintf(stderr, "[cgit] walk_tree.pathname=%s", pathname); 46 if (S_ISDIR(mode))
47
48 if (!pathname || strcmp(match_path, pathname))
49 return READ_TREE_RECURSIVE; 47 return READ_TREE_RECURSIVE;
50 48
51 if (S_ISREG(mode)) 49 if (S_ISREG(mode))
52 print_object(sha1, pathname); 50 print_object(sha1, pathname);
53 51
54 return 0; 52 return 0;
55} 53}
56 54
57void cgit_print_plain(struct cgit_context *ctx) 55void cgit_print_plain(struct cgit_context *ctx)
58{ 56{
59 const char *rev = ctx->qry.sha1; 57 const char *rev = ctx->qry.sha1;
60 unsigned char sha1[20]; 58 unsigned char sha1[20];
61 struct commit *commit; 59 struct commit *commit;
62 const char *paths[] = {ctx->qry.path, NULL}; 60 const char *paths[] = {ctx->qry.path, NULL};
63 61
64 if (!rev) 62 if (!rev)
65 rev = ctx->qry.head; 63 rev = ctx->qry.head;
66 64
67 curr_rev = xstrdup(rev); 65 curr_rev = xstrdup(rev);
68 if (get_sha1(rev, sha1)) { 66 if (get_sha1(rev, sha1)) {
69 html_status(404, "Not found", 0); 67 html_status(404, "Not found", 0);
70 return; 68 return;
71 } 69 }
72 commit = lookup_commit_reference(sha1); 70 commit = lookup_commit_reference(sha1);
73 if (!commit || parse_commit(commit)) { 71 if (!commit || parse_commit(commit)) {
74 html_status(404, "Not found", 0); 72 html_status(404, "Not found", 0);
75 return; 73 return;
76 } 74 }
77 match_path = ctx->qry.path; 75 match_path = ctx->qry.path;
78 fprintf(stderr, "[cgit] match_path=%s", match_path);
79 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL); 76 read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
80 if (!match) 77 if (!match)
81 html_status(404, "Not found", 0); 78 html_status(404, "Not found", 0);
82} 79}