log: allow users to follow a file

[ps-cgit] / ui-plain.c
diff --git a/ui-plain.c b/ui-plain.c

index 68e0387ff800720778abc206537b794d5d45267f..b787bc3c776b01587c297a211cb1e3638eb6de66 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -103,7 +103,7 @@ static int print_object(const unsigned char *sha1, const char *path)
         ctx.page.filename = path;
         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)
@@ -128,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);
-       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);
@@ -173,23 +173,22 @@ static void print_dir_tail(void)
         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;
  
-       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)) {
-                       print_dir(sha1, base, baselen, pathname);
+                       print_dir(sha1, base->buf, base->len, pathname);
                         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;
@@ -206,14 +205,14 @@ static int basedir_len(const char *path)
         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 = {
-               .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,
@@ -224,7 +223,7 @@ void cgit_print_plain(struct cgit_context *ctx)
         };
  
         if (!rev)
-               rev = ctx->qry.head;
+               rev = ctx.qry.head;
  
         if (get_sha1(rev, sha1)) {
                 html_status(404, "Not found", 0);