diff options
author | Mark Lodato | 2010-01-31 01:07:41 -0500 |
---|---|---|
committer | Mark Lodato | 2010-01-31 17:08:49 -0500 |
commit | 74ebf82229829bbdbe74a4d9a7b6f29d2889dfc8 (patch) | |
tree | 0283b46ed39d886ff9665d76f0743de708751986 /ui-plain.c | |
parent | 89082346d50ec283a16d3127677f30b427781b6a (diff) | |
download | cgit-74ebf82229829bbdbe74a4d9a7b6f29d2889dfc8.tar cgit-74ebf82229829bbdbe74a4d9a7b6f29d2889dfc8.tar.gz cgit-74ebf82229829bbdbe74a4d9a7b6f29d2889dfc8.zip |
ui-plain: more efficient walk_tree()
Git's read_tree_recursive() already filters out the objects by pathname,
so we only have to compare baselen to the expected. That is, no string
matching is required.
Additionally, if the requested path is a directory, the old code would
walk through all of its immediate children. This is not necessary, this
so we no longer do that.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Diffstat (limited to 'ui-plain.c')
-rw-r--r-- | ui-plain.c | 20 |
1 files changed, 14 insertions, 6 deletions
@@ -10,7 +10,7 @@ #include "html.h" #include "ui-shared.h" -char *match_path; +int match_baselen; int match; static 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, const char *pathname, unsigned mode, int stage, void *cbdata) { - if (S_ISDIR(mode)) + if (baselen == match_baselen) { + if (S_ISREG(mode)) + print_object(sha1, pathname); + } + else if (S_ISDIR(mode)) return READ_TREE_RECURSIVE; - if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && - !strcmp(pathname, match_path + baselen)) - print_object(sha1, pathname); + return 0; +} +static int basedir_len(const char *path) +{ + char *p = strrchr(path, '/'); + if (p) + return p - path + 1; return 0; } @@ -85,7 +93,7 @@ void cgit_print_plain(struct cgit_context *ctx) html_status(404, "Not found", 0); return; } - match_path = ctx->qry.path; + match_baselen = basedir_len(paths[0]); read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); if (!match) html_status(404, "Not found", 0); |