summaryrefslogtreecommitdiffabout
authorLars Hjemli <larsh@slackbox.hjemli.net>2009-09-06 17:33:27 (UTC)
committer Lars Hjemli <larsh@slackbox.hjemli.net>2009-09-06 17:33:27 (UTC)
commit670f99097939a08510c2c909cd38f8083800861a (patch) (unidiff)
tree87b3b382a35caafa1a3813d8f6b1d79a2a53c163
parentb44c40ea720aee9ba4412e192877e9632a70a259 (diff)
parentb507252b469333d06afff0888d466e39124a7e07 (diff)
downloadcgit-670f99097939a08510c2c909cd38f8083800861a.zip
cgit-670f99097939a08510c2c909cd38f8083800861a.tar.gz
cgit-670f99097939a08510c2c909cd38f8083800861a.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-plain.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 27c6dae..a4ce077 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -47,33 +47,34 @@ static void print_object(const unsigned char *sha1, const char *path)
47 } 47 }
48 ctx.page.filename = fmt("%s", path); 48 ctx.page.filename = fmt("%s", path);
49 ctx.page.size = size; 49 ctx.page.size = size;
50 ctx.page.etag = sha1_to_hex(sha1); 50 ctx.page.etag = sha1_to_hex(sha1);
51 cgit_print_http_headers(&ctx); 51 cgit_print_http_headers(&ctx);
52 html_raw(buf, size); 52 html_raw(buf, size);
53 match = 1; 53 match = 1;
54} 54}
55 55
56static int walk_tree(const unsigned char *sha1, const char *base, int baselen, 56static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
57 const char *pathname, unsigned mode, int stage, 57 const char *pathname, unsigned mode, int stage,
58 void *cbdata) 58 void *cbdata)
59{ 59{
60 if (S_ISDIR(mode)) 60 if (S_ISDIR(mode))
61 return READ_TREE_RECURSIVE; 61 return READ_TREE_RECURSIVE;
62 62
63 if (S_ISREG(mode)) 63 if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
64 !strcmp(pathname, match_path + baselen))
64 print_object(sha1, pathname); 65 print_object(sha1, pathname);
65 66
66 return 0; 67 return 0;
67} 68}
68 69
69void cgit_print_plain(struct cgit_context *ctx) 70void cgit_print_plain(struct cgit_context *ctx)
70{ 71{
71 const char *rev = ctx->qry.sha1; 72 const char *rev = ctx->qry.sha1;
72 unsigned char sha1[20]; 73 unsigned char sha1[20];
73 struct commit *commit; 74 struct commit *commit;
74 const char *paths[] = {ctx->qry.path, NULL}; 75 const char *paths[] = {ctx->qry.path, NULL};
75 76
76 if (!rev) 77 if (!rev)
77 rev = ctx->qry.head; 78 rev = ctx->qry.head;
78 79
79 curr_rev = xstrdup(rev); 80 curr_rev = xstrdup(rev);