summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-18 01:00:54 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-18 20:51:01 (UTC)
commit30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de (patch) (side-by-side diff)
treeefb3eddd091117281d5592c9eab44bc63121edf6
parent43d40f2b704151d145a1383b2b964210915ecae4 (diff)
downloadcgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.zip
cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.tar.gz
cgit-30ccdcaa74ebc0aab2b7843b0db8251d0ddf56de.tar.bz2
Enable url=value querystring parameter
This makes is possible to use repo-urls like '/pub/scm/git/git.git' and even add path specifications, like '/pub/scm/git/git.git/log/documentation'. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cache.c9
-rw-r--r--cgit.c60
-rw-r--r--cgit.h16
-rw-r--r--parsing.c43
-rw-r--r--shared.c5
-rw-r--r--ui-shared.c5
6 files changed, 98 insertions, 40 deletions
diff --git a/cache.c b/cache.c
index 8df7c26..7cdea9b 100644
--- a/cache.c
+++ b/cache.c
@@ -40,21 +40,24 @@ int cache_create_dirs()
char *path;
path = fmt("%s", cgit_cache_root);
if (mkdir(path, S_IRWXU) && errno!=EEXIST)
return 0;
- if (!cgit_query_repo)
+ if (!cgit_repo)
return 0;
- path = fmt("%s/%s", cgit_cache_root, cgit_query_repo);
+ path = fmt("%s/%s", cgit_cache_root,
+ cache_safe_filename(cgit_repo->url));
+
if (mkdir(path, S_IRWXU) && errno!=EEXIST)
return 0;
if (cgit_query_page) {
- path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo,
+ path = fmt("%s/%s/%s", cgit_cache_root,
+ cache_safe_filename(cgit_repo->url),
cgit_query_page);
if (mkdir(path, S_IRWXU) && errno!=EEXIST)
return 0;
}
return 1;
}
diff --git a/cgit.c b/cgit.c
index 431e8fb..e5d8fbd 100644
--- a/cgit.c
+++ b/cgit.c
@@ -10,34 +10,34 @@
const char cgit_version[] = CGIT_VERSION;
static int cgit_prepare_cache(struct cacheitem *item)
{
- if (!cgit_query_repo) {
- item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
- item->ttl = cgit_cache_root_ttl;
- return 1;
- }
- cgit_repo = cgit_get_repoinfo(cgit_query_repo);
- if (!cgit_repo) {
+ if (!cgit_repo && cgit_query_repo) {
char *title = fmt("%s - %s", cgit_root_title, "Bad request");
cgit_print_docstart(title, item);
cgit_print_pageheader(title, 0);
cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
cgit_print_docend();
return 0;
}
- if (!cgit_query_page) {
+ if (!cgit_repo) {
+ item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
+ item->ttl = cgit_cache_root_ttl;
+ return 1;
+ }
+
+ if (!cgit_cmd) {
item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
- cgit_repo->url));
+ cache_safe_filename(cgit_repo->url)));
item->ttl = cgit_cache_repo_ttl;
} else {
item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
- cgit_repo->url, cgit_query_page,
+ cache_safe_filename(cgit_repo->url), cgit_query_page,
cache_safe_filename(cgit_querystring)));
if (cgit_query_has_symref)
item->ttl = cgit_cache_dynamic_ttl;
else if (cgit_query_has_sha1)
item->ttl = cgit_cache_static_ttl;
else
@@ -65,53 +65,54 @@ static void cgit_print_repo_page(struct cacheitem *item)
}
title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
show_search = 0;
setenv("GIT_DIR", cgit_repo->path, 1);
- if (cgit_query_page) {
- if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
+ if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
cgit_print_snapshot(item, cgit_query_sha1, "zip",
cgit_repo->url, cgit_query_name);
return;
- }
- if (!strcmp(cgit_query_page, "blob")) {
- cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
- return;
- }
}
- if (cgit_query_page && !strcmp(cgit_query_page, "log"))
- show_search = 1;
+ if (cgit_cmd == CMD_BLOB) {
+ cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+ return;
+ }
+ show_search = (cgit_cmd == CMD_LOG);
cgit_print_docstart(title, item);
-
-
- if (!cgit_query_page) {
+ if (!cgit_cmd) {
cgit_print_pageheader("summary", show_search);
cgit_print_summary();
cgit_print_docend();
return;
}
cgit_print_pageheader(cgit_query_page, show_search);
- if (!strcmp(cgit_query_page, "log")) {
+ switch(cgit_cmd) {
+ case CMD_LOG:
cgit_print_log(cgit_query_head, cgit_query_ofs,
cgit_max_commit_count, cgit_query_search,
cgit_query_path);
- } else if (!strcmp(cgit_query_page, "tree")) {
+ break;
+ case CMD_TREE:
cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
- } else if (!strcmp(cgit_query_page, "commit")) {
+ break;
+ case CMD_COMMIT:
cgit_print_commit(cgit_query_head);
- } else if (!strcmp(cgit_query_page, "view")) {
+ break;
+ case CMD_VIEW:
cgit_print_view(cgit_query_sha1, cgit_query_path);
- } else if (!strcmp(cgit_query_page, "diff")) {
+ break;
+ case CMD_DIFF:
cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
cgit_query_path);
- } else {
+ break;
+ default:
cgit_print_error("Invalid request");
}
cgit_print_docend();
}
static void cgit_fill_cache(struct cacheitem *item, int use_cache)
@@ -126,13 +127,13 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
stdout2 = chk_positive(dup(STDOUT_FILENO),
"Preserving STDOUT");
chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
}
- if (cgit_query_repo)
+ if (cgit_repo)
cgit_print_repo_page(item);
else
cgit_print_repolist(item);
if (use_cache) {
chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
@@ -231,12 +232,13 @@ int main(int argc, const char **argv)
item.st.st_mtime = time(NULL);
cgit_repolist.length = 0;
cgit_repolist.count = 0;
cgit_repolist.repos = NULL;
cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+ cgit_repo = NULL;
if (getenv("SCRIPT_NAME"))
cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
if (getenv("QUERY_STRING"))
cgit_querystring = xstrdup(getenv("QUERY_STRING"));
cgit_parse_args(argc, argv);
cgit_parse_query(cgit_querystring, cgit_querystring_cb);
diff --git a/cgit.h b/cgit.h
index f402466..e5b3f5e 100644
--- a/cgit.h
+++ b/cgit.h
@@ -18,19 +18,19 @@
#include <xdiff/xdiff.h>
/*
* The valid cgit repo-commands
*/
-#define CMD_LOG = 1;
-#define CMD_COMMIT = 1;
-#define CMD_DIFF = 1;
-#define CMD_TREE = 1;
-#define CMD_VIEW = 1;
-#define CMD_BLOB = 1;
-#define CMD_SNAPSHOT = 1;
+#define CMD_LOG 1
+#define CMD_COMMIT 2
+#define CMD_DIFF 3
+#define CMD_TREE 4
+#define CMD_VIEW 5
+#define CMD_BLOB 6
+#define CMD_SNAPSHOT 7
typedef void (*configfn)(const char *name, const char *value);
typedef void (*filepair_fn)(struct diff_filepair *pair);
typedef void (*linediff_fn)(char *line, int len);
struct cacheitem {
@@ -79,12 +79,13 @@ struct taginfo {
};
extern const char cgit_version[];
extern struct repolist cgit_repolist;
extern struct repoinfo *cgit_repo;
+extern int cgit_cmd;
extern char *cgit_root_title;
extern char *cgit_css;
extern char *cgit_logo;
extern char *cgit_logo_link;
extern char *cgit_module_link;
@@ -159,12 +160,13 @@ extern void html_link_close(void);
extern void html_filemode(unsigned short mode);
extern int cgit_read_config(const char *filename, configfn fn);
extern int cgit_parse_query(char *txt, configfn fn);
extern struct commitinfo *cgit_parse_commit(struct commit *commit);
extern struct taginfo *cgit_parse_tag(struct tag *tag);
+extern void cgit_parse_url(const char *url);
extern char *cache_safe_filename(const char *unsafe);
extern int cache_lock(struct cacheitem *item);
extern int cache_unlock(struct cacheitem *item);
extern int cache_cancel_lock(struct cacheitem *item);
extern int cache_exist(struct cacheitem *item);
diff --git a/parsing.c b/parsing.c
index 36b0f0c..a028625 100644
--- a/parsing.c
+++ b/parsing.c
@@ -129,12 +129,55 @@ int cgit_parse_query(char *txt, configfn fn)
}
if (t!=txt)
(*fn)(txt, value);
return 0;
}
+/*
+ * url syntax: [repo ['/' cmd [ '/' path]]]
+ * repo: any valid repo url, may contain '/'
+ * cmd: log | commit | diff | tree | view | blob | snapshot
+ * path: any valid path, may contain '/'
+ *
+ */
+void cgit_parse_url(const char *url)
+{
+ char *cmd, *p;
+
+ cgit_repo = NULL;
+ if (!url || url[0] == '\0')
+ return;
+
+ cgit_repo = cgit_get_repoinfo(url);
+ if (cgit_repo) {
+ cgit_query_repo = cgit_repo->url;
+ return;
+ }
+
+ cmd = strchr(url, '/');
+ while (!cgit_repo && cmd) {
+ cmd[0] = '\0';
+ cgit_repo = cgit_get_repoinfo(url);
+ if (cgit_repo == NULL) {
+ cmd[0] = '/';
+ cmd = strchr(cmd + 1, '/');
+ continue;
+ }
+
+ cgit_query_repo = cgit_repo->url;
+ p = strchr(cmd + 1, '/');
+ if (p) {
+ p[0] = '\0';
+ cgit_query_path = xstrdup(p + 1);
+ }
+ cgit_cmd = cgit_get_cmd_index(cmd + 1);
+ cgit_query_page = xstrdup(cmd + 1);
+ return;
+ }
+}
+
char *substr(const char *head, const char *tail)
{
char *buf;
buf = xmalloc(tail - head + 1);
strncpy(buf, head, tail - head);
diff --git a/shared.c b/shared.c
index fb05427..0b074da 100644
--- a/shared.c
+++ b/shared.c
@@ -7,12 +7,13 @@
*/
#include "cgit.h"
struct repolist cgit_repolist;
struct repoinfo *cgit_repo;
+int cgit_cmd;
char *cgit_root_title = "Git repository browser";
char *cgit_css = "/cgit.css";
char *cgit_logo = "/git-logo.png";
char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/";
char *cgit_module_link = "./?repo=%s&page=commit&id=%s";
@@ -181,14 +182,18 @@ void cgit_global_config_cb(const char *name, const char *value)
}
void cgit_querystring_cb(const char *name, const char *value)
{
if (!strcmp(name,"r")) {
cgit_query_repo = xstrdup(value);
+ cgit_repo = cgit_get_repoinfo(value);
} else if (!strcmp(name, "p")) {
cgit_query_page = xstrdup(value);
+ cgit_cmd = cgit_get_cmd_index(value);
+ } else if (!strcmp(name, "url")) {
+ cgit_parse_url(value);
} else if (!strcmp(name, "q")) {
cgit_query_search = xstrdup(value);
} else if (!strcmp(name, "h")) {
cgit_query_head = xstrdup(value);
cgit_query_has_symref = 1;
} else if (!strcmp(name, "id")) {
diff --git a/ui-shared.c b/ui-shared.c
index 6211056..c7fbc5e 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -65,13 +65,16 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
pagename, query);
else
return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
pagename);
} else {
- return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+ if (query)
+ return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+ else
+ return fmt("?r=%s&p=%s", reponame, pagename);
}
}
char *cgit_currurl()
{
if (!cgit_virtual_root)