Avoid use of non-reentrant functions

[cgit.git] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 1b2b67297b215ef632ebd0d36bd9cef413e4dee2..0dd1a8b9129b2ffcdc983d300f83e2ab066e6432 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,82 +1,114 @@
 /* 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)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "ui-plain.h"

 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 

-int match_baselen;
-int match;
+struct walk_tree_context {
+       int match_baselen;
+       int match;
+};

 
 

-static void print_object(const unsigned char *sha1, const char *path)
+static int print_object(const unsigned char *sha1, const char *path)

 {
        enum object_type type;
 {
        enum object_type type;

-       char *buf, *ext;
+       char *buf, *mimetype;

        unsigned long size;
        unsigned long size;

-       struct string_list_item *mime;

 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {

-               html_status(404, "Not found", 0);
-               return;
+               cgit_print_error_page(404, "Not found", "Not found");
+               return 0;

        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {
        }
 
        buf = read_sha1_file(sha1, &type, &size);
        if (!buf) {

-               html_status(404, "Not found", 0);
-               return;
-       }
-       ctx.page.mimetype = NULL;
-       ext = strrchr(path, '.');
-       if (ext && *(++ext)) {
-               mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
-               if (mime)
-                       ctx.page.mimetype = (char *)mime->util;
+               cgit_print_error_page(404, "Not found", "Not found");
+               return 0;

        }
        }

+
+       mimetype = get_mimetype_for_filename(path);
+       ctx.page.mimetype = mimetype;
+

        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);
        html_raw(buf, size);

-       match = 1;
+       free(mimetype);
+       return 1;

 }
 
 }
 

-static void print_dir(const unsigned char *sha1, const char *path,
-                     const char *base)
+static char *buildpath(const char *base, int baselen, const char *path)

 {
 {

-       char *fullpath;
-       if (path[0] || base[0])
-               fullpath = fmt("/%s%s/", base, path);
+       if (path[0])
+               return fmtalloc("%.*s%s/", baselen, base, path);

        else
        else

-               fullpath = "/";
+               return fmtalloc("%.*s/", baselen, base);
+}
+
+static void print_dir(const unsigned char *sha1, const char *base,
+                     int baselen, const char *path)
+{
+       char *fullpath, *slash;
+       size_t len;
+
+       fullpath = buildpath(base, baselen, path);
+       slash = (fullpath[0] == '/' ? "" : "/");

        ctx.page.etag = sha1_to_hex(sha1);
        ctx.page.etag = sha1_to_hex(sha1);

-       cgit_print_http_headers(&ctx);
-       htmlf("<html><head><title>%s</title></head>\n<body>\n"
-             " <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
-       if (path[0] || base[0])
-             html("  <li><a href=\"../\">../</a></li>\n");
-       match = 2;
+       cgit_print_http_headers();
+       htmlf("<html><head><title>%s", slash);
+       html_txt(fullpath);
+       htmlf("</title></head>\n<body>\n<h2>%s", slash);
+       html_txt(fullpath);
+       html("</h2>\n<ul>\n");
+       len = strlen(fullpath);
+       if (len > 1) {
+               fullpath[len - 1] = 0;
+               slash = strrchr(fullpath, '/');
+               if (slash)
+                       *(slash + 1) = 0;
+               else
+                       fullpath = NULL;
+               html("<li>");
+               cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                               fullpath);
+               html("</li>\n");
+       }
+       free(fullpath);

 }
 
 }
 

-static void print_dir_entry(const unsigned char *sha1, const char *path,
-                           unsigned mode)
+static void print_dir_entry(const unsigned char *sha1, const char *base,
+                           int baselen, const char *path, unsigned mode)

 {
 {

-       const char *sep = "";
-       if (S_ISDIR(mode))
-               sep = "/";
-       htmlf("  <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
-       match = 2;
+       char *fullpath;
+
+       fullpath = buildpath(base, baselen, path);
+       if (!S_ISDIR(mode) && !S_ISGITLINK(mode))
+               fullpath[strlen(fullpath) - 1] = 0;
+       html("  <li>");
+       if (S_ISGITLINK(mode)) {
+               cgit_submodule_link(NULL, fullpath, sha1_to_hex(sha1));
+       } else
+               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)


@@ -84,22 +116,26 @@ 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)

 {
 {

-       if (baselen == match_baselen) {
-               if (S_ISREG(mode))
-                       print_object(sha1, pathname);
-               else if (S_ISDIR(mode)) {
-                       print_dir(sha1, pathname, base);
+       struct walk_tree_context *walk_tree_ctx = cbdata;
+
+       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)) {
+                       print_dir(sha1, base->buf, base->len, pathname);
+                       walk_tree_ctx->match = 2;

                        return READ_TREE_RECURSIVE;
                }
                        return READ_TREE_RECURSIVE;
                }

-       }
-       else if (baselen > match_baselen)
-               print_dir_entry(sha1, pathname, mode);
-       else if (S_ISDIR(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;
                return READ_TREE_RECURSIVE;

+       }

 
        return 0;
 }
 
        return 0;
 }


@@ -112,35 +148,46 @@ 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;
        unsigned char sha1[20];
        struct commit *commit;

-       const char *paths[] = {ctx->qry.path, NULL};
+       struct pathspec_item path_items = {
+               .match = ctx.qry.path,
+               .len = ctx.qry.path ? strlen(ctx.qry.path) : 0
+       };
+       struct pathspec paths = {
+               .nr = 1,
+               .items = &path_items
+       };
+       struct walk_tree_context walk_tree_ctx = {
+               .match = 0
+       };

 
        if (!rev)
 
        if (!rev)

-               rev = ctx->qry.head;
+               rev = ctx.qry.head;

 
        if (get_sha1(rev, sha1)) {
 
        if (get_sha1(rev, sha1)) {

-               html_status(404, "Not found", 0);
+               cgit_print_error_page(404, "Not found", "Not found");

                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit || parse_commit(commit)) {
                return;
        }
        commit = lookup_commit_reference(sha1);
        if (!commit || parse_commit(commit)) {

-               html_status(404, "Not found", 0);
+               cgit_print_error_page(404, "Not found", "Not found");

                return;
        }
                return;
        }

-       if (!paths[0]) {
-               paths[0] = "";
-               match_baselen = -1;
-               print_dir(commit->tree->object.sha1, "", "");
+       if (!path_items.match) {
+               path_items.match = "";
+               walk_tree_ctx.match_baselen = -1;
+               print_dir(commit->tree->object.sha1, "", 0, "");
+               walk_tree_ctx.match = 2;

        }
        else
        }
        else

-               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);
-       else if (match == 2)
+               walk_tree_ctx.match_baselen = basedir_len(path_items.match);
+       read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+       if (!walk_tree_ctx.match)
+               cgit_print_error_page(404, "Not found", "Not found");
+       else if (walk_tree_ctx.match == 2)

                print_dir_tail();
 }
                print_dir_tail();
 }