summaryrefslogtreecommitdiffabout
authorJohan Herland <johan@herland.net>2010-06-09 23:09:26 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-06-19 08:40:22 (UTC)
commit0ff143df7043b7dd87c31c50fa875bc96d1a7779 (patch) (side-by-side diff)
treed1625ba2aafed1ddfebc429921abdbb0d692042f
parent0e34c6d1ef32ea8f69019272fe72dbf2aeaba392 (diff)
downloadcgit-0ff143df7043b7dd87c31c50fa875bc96d1a7779.zip
cgit-0ff143df7043b7dd87c31c50fa875bc96d1a7779.tar.gz
cgit-0ff143df7043b7dd87c31c50fa875bc96d1a7779.tar.bz2
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>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c6
-rw-r--r--cgit.h1
-rw-r--r--cmd.c42
-rw-r--r--cmd.h3
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
@@ -426,2 +426,8 @@ static void process_request(void *cbdata)
+ /* 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) {
diff --git a/cgit.h b/cgit.h
index cd4af72..f990b15 100644
--- a/cgit.h
+++ b/cgit.h
@@ -147,2 +147,3 @@ struct cgit_query {
int ssdiff;
+ char *vpath;
};
diff --git a/cmd.c b/cmd.c
index 766f903..a9e426a 100644
--- a/cmd.c
+++ b/cmd.c
@@ -131,4 +131,4 @@ static void tree_fn(struct cgit_context *ctx)
-#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}
@@ -137,21 +137,21 @@ 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),
};
diff --git a/cmd.h b/cmd.h
index ec9e691..8dc01bd 100644
--- a/cmd.h
+++ b/cmd.h
@@ -9,3 +9,4 @@ struct cgit_cmd {
unsigned int want_repo:1,
- want_layout:1;
+ want_layout:1,
+ want_vpath:1;
};