aboutsummaryrefslogtreecommitdiff
path: root/ui-blob.c
diff options
context:
space:
mode:
Diffstat (limited to 'ui-blob.c')
-rw-r--r--ui-blob.c61
1 files changed, 34 insertions, 27 deletions
diff --git a/ui-blob.c b/ui-blob.c
index b4be139..eb14a75 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,7 +1,7 @@
/* ui-blob.c: show blob content
*
* Copyright (C) 2008 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com>
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
@@ -15,7 +15,8 @@
struct walk_tree_context {
const char *match_path;
unsigned char *matched_sha1;
- int found_path;
+ int found_path:1;
+ int file_only:1;
};
static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
@@ -23,6 +24,8 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
{
struct walk_tree_context *walk_tree_ctx = cbdata;
+ if (walk_tree_ctx->file_only && !S_ISREG(mode))
+ return READ_TREE_RECURSIVE;
if (strncmp(base, walk_tree_ctx->match_path, baselen)
|| strcmp(walk_tree_ctx->match_path + baselen, pathname))
return READ_TREE_RECURSIVE;
@@ -31,33 +34,34 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
return 0;
}
-int cgit_ref_path_exists(const char *path, const char *ref)
+int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
{
- unsigned char sha1[20];
- unsigned long size;
- struct pathspec_item path_items = {
- .match = path,
- .len = strlen(path)
- };
- struct pathspec paths = {
- .nr = 1,
- .items = &path_items
- };
- struct walk_tree_context walk_tree_ctx = {
- .match_path = path,
- .matched_sha1 = sha1,
- .found_path = 0
- };
+ unsigned char sha1[20];
+ unsigned long size;
+ struct pathspec_item path_items = {
+ .match = path,
+ .len = strlen(path)
+ };
+ struct pathspec paths = {
+ .nr = 1,
+ .items = &path_items
+ };
+ struct walk_tree_context walk_tree_ctx = {
+ .match_path = path,
+ .matched_sha1 = sha1,
+ .found_path = 0,
+ .file_only = file_only
+ };
- if (get_sha1(ref, sha1))
- return 0;
- if (sha1_object_info(sha1, &size) != OBJ_COMMIT)
- return 0;
- read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
- return walk_tree_ctx.found_path;
+ if (get_sha1(ref, sha1))
+ return 0;
+ if (sha1_object_info(sha1, &size) != OBJ_COMMIT)
+ return 0;
+ read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+ return walk_tree_ctx.found_path;
}
-int cgit_print_file(char *path, const char *head)
+int cgit_print_file(char *path, const char *head, int file_only)
{
unsigned char sha1[20];
enum object_type type;
@@ -75,7 +79,8 @@ int cgit_print_file(char *path, const char *head)
struct walk_tree_context walk_tree_ctx = {
.match_path = path,
.matched_sha1 = sha1,
- .found_path = 0
+ .found_path = 0,
+ .file_only = file_only
};
if (get_sha1(head, sha1))
@@ -98,7 +103,7 @@ int cgit_print_file(char *path, const char *head)
return 0;
}
-void cgit_print_blob(const char *hex, char *path, const char *head)
+void cgit_print_blob(const char *hex, char *path, const char *head, int file_only)
{
unsigned char sha1[20];
enum object_type type;
@@ -116,6 +121,8 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
struct walk_tree_context walk_tree_ctx = {
.match_path = path,
.matched_sha1 = sha1,
+ .found_path = 0,
+ .file_only = file_only
};
if (hex) {