struct cgit_cmd: Differentiate between various usages of ctx.qry.path

For many commands/pages (e.g. 'tree', 'diff', 'plain', etc.), the
ctx.qry.path argument is interpreted as a path within the "virtual" project
directory structure. However, for some other commands (notably 'refs', and
the clone-related commands) ctx.qry.path is used in a different context (as
a more or less "real" path within the '.git' directory).

This patch differentiates between these two usages of ctx.qry.path, by
introducing a new variable - ctx.qry.vpath - which is equal to ctx.qry.path
in the former case, and NULL in the latter.

This will become useful in future patches when we want various pages and the
links between them to preserve existing in-project paths.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 30 insertions, 22 deletions

diff --git a/cgit.c b/cgit.c
index 9305d0a..2c3ad73 100644
--- a/cgit.c
+++ b/cgit.c
@@ -411,32 +411,38 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
 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);
diff --git a/cgit.h b/cgit.h
index cd4af72..f990b15 100644
--- a/cgit.h
+++ b/cgit.h
@@ -132,32 +132,33 @@ struct cgit_query {
         char *page;
         char *search;
         char *grep;
         char *head;
         char *sha1;
         char *sha2;
         char *path;
         char *name;
         char *mimetype;
         char *url;
         char *period;
         int   ofs;
         int nohead;
         char *sort;
         int showmsg;
         int ssdiff;
+        char *vpath;
 };
 
 struct cgit_config {
         char *agefile;
         char *cache_root;
         char *clone_prefix;
         char *css;
         char *favicon;
         char *footer;
         char *head_include;
         char *header;
         char *index_header;
         char *index_info;
         char *logo;
         char *logo_link;
         char *module_link;
diff --git a/cmd.c b/cmd.c
index 766f903..a9e426a 100644
--- a/cmd.c
+++ b/cmd.c
@@ -116,56 +116,56 @@ static void stats_fn(struct cgit_context *ctx)
 
 static void summary_fn(struct cgit_context *ctx)
 {
         cgit_print_summary();
 }
 
 static void tag_fn(struct cgit_context *ctx)
 {
         cgit_print_tag(ctx->qry.sha1);
 }
 
 static void tree_fn(struct cgit_context *ctx)
 {
         cgit_print_tree(ctx->qry.sha1, ctx->qry.path);
 }
 
-#define def_cmd(name, want_repo, want_layout) \
-        {#name, name##_fn, want_repo, want_layout}
+#define def_cmd(name, want_repo, want_layout, want_vpath) \
+        {#name, name##_fn, want_repo, want_layout, want_vpath}
 
 struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx)
 {
         static struct cgit_cmd cmds[] = {
-                def_cmd(HEAD, 1, 0),
-                def_cmd(atom, 1, 0),
-                def_cmd(about, 0, 1),
-                def_cmd(blob, 1, 0),
-                def_cmd(commit, 1, 1),
-                def_cmd(diff, 1, 1),
-                def_cmd(info, 1, 0),
-                def_cmd(log, 1, 1),
-                def_cmd(ls_cache, 0, 0),
-                def_cmd(objects, 1, 0),
-                def_cmd(patch, 1, 0),
-                def_cmd(plain, 1, 0),
-                def_cmd(refs, 1, 1),
-                def_cmd(repolist, 0, 0),
-                def_cmd(snapshot, 1, 0),
-                def_cmd(stats, 1, 1),
-                def_cmd(summary, 1, 1),
-                def_cmd(tag, 1, 1),
-                def_cmd(tree, 1, 1),
+                def_cmd(HEAD, 1, 0, 0),
+                def_cmd(atom, 1, 0, 0),
+                def_cmd(about, 0, 1, 0),
+                def_cmd(blob, 1, 0, 0),
+                def_cmd(commit, 1, 1, 1),
+                def_cmd(diff, 1, 1, 1),
+                def_cmd(info, 1, 0, 0),
+                def_cmd(log, 1, 1, 1),
+                def_cmd(ls_cache, 0, 0, 0),
+                def_cmd(objects, 1, 0, 0),
+                def_cmd(patch, 1, 0, 1),
+                def_cmd(plain, 1, 0, 0),
+                def_cmd(refs, 1, 1, 0),
+                def_cmd(repolist, 0, 0, 0),
+                def_cmd(snapshot, 1, 0, 0),
+                def_cmd(stats, 1, 1, 1),
+                def_cmd(summary, 1, 1, 0),
+                def_cmd(tag, 1, 1, 0),
+                def_cmd(tree, 1, 1, 1),
         };
         int i;
 
         if (ctx->qry.page == NULL) {
                 if (ctx->repo)
                         ctx->qry.page = "summary";
                 else
                         ctx->qry.page = "repolist";
         }
 
         for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++)
                 if (!strcmp(ctx->qry.page, cmds[i].name))
                         return &cmds[i];
         return NULL;
 }
diff --git a/cmd.h b/cmd.h
index ec9e691..8dc01bd 100644
--- a/cmd.h
+++ b/cmd.h
@@ -1,15 +1,16 @@
 #ifndef CMD_H
 #define CMD_H
 
 typedef void (*cgit_cmd_fn)(struct cgit_context *ctx);
 
 struct cgit_cmd {
         const char *name;
         cgit_cmd_fn fn;
         unsigned int want_repo:1,
-                want_layout:1;
+                want_layout:1,
+                want_vpath:1;
 };
 
 extern struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx);
 
 #endif /* CMD_H */