Avoid signed bitfields

[cgit.git] / ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 7aec0b17c8124eeff685aa4be1b3ea55884b5f17..388a0177a30487959c0fb35d40cff64ce278aedf 100644 (file)
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,36 +1,66 @@
 /* ui-blob.c: show blob content
  *
- * Copyright (C) 2008 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
+#include "ui-blob.h"
 #include "html.h"
 #include "ui-shared.h"
 
 struct walk_tree_context {
-       char *match_path;
+       const char *match_path;
        unsigned char *matched_sha1;
-       int found_path;
+       unsigned int found_path:1;
+       unsigned int file_only:1;
 };
 
-static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
-       const char *pathname, unsigned mode, int stage, void *cbdata)
+static int walk_tree(const unsigned char *sha1, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 
-       if (strncmp(base, walk_tree_ctx->match_path, baselen)
-               || strcmp(walk_tree_ctx->match_path + baselen, pathname))
+       if (walk_tree_ctx->file_only && !S_ISREG(mode))
+               return READ_TREE_RECURSIVE;
+       if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
+               || strcmp(walk_tree_ctx->match_path + base->len, pathname))
                return READ_TREE_RECURSIVE;
        memmove(walk_tree_ctx->matched_sha1, sha1, 20);
        walk_tree_ctx->found_path = 1;
        return 0;
 }
 
-int cgit_print_file(char *path, const char *head)
+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,
+               .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;
+}
+
+int cgit_print_file(char *path, const char *head, int file_only)
 {
        unsigned char sha1[20];
        enum object_type type;
@@ -48,7 +78,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))
@@ -71,7 +102,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;
@@ -89,16 +120,18 @@ 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) {
                if (get_sha1_hex(hex, sha1)) {
-                       cgit_print_error(fmt("Bad hex value: %s", hex));
+                       cgit_print_error("Bad hex value: %s", hex);
                        return;
                }
        } else {
                if (get_sha1(head, sha1)) {
-                       cgit_print_error(fmt("Bad ref: %s", head));
+                       cgit_print_error("Bad ref: %s", head);
                        return;
                }
        }
@@ -112,13 +145,13 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
        }
 
        if (type == OBJ_BAD) {
-               cgit_print_error(fmt("Bad object name: %s", hex));
+               cgit_print_error("Bad object name: %s", hex);
                return;
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
-               cgit_print_error(fmt("Error reading object %s", hex));
+               cgit_print_error("Error reading object %s", hex);
                return;
        }
 
@@ -131,6 +164,6 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
                        ctx.page.mimetype = "text/plain";
        }
        ctx.page.filename = path;
-       cgit_print_http_headers(&ctx);
+       cgit_print_http_headers();
        html_raw(buf, size);
 }