aboutsummaryrefslogtreecommitdiffstats
path: root/ui-plain.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-plain.c')
-rw-r--r--ui-plain.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 98e6908..8b0badd 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -10,7 +10,7 @@
10#include "html.h" 10#include "html.h"
11#include "ui-shared.h" 11#include "ui-shared.h"
12 12
13char *match_path; 13int match_baselen;
14int match; 14int match;
15 15
16static void print_object(const unsigned char *sha1, const char *path) 16static void print_object(const unsigned char *sha1, const char *path)
@@ -56,13 +56,21 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
56 const char *pathname, unsigned mode, int stage, 56 const char *pathname, unsigned mode, int stage,
57 void *cbdata) 57 void *cbdata)
58{ 58{
59 if (S_ISDIR(mode)) 59 if (baselen == match_baselen) {
60 if (S_ISREG(mode))
61 print_object(sha1, pathname);
62 }
63 else if (S_ISDIR(mode))
60 return READ_TREE_RECURSIVE; 64 return READ_TREE_RECURSIVE;
61 65
62 if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && 66 return 0;
63 !strcmp(pathname, match_path + baselen)) 67}
64 print_object(sha1, pathname);
65 68
69static int basedir_len(const char *path)
70{
71 char *p = strrchr(path, '/');
72 if (p)
73 return p - path + 1;
66 return 0; 74 return 0;
67} 75}
68 76
@@ -85,7 +93,7 @@ void cgit_print_plain(struct cgit_context *ctx)
85 html_status(404, "Not found", 0); 93 html_status(404, "Not found", 0);
86 return; 94 return;
87 } 95 }
88 match_path = ctx->qry.path; 96 match_baselen = basedir_len(paths[0]);
89 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); 97 read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
90 if (!match) 98 if (!match)
91 html_status(404, "Not found", 0); 99 html_status(404, "Not found", 0);