]> gitweb.ps.run Git - ps-cgit/blobdiff - ui-plain.c
projects / ps-cgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
log: allow users to follow a file
[ps-cgit] / ui-plain.c
diff --git a/ui-plain.c b/ui-plain.c
index 482d53a89f3d02d231f71fbee5d70874a618c1b4..b787bc3c776b01587c297a211cb1e3638eb6de66 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,6 +1,6 @@
 /* ui-plain.c: functions for output of plain blobs by path
  *
 /* ui-plain.c: functions for output of plain blobs by path
  *
- * Copyright (C) 2008 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -83,22 +83,27 @@ static int print_object(const unsigned char *sha1, const char *path)
                mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
                if (mime) {
                        ctx.page.mimetype = (char *)mime->util;
                mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
                if (mime) {
                        ctx.page.mimetype = (char *)mime->util;
+                       ctx.page.charset = NULL;
                } else {
                        ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
                } else {
                        ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
-                       if (ctx.page.mimetype)
+                       if (ctx.page.mimetype) {
                                freemime = 1;
                                freemime = 1;
+                               ctx.page.charset = NULL;
+                       }
                }
        }
        if (!ctx.page.mimetype) {
                }
        }
        if (!ctx.page.mimetype) {
-               if (buffer_is_binary(buf, size))
+               if (buffer_is_binary(buf, size)) {
                        ctx.page.mimetype = "application/octet-stream";
                        ctx.page.mimetype = "application/octet-stream";
-               else
+                       ctx.page.charset = NULL;
+               } else {
                        ctx.page.mimetype = "text/plain";
                        ctx.page.mimetype = "text/plain";
+               }
        }
        }
-       ctx.page.filename = fmt("%s", path);
+       ctx.page.filename = path;
        ctx.page.size = size;
        ctx.page.etag = sha1_to_hex(sha1);
        ctx.page.size = size;
        ctx.page.etag = sha1_to_hex(sha1);
-       cgit_print_http_headers(&ctx);
+       cgit_print_http_headers();
        html_raw(buf, size);
        /* If we allocated this, then casting away const is safe. */
        if (freemime)
        html_raw(buf, size);
        /* If we allocated this, then casting away const is safe. */
        if (freemime)
@@ -109,9 +114,9 @@ static int print_object(const unsigned char *sha1, const char *path)
 static char *buildpath(const char *base, int baselen, const char *path)
 {
        if (path[0])
 static char *buildpath(const char *base, int baselen, const char *path)
 {
        if (path[0])
-               return fmt("%.*s%s/", baselen, base, path);
+               return fmtalloc("%.*s%s/", baselen, base, path);
        else
        else
-               return fmt("%.*s/", baselen, base);
+               return fmtalloc("%.*s/", baselen, base);
 }
 
 static void print_dir(const unsigned char *sha1, const char *base,
 }
 
 static void print_dir(const unsigned char *sha1, const char *base,
@@ -123,7 +128,7 @@ static void print_dir(const unsigned char *sha1, const char *base,
        fullpath = buildpath(base, baselen, path);
        slash = (fullpath[0] == '/' ? "" : "/");
        ctx.page.etag = sha1_to_hex(sha1);
        fullpath = buildpath(base, baselen, path);
        slash = (fullpath[0] == '/' ? "" : "/");
        ctx.page.etag = sha1_to_hex(sha1);
-       cgit_print_http_headers(&ctx);
+       cgit_print_http_headers();
        htmlf("<html><head><title>%s", slash);
        html_txt(fullpath);
        htmlf("</title></head>\n<body>\n<h2>%s", slash);
        htmlf("<html><head><title>%s", slash);
        html_txt(fullpath);
        htmlf("</title></head>\n<body>\n<h2>%s", slash);
@@ -142,6 +147,7 @@ static void print_dir(const unsigned char *sha1, const char *base,
                                fullpath);
                html("</li>\n");
        }
                                fullpath);
                html("</li>\n");
        }
+       free(fullpath);
 }
 
 static void print_dir_entry(const unsigned char *sha1, const char *base,
 }
 
 static void print_dir_entry(const unsigned char *sha1, const char *base,
@@ -159,6 +165,7 @@ static void print_dir_entry(const unsigned char *sha1, const char *base,
                cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
        html("</li>\n");
                cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
        html("</li>\n");
+       free(fullpath);
 }
 
 static void print_dir_tail(void)
 }
 
 static void print_dir_tail(void)
@@ -166,23 +173,22 @@ static void print_dir_tail(void)
        html(" </ul>\n</body></html>\n");
 }
 
        html(" </ul>\n</body></html>\n");
 }
 
-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;
 
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 
-       if (baselen == walk_tree_ctx->match_baselen) {
+       if (base->len == walk_tree_ctx->match_baselen) {
                if (S_ISREG(mode)) {
                        if (print_object(sha1, pathname))
                                walk_tree_ctx->match = 1;
                } else if (S_ISDIR(mode)) {
                if (S_ISREG(mode)) {
                        if (print_object(sha1, pathname))
                                walk_tree_ctx->match = 1;
                } else if (S_ISDIR(mode)) {
-                       print_dir(sha1, base, baselen, pathname);
+                       print_dir(sha1, base->buf, base->len, pathname);
                        walk_tree_ctx->match = 2;
                        return READ_TREE_RECURSIVE;
                }
                        walk_tree_ctx->match = 2;
                        return READ_TREE_RECURSIVE;
                }
-       } else if (baselen > walk_tree_ctx->match_baselen) {
-               print_dir_entry(sha1, base, baselen, pathname, mode);
+       } else if (base->len > walk_tree_ctx->match_baselen) {
+               print_dir_entry(sha1, base->buf, base->len, pathname, mode);
                walk_tree_ctx->match = 2;
        } else if (S_ISDIR(mode)) {
                return READ_TREE_RECURSIVE;
                walk_tree_ctx->match = 2;
        } else if (S_ISDIR(mode)) {
                return READ_TREE_RECURSIVE;
@@ -199,14 +205,14 @@ static int basedir_len(const char *path)
        return 0;
 }
 
        return 0;
 }
 
-void cgit_print_plain(struct cgit_context *ctx)
+void cgit_print_plain(void)
 {
 {
-       const char *rev = ctx->qry.sha1;
+       const char *rev = ctx.qry.sha1;
        unsigned char sha1[20];
        struct commit *commit;
        struct pathspec_item path_items = {
        unsigned char sha1[20];
        struct commit *commit;
        struct pathspec_item path_items = {
-               .match = ctx->qry.path,
-               .len = ctx->qry.path ? strlen(ctx->qry.path) : 0
+               .match = ctx.qry.path,
+               .len = ctx.qry.path ? strlen(ctx.qry.path) : 0
        };
        struct pathspec paths = {
                .nr = 1,
        };
        struct pathspec paths = {
                .nr = 1,
@@ -217,7 +223,7 @@ void cgit_print_plain(struct cgit_context *ctx)
        };
 
        if (!rev)
        };
 
        if (!rev)
-               rev = ctx->qry.head;
+               rev = ctx.qry.head;
 
        if (get_sha1(rev, sha1)) {
                html_status(404, "Not found", 0);
 
        if (get_sha1(rev, sha1)) {
                html_status(404, "Not found", 0);
Unnamed repository; edit this file 'description' to name the repository.