1 files changed, 6 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 38bc136..d4fcfa7 100644
--- a/cgit.c
+++ b/cgit.c
@@ -388,96 +388,102 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
        if (!ctx->qry.head) {
                ctx->qry.nohead = 1;
                ctx->qry.head = find_default_branch(ctx->repo);
                ctx->repo->defbranch = ctx->qry.head;
        }
        if (!ctx->qry.head) {
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
                cgit_print_error("Repository seems to be empty");
                cgit_print_docend();
                return 1;
        }
        if (get_sha1(ctx->qry.head, sha1)) {
                tmp = xstrdup(ctx->qry.head);
                ctx->qry.head = ctx->repo->defbranch;
                ctx->page.status = 404;
                ctx->page.statusmsg = "not found";
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
                cgit_print_error(fmt("Invalid branch: %s", tmp));
                cgit_print_docend();
                return 1;
        }
        return 0;
 }
 static void process_request(void *cbdata)
 {
        struct cgit_context *ctx = cbdata;
        struct cgit_cmd *cmd;
        cmd = cgit_get_cmd(ctx);
        if (!cmd) {
                ctx->page.title = "cgit error";
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
                cgit_print_error("Invalid request");
                cgit_print_docend();
                return;
        }
+        /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
+         * in-project path limit to be made available at ctx->qry.vpath.
+         * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
+         */
+        ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
        if (cmd->want_repo && !ctx->repo) {
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
                cgit_print_error(fmt("No repository selected"));
                cgit_print_docend();
                return;
        }
        if (ctx->repo && prepare_repo_cmd(ctx))
                return;
        if (cmd->want_layout) {
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
        }
        cmd->fn(ctx);
        if (cmd->want_layout)
                cgit_print_docend();
 }
 int cmp_repos(const void *a, const void *b)
 {
        const struct cgit_repo *ra = a, *rb = b;
        return strcmp(ra->url, rb->url);
 }
 char *build_snapshot_setting(int bitmap)
 {
        const struct cgit_snapshot_format *f;
        char *result = xstrdup("");
        char *tmp;
        int len;
        for (f = cgit_snapshot_formats; f->suffix; f++) {
                if (f->bit & bitmap) {
                        tmp = result;
                        result = xstrdup(fmt("%s%s ", tmp, f->suffix));
                        free(tmp);
                }
        }
        len = strlen(result);
        if (len)
                result[len - 1] = '\0';
        return result;