Merge branch 'lh/cleanup'

* lh/cleanup: (21 commits) Reset ctx.repo to NULL when the config parser is finished Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring() Move function for configfile parsing into configfile.[ch] Add cache.h Remove global and obsolete cgit_cmd Makefile: copy the QUIET constructs from the Makefile in git.git Move cgit_version from shared.c to cgit.c Makefile: autobuild dependency rules Initial Makefile cleanup Move non-generic functions from shared.c to cgit.c Add ui-shared.h Add separate header-files for each page/view Refactor snapshot support Add command dispatcher Remove obsolete cacheitem parameter to ui-functions Add struct cgit_page to cgit_context Introduce html.h Improve initialization of git directory Move cgit_repo into cgit_context Add all config variables into struct cgit_context ...
author: Lars Hjemli 2008-04-08 21:29:21 +0200
committer: Lars Hjemli 2008-04-08 21:29:21 +0200
commit: 23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch)
tree: 136493d8228b0ff4971feb06b0e8aee296367b00 /ui-shared.c
parent: e2a44cf0923398396b7a321d5ce894ad3bf6f580 (diff)
parent: c6f747649ace1a92ed5dfaae9cc1ea3affe0bf51 (diff)
download: cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz
cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.bz2
cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip
1 files changed, 129 insertions, 108 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 60aa2e3..aa65988 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -7,6 +7,7 @@
 */
 #include "cgit.h"
+#include "html.h"
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
@@ -25,14 +26,6 @@ static char *http_date(time_t t)
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
-static long ttl_seconds(long ttl)
-{
-        if (ttl<0)
-                return 60 * 60 * 24 * 365;
-        else
-                return ttl * 60;
-}
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
@@ -42,16 +35,16 @@ void cgit_print_error(char *msg)
 char *cgit_rooturl()
 {
-        if (cgit_virtual_root)
+        if (ctx.cfg.virtual_root)
-                return fmt("%s/", cgit_virtual_root);
+                return fmt("%s/", ctx.cfg.virtual_root);
        else
-                return cgit_script_name;
+                return ctx.cfg.script_name;
 }
 char *cgit_repourl(const char *reponame)
 {
-        if (cgit_virtual_root) {
+        if (ctx.cfg.virtual_root) {
-                return fmt("%s/%s/", cgit_virtual_root, reponame);
+                return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
@@ -63,8 +56,8 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
        char *tmp;
        char *delim;
-        if (cgit_virtual_root) {
+        if (ctx.cfg.virtual_root) {
-                tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
+                tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
                          pagename, (filename ? filename:""));
                delim = "?";
        } else {
@@ -110,14 +103,14 @@ const char *cgit_repobasename(const char *reponame)
 char *cgit_currurl()
 {
-        if (!cgit_virtual_root)
+        if (!ctx.cfg.virtual_root)
-                return cgit_script_name;
+                return ctx.cfg.script_name;
-        else if (cgit_query_page)
+        else if (ctx.qry.page)
-                return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
+                return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
-        else if (cgit_query_repo)
+        else if (ctx.qry.repo)
-                return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
+                return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
        else
-                return fmt("%s/", cgit_virtual_root);
+                return fmt("%s/", ctx.cfg.virtual_root);
 }
 static char *repolink(char *title, char *class, char *page, char *head,
@@ -137,12 +130,12 @@ static char *repolink(char *title, char *class, char *page, char *head,
                html("'");
        }
        html(" href='");
-        if (cgit_virtual_root) {
+        if (ctx.cfg.virtual_root) {
-                html_attr(cgit_virtual_root);
+                html_attr(ctx.cfg.virtual_root);
-                if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
+                if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
                        html("/");
-                html_attr(cgit_repo->url);
+                html_attr(ctx.repo->url);
-                if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
@@ -151,10 +144,10 @@ static char *repolink(char *title, char *class, char *page, char *head,
                                html_attr(path);
                }
        } else {
-                html(cgit_script_name);
+                html(ctx.cfg.script_name);
                html("?url=");
-                html_attr(cgit_repo->url);
+                html_attr(ctx.repo->url);
-                if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
+                if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
@@ -164,7 +157,7 @@ static char *repolink(char *title, char *class, char *page, char *head,
                }
                delim = "&amp;";
        }
-        if (head && strcmp(head, cgit_repo->defbranch)) {
+        if (head && strcmp(head, ctx.repo->defbranch)) {
                html(delim);
                html("h=");
                html_attr(head);
@@ -179,7 +172,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
        char *delim;
        delim = repolink(title, class, page, head, path);
-        if (rev && strcmp(rev, cgit_query_head)) {
+        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(rev);
@@ -201,7 +194,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
        char *delim;
        delim = repolink(title, class, "log", head, path);
-        if (rev && strcmp(rev, cgit_query_head)) {
+        if (rev && strcmp(rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(rev);
@@ -229,11 +222,11 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 void cgit_commit_link(char *name, char *title, char *class, char *head,
                      char *rev)
 {
-        if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
+        if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
-                name[cgit_max_msg_len] = '\0';
+                name[ctx.cfg.max_msg_len] = '\0';
-                name[cgit_max_msg_len - 1] = '.';
+                name[ctx.cfg.max_msg_len - 1] = '.';
-                name[cgit_max_msg_len - 2] = '.';
+                name[ctx.cfg.max_msg_len - 2] = '.';
-                name[cgit_max_msg_len - 3] = '.';
+                name[ctx.cfg.max_msg_len - 3] = '.';
        }
        reporevlink("commit", name, title, class, head, rev, NULL);
 }
@@ -256,7 +249,7 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        char *delim;
        delim = repolink(title, class, "diff", head, path);
-        if (new_rev && strcmp(new_rev, cgit_query_head)) {
+        if (new_rev && strcmp(new_rev, ctx.qry.head)) {
                html(delim);
                html("id=");
                html_attr(new_rev);
@@ -284,7 +277,7 @@ void cgit_object_link(struct object *obj)
        if (obj->type == OBJ_COMMIT) {
                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
-                                 cgit_query_head, sha1_to_hex(obj->sha1));
+                                 ctx.qry.head, sha1_to_hex(obj->sha1));
                return;
        } else if (obj->type == OBJ_TREE) {
                page = "tree";
@@ -297,7 +290,7 @@ void cgit_object_link(struct object *obj)
                arg = "id";
        }
-        url = cgit_pageurl(cgit_query_repo, page,
+        url = cgit_pageurl(ctx.qry.repo, page,
                           fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
        html_link_open(url, NULL, NULL);
        htmlf("%s %s", typename(obj->type),
@@ -360,24 +353,34 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
              secs * 1.0 / TM_YEAR);
 }
-void cgit_print_docstart(char *title, struct cacheitem *item)
+void cgit_print_http_headers(struct cgit_context *ctx)
 {
-        html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
+        if (ctx->page.mimetype && ctx->page.charset)
-        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
+                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
-        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
+                      ctx->page.charset);
-                                         ttl_seconds(item->ttl)));
+        else if (ctx->page.mimetype)
+                htmlf("Content-Type: %s\n", ctx->page.mimetype);
+        if (ctx->page.filename)
+                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
+                      ctx->page.filename);
+        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
+        htmlf("Expires: %s\n", http_date(ctx->page.expires));
        html("\n");
+}
+void cgit_print_docstart(struct cgit_context *ctx)
+{
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html("<title>");
-        html_txt(title);
+        html_txt(ctx->page.title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
-        if (cgit_robots && *cgit_robots)
+        if (ctx->cfg.robots && *ctx->cfg.robots)
-                htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);
+                htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
        html("<link rel='stylesheet' type='text/css' href='");
-        html_attr(cgit_css);
+        html_attr(ctx->cfg.css);
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
@@ -392,7 +395,7 @@ int print_branch_option(const char *refname, const unsigned char *sha1,
                        int flags, void *cb_data)
 {
        char *name = (char *)refname;
-        html_option(name, name, cgit_query_head);
+        html_option(name, name, ctx.qry.head);
        return 0;
 }
@@ -426,7 +429,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
                html("<h1>download</h1>\n");
                *header = 1;
        }
-        url = cgit_pageurl(cgit_query_repo, "blob",
+        url = cgit_pageurl(ctx.qry.repo, "blob",
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
@@ -439,30 +442,30 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
-        if (!cgit_virtual_root) {
+        if (!ctx.cfg.virtual_root) {
-                url = fmt("%s/%s", cgit_query_repo, page);
+                url = fmt("%s/%s", ctx.qry.repo, page);
-                if (cgit_query_path)
+                if (ctx.qry.path)
-                        url = fmt("%s/%s", url, cgit_query_path);
+                        url = fmt("%s/%s", url, ctx.qry.path);
                html_hidden("url", url);
        }
-        if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
+        if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
-                html_hidden("h", cgit_query_head);
+                html_hidden("h", ctx.qry.head);
-        if (cgit_query_sha1)
+        if (ctx.qry.sha1)
-                html_hidden("id", cgit_query_sha1);
+                html_hidden("id", ctx.qry.sha1);
-        if (cgit_query_sha2)
+        if (ctx.qry.sha2)
-                html_hidden("id2", cgit_query_sha2);
+                html_hidden("id2", ctx.qry.sha2);
        if (incl_search) {
-                if (cgit_query_grep)
+                if (ctx.qry.grep)
-                        html_hidden("qt", cgit_query_grep);
+                        html_hidden("qt", ctx.qry.grep);
-                if (cgit_query_search)
+                if (ctx.qry.search)
-                        html_hidden("q", cgit_query_search);
+                        html_hidden("q", ctx.qry.search);
        }
 }
-void cgit_print_pageheader(char *title, int show_search)
+void cgit_print_pageheader(struct cgit_context *ctx)
 {
        static const char *default_info = "This is cgit, a fast webinterface for git repositories";
        int header = 0;
@@ -474,40 +477,40 @@ void cgit_print_pageheader(char *title, int show_search)
        html("<tr><td class='sidebar'>\n<a href='");
        html_attr(cgit_rooturl());
        htmlf("'><img src='%s' alt='cgit'/></a>\n",
-              cgit_logo);
+              ctx->cfg.logo);
        html("</td></tr>\n<tr><td class='sidebar'>\n");
-        if (cgit_query_repo) {
+        if (ctx->repo) {
                html("<h1 class='first'>");
-                html_txt(strrpart(cgit_repo->name, 20));
+                html_txt(strrpart(ctx->repo->name, 20));
                html("</h1>\n");
-                html_txt(cgit_repo->desc);
+                html_txt(ctx->repo->desc);
-                if (cgit_repo->owner) {
+                if (ctx->repo->owner) {
                        html("<h1>owner</h1>\n");
-                        html_txt(cgit_repo->owner);
+                        html_txt(ctx->repo->owner);
                }
                html("<h1>navigate</h1>\n");
-                reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,
+                reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
                            NULL, NULL);
-                cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,
+                cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
                              0, NULL, NULL);
-                cgit_tree_link("tree", NULL, "menu", cgit_query_head,
+                cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
-                               cgit_query_sha1, NULL);
+                               ctx->qry.sha1, NULL);
-                cgit_commit_link("commit", NULL, "menu", cgit_query_head,
+                cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
-                              cgit_query_sha1);
+                              ctx->qry.sha1);
-                cgit_diff_link("diff", NULL, "menu", cgit_query_head,
+                cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
-                               cgit_query_sha1, cgit_query_sha2, NULL);
+                               ctx->qry.sha1, ctx->qry.sha2, NULL);
-                cgit_patch_link("patch", NULL, "menu", cgit_query_head,
+                cgit_patch_link("patch", NULL, "menu", ctx->qry.head,
-                                cgit_query_sha1);
+                                ctx->qry.sha1);
                for_each_ref(print_archive_ref, &header);
-                if (cgit_repo->clone_url || cgit_clone_prefix) {
+                if (ctx->repo->clone_url || ctx->cfg.clone_prefix) {
                        html("<h1>clone</h1>\n");
-                        if (cgit_repo->clone_url)
+                        if (ctx->repo->clone_url)
-                                url = cgit_repo->clone_url;
+                                url = ctx->repo->clone_url;
                        else
-                                url = fmt("%s%s", cgit_clone_prefix,
+                                url = fmt("%s%s", ctx->cfg.clone_prefix,
-                                          cgit_repo->url);
+                                          ctx->repo->url);
                        html("<a class='menu' href='");
                        html_attr(url);
                        html("' title='");
@@ -519,10 +522,10 @@ void cgit_print_pageheader(char *title, int show_search)
                html("<h1>branch</h1>\n");
                html("<form method='get' action=''>\n");
-                add_hidden_formfields(0, 1, cgit_query_page);
+                add_hidden_formfields(0, 1, ctx->qry.page);
 //              html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
                html("<select name='h' onchange='this.form.submit();'>\n");
-                for_each_branch_ref(print_branch_option, cgit_query_head);
+                for_each_branch_ref(print_branch_option, ctx->qry.head);
                html("</select>\n");
 //              html("</td><td>");
                html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
@@ -531,22 +534,22 @@ void cgit_print_pageheader(char *title, int show_search)
                html("<h1>search</h1>\n");
                html("<form method='get' action='");
-                if (cgit_virtual_root)
+                if (ctx->cfg.virtual_root)
-                        html_attr(cgit_fileurl(cgit_query_repo, "log",
+                        html_attr(cgit_fileurl(ctx->qry.repo, "log",
-                                               cgit_query_path, NULL));
+                                               ctx->qry.path, NULL));
                html("'>\n");
                add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
-                html_option("grep", "log msg", cgit_query_grep);
+                html_option("grep", "log msg", ctx->qry.grep);
-                html_option("author", "author", cgit_query_grep);
+                html_option("author", "author", ctx->qry.grep);
-                html_option("committer", "committer", cgit_query_grep);
+                html_option("committer", "committer", ctx->qry.grep);
                html("</select>\n");
                html("<input class='txt' type='text' name='q' value='");
-                html_attr(cgit_query_search);
+                html_attr(ctx->qry.search);
                html("'/>\n");
                html("</form>\n");
        } else {
-                if (!cgit_index_info || html_include(cgit_index_info))
+                if (!ctx->cfg.index_info || html_include(ctx->cfg.index_info))
                        html(default_info);
        }
@@ -555,16 +558,34 @@ void cgit_print_pageheader(char *title, int show_search)
        html("<td id='content'>\n");
 }
+void cgit_print_filemode(unsigned short mode)
-void cgit_print_snapshot_start(const char *mimetype, const char *filename,
-                               struct cacheitem *item)
 {
-        htmlf("Content-Type: %s\n", mimetype);
+        if (S_ISDIR(mode))
-        htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
+                html("d");
-        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
+        else if (S_ISLNK(mode))
-        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
+                html("l");
-                                         ttl_seconds(item->ttl)));
+        else if (S_ISGITLINK(mode))
-        html("\n");
+                html("m");
+        else
+                html("-");
+        html_fileperm(mode >> 6);
+        html_fileperm(mode >> 3);
+        html_fileperm(mode);
 }
-/* vim:set sw=8: */
+void cgit_print_snapshot_links(const char *repo, const char *head,
+                               const char *hex, int snapshots)
+{
+        const struct cgit_snapshot_format* f;
+        char *filename;
+        for (f = cgit_snapshot_formats; f->suffix; f++) {
+                if (!(snapshots & f->bit))
+                        continue;
+                filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
+                               f->suffix);
+                cgit_snapshot_link(filename, NULL, NULL, (char *)head,
+                                   (char *)hex, filename);
+                html("<br/>");
+        }
+}
author	Lars Hjemli	2008-04-08 21:29:21 +0200
committer	Lars Hjemli	2008-04-08 21:29:21 +0200
commit	23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch)
tree	136493d8228b0ff4971feb06b0e8aee296367b00 /ui-shared.c
parent	e2a44cf0923398396b7a321d5ce894ad3bf6f580 (diff)
parent	c6f747649ace1a92ed5dfaae9cc1ea3affe0bf51 (diff)
download	cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.bz2 cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip

diff --git a/ui-shared.c b/ui-shared.c index 60aa2e3..aa65988 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -7,6 +7,7 @@
7	*/	7	*/
8		8
9	#include "cgit.h"	9	#include "cgit.h"
		10	#include "html.h"
10		11
11	const char cgit_doctype[] =	12	const char cgit_doctype[] =
12	"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"	13	"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
@@ -25,14 +26,6 @@ static char *http_date(time_t t)
25	tm->tm_hour, tm->tm_min, tm->tm_sec);	26	tm->tm_hour, tm->tm_min, tm->tm_sec);
26	}	27	}
27		28
28	static long ttl_seconds(long ttl)
29	{
30	if (ttl<0)
31	return 60 * 60 * 24 * 365;
32	else
33	return ttl * 60;
34	}
35
36	void cgit_print_error(char *msg)	29	void cgit_print_error(char *msg)
37	{	30	{
38	html("<div class='error'>");	31	html("<div class='error'>");
@@ -42,16 +35,16 @@ void cgit_print_error(char *msg)
42		35
43	char *cgit_rooturl()	36	char *cgit_rooturl()
44	{	37	{
45	if (cgit_virtual_root)	38	if (ctx.cfg.virtual_root)
46	return fmt("%s/", cgit_virtual_root);	39	return fmt("%s/", ctx.cfg.virtual_root);
47	else	40	else
48	return cgit_script_name;	41	return ctx.cfg.script_name;
49	}	42	}
50		43
51	char cgit_repourl(const char reponame)	44	char cgit_repourl(const char reponame)
52	{	45	{
53	if (cgit_virtual_root) {	46	if (ctx.cfg.virtual_root) {
54	return fmt("%s/%s/", cgit_virtual_root, reponame);	47	return fmt("%s/%s/", ctx.cfg.virtual_root, reponame);
55	} else {	48	} else {
56	return fmt("?r=%s", reponame);	49	return fmt("?r=%s", reponame);
57	}	50	}
@@ -63,8 +56,8 @@ char cgit_fileurl(const char reponame, const char *pagename,
63	char *tmp;	56	char *tmp;
64	char *delim;	57	char *delim;
65		58
66	if (cgit_virtual_root) {	59	if (ctx.cfg.virtual_root) {
67	tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,	60	tmp = fmt("%s/%s/%s/%s", ctx.cfg.virtual_root, reponame,
68	pagename, (filename ? filename:""));	61	pagename, (filename ? filename:""));
69	delim = "?";	62	delim = "?";
70	} else {	63	} else {
@@ -110,14 +103,14 @@ const char cgit_repobasename(const char reponame)
110		103
111	char *cgit_currurl()	104	char *cgit_currurl()
112	{	105	{
113	if (!cgit_virtual_root)	106	if (!ctx.cfg.virtual_root)
114	return cgit_script_name;	107	return ctx.cfg.script_name;
115	else if (cgit_query_page)	108	else if (ctx.qry.page)
116	return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);	109	return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
117	else if (cgit_query_repo)	110	else if (ctx.qry.repo)
118	return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);	111	return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
119	else	112	else
120	return fmt("%s/", cgit_virtual_root);	113	return fmt("%s/", ctx.cfg.virtual_root);
121	}	114	}
122		115
123	static char repolink(char title, char class, char page, char *head,	116	static char repolink(char title, char class, char page, char *head,
@@ -137,12 +130,12 @@ static char repolink(char title, char class, char page, char *head,
137	html("'");	130	html("'");
138	}	131	}
139	html(" href='");	132	html(" href='");
140	if (cgit_virtual_root) {	133	if (ctx.cfg.virtual_root) {
141	html_attr(cgit_virtual_root);	134	html_attr(ctx.cfg.virtual_root);
142	if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')	135	if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
143	html("/");	136	html("/");
144	html_attr(cgit_repo->url);	137	html_attr(ctx.repo->url);
145	if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')	138	if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
146	html("/");	139	html("/");
147	if (page) {	140	if (page) {
148	html(page);	141	html(page);
@@ -151,10 +144,10 @@ static char repolink(char title, char class, char page, char *head,
151	html_attr(path);	144	html_attr(path);
152	}	145	}
153	} else {	146	} else {
154	html(cgit_script_name);	147	html(ctx.cfg.script_name);
155	html("?url=");	148	html("?url=");
156	html_attr(cgit_repo->url);	149	html_attr(ctx.repo->url);
157	if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')	150	if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
158	html("/");	151	html("/");
159	if (page) {	152	if (page) {
160	html(page);	153	html(page);
@@ -164,7 +157,7 @@ static char repolink(char title, char class, char page, char *head,
164	}	157	}
165	delim = "&";	158	delim = "&";
166	}	159	}
167	if (head && strcmp(head, cgit_repo->defbranch)) {	160	if (head && strcmp(head, ctx.repo->defbranch)) {
168	html(delim);	161	html(delim);
169	html("h=");	162	html("h=");
170	html_attr(head);	163	html_attr(head);
@@ -179,7 +172,7 @@ static void reporevlink(char page, char name, char title, char class,
179	char *delim;	172	char *delim;
180		173
181	delim = repolink(title, class, page, head, path);	174	delim = repolink(title, class, page, head, path);
182	if (rev && strcmp(rev, cgit_query_head)) {	175	if (rev && strcmp(rev, ctx.qry.head)) {
183	html(delim);	176	html(delim);
184	html("id=");	177	html("id=");
185	html_attr(rev);	178	html_attr(rev);
@@ -201,7 +194,7 @@ void cgit_log_link(char name, char title, char class, char head,
201	char *delim;	194	char *delim;
202		195
203	delim = repolink(title, class, "log", head, path);	196	delim = repolink(title, class, "log", head, path);
204	if (rev && strcmp(rev, cgit_query_head)) {	197	if (rev && strcmp(rev, ctx.qry.head)) {
205	html(delim);	198	html(delim);
206	html("id=");	199	html("id=");
207	html_attr(rev);	200	html_attr(rev);
@@ -229,11 +222,11 @@ void cgit_log_link(char name, char title, char class, char head,
229	void cgit_commit_link(char name, char title, char class, char head,	222	void cgit_commit_link(char name, char title, char class, char head,
230	char *rev)	223	char *rev)
231	{	224	{
232	if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {	225	if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
233	name[cgit_max_msg_len] = '\0';	226	name[ctx.cfg.max_msg_len] = '\0';
234	name[cgit_max_msg_len - 1] = '.';	227	name[ctx.cfg.max_msg_len - 1] = '.';
235	name[cgit_max_msg_len - 2] = '.';	228	name[ctx.cfg.max_msg_len - 2] = '.';
236	name[cgit_max_msg_len - 3] = '.';	229	name[ctx.cfg.max_msg_len - 3] = '.';
237	}	230	}
238	reporevlink("commit", name, title, class, head, rev, NULL);	231	reporevlink("commit", name, title, class, head, rev, NULL);
239	}	232	}
@@ -256,7 +249,7 @@ void cgit_diff_link(char name, char title, char class, char head,
256	char *delim;	249	char *delim;
257		250
258	delim = repolink(title, class, "diff", head, path);	251	delim = repolink(title, class, "diff", head, path);
259	if (new_rev && strcmp(new_rev, cgit_query_head)) {	252	if (new_rev && strcmp(new_rev, ctx.qry.head)) {
260	html(delim);	253	html(delim);
261	html("id=");	254	html("id=");
262	html_attr(new_rev);	255	html_attr(new_rev);
@@ -284,7 +277,7 @@ void cgit_object_link(struct object *obj)
284		277
285	if (obj->type == OBJ_COMMIT) {	278	if (obj->type == OBJ_COMMIT) {
286	cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,	279	cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
287	cgit_query_head, sha1_to_hex(obj->sha1));	280	ctx.qry.head, sha1_to_hex(obj->sha1));
288	return;	281	return;
289	} else if (obj->type == OBJ_TREE) {	282	} else if (obj->type == OBJ_TREE) {
290	page = "tree";	283	page = "tree";
@@ -297,7 +290,7 @@ void cgit_object_link(struct object *obj)
297	arg = "id";	290	arg = "id";
298	}	291	}
299		292
300	url = cgit_pageurl(cgit_query_repo, page,	293	url = cgit_pageurl(ctx.qry.repo, page,
301	fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));	294	fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
302	html_link_open(url, NULL, NULL);	295	html_link_open(url, NULL, NULL);
303	htmlf("%s %s", typename(obj->type),	296	htmlf("%s %s", typename(obj->type),
@@ -360,24 +353,34 @@ void cgit_print_age(time_t t, time_t max_relative, char *format)
360	secs * 1.0 / TM_YEAR);	353	secs * 1.0 / TM_YEAR);
361	}	354	}
362		355
363	void cgit_print_docstart(char title, struct cacheitem item)	356	void cgit_print_http_headers(struct cgit_context *ctx)
364	{	357	{
365	html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");	358	if (ctx->page.mimetype && ctx->page.charset)
366	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));	359	htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
367	htmlf("Expires: %s\n", http_date(item->st.st_mtime +	360	ctx->page.charset);
368	ttl_seconds(item->ttl)));	361	else if (ctx->page.mimetype)
		362	htmlf("Content-Type: %s\n", ctx->page.mimetype);
		363	if (ctx->page.filename)
		364	htmlf("Content-Disposition: inline; filename=\"%s\"\n",
		365	ctx->page.filename);
		366	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
		367	htmlf("Expires: %s\n", http_date(ctx->page.expires));
369	html("\n");	368	html("\n");
		369	}
		370
		371	void cgit_print_docstart(struct cgit_context *ctx)
		372	{
370	html(cgit_doctype);	373	html(cgit_doctype);
371	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");	374	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
372	html("<head>\n");	375	html("<head>\n");
373	html("<title>");	376	html("<title>");
374	html_txt(title);	377	html_txt(ctx->page.title);
375	html("</title>\n");	378	html("</title>\n");
376	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	379	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
377	if (cgit_robots && *cgit_robots)	380	if (ctx->cfg.robots && *ctx->cfg.robots)
378	htmlf("<meta name='robots' content='%s'/>\n", cgit_robots);	381	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
379	html("<link rel='stylesheet' type='text/css' href='");	382	html("<link rel='stylesheet' type='text/css' href='");
380	html_attr(cgit_css);	383	html_attr(ctx->cfg.css);
381	html("'/>\n");	384	html("'/>\n");
382	html("</head>\n");	385	html("</head>\n");
383	html("<body>\n");	386	html("<body>\n");
@@ -392,7 +395,7 @@ int print_branch_option(const char refname, const unsigned char sha1,
392	int flags, void *cb_data)	395	int flags, void *cb_data)
393	{	396	{
394	char name = (char )refname;	397	char name = (char )refname;
395	html_option(name, name, cgit_query_head);	398	html_option(name, name, ctx.qry.head);
396	return 0;	399	return 0;
397	}	400	}
398		401
@@ -426,7 +429,7 @@ int print_archive_ref(const char refname, const unsigned char sha1,
426	html("<h1>download</h1>\n");	429	html("<h1>download</h1>\n");
427	*header = 1;	430	*header = 1;
428	}	431	}
429	url = cgit_pageurl(cgit_query_repo, "blob",	432	url = cgit_pageurl(ctx.qry.repo, "blob",
430	fmt("id=%s&path=%s", sha1_to_hex(fileid),	433	fmt("id=%s&path=%s", sha1_to_hex(fileid),
431	buf));	434	buf));
432	html_link_open(url, NULL, "menu");	435	html_link_open(url, NULL, "menu");
@@ -439,30 +442,30 @@ void add_hidden_formfields(int incl_head, int incl_search, char *page)
439	{	442	{
440	char *url;	443	char *url;
441		444
442	if (!cgit_virtual_root) {	445	if (!ctx.cfg.virtual_root) {
443	url = fmt("%s/%s", cgit_query_repo, page);	446	url = fmt("%s/%s", ctx.qry.repo, page);
444	if (cgit_query_path)	447	if (ctx.qry.path)
445	url = fmt("%s/%s", url, cgit_query_path);	448	url = fmt("%s/%s", url, ctx.qry.path);
446	html_hidden("url", url);	449	html_hidden("url", url);
447	}	450	}
448		451
449	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))	452	if (incl_head && strcmp(ctx.qry.head, ctx.repo->defbranch))
450	html_hidden("h", cgit_query_head);	453	html_hidden("h", ctx.qry.head);
451		454
452	if (cgit_query_sha1)	455	if (ctx.qry.sha1)
453	html_hidden("id", cgit_query_sha1);	456	html_hidden("id", ctx.qry.sha1);
454	if (cgit_query_sha2)	457	if (ctx.qry.sha2)
455	html_hidden("id2", cgit_query_sha2);	458	html_hidden("id2", ctx.qry.sha2);
456		459
457	if (incl_search) {	460	if (incl_search) {
458	if (cgit_query_grep)	461	if (ctx.qry.grep)
459	html_hidden("qt", cgit_query_grep);	462	html_hidden("qt", ctx.qry.grep);
460	if (cgit_query_search)	463	if (ctx.qry.search)
461	html_hidden("q", cgit_query_search);	464	html_hidden("q", ctx.qry.search);
462	}	465	}
463	}	466	}
464		467
465	void cgit_print_pageheader(char *title, int show_search)	468	void cgit_print_pageheader(struct cgit_context *ctx)
466	{	469	{
467	static const char *default_info = "This is cgit, a fast webinterface for git repositories";	470	static const char *default_info = "This is cgit, a fast webinterface for git repositories";
468	int header = 0;	471	int header = 0;
@@ -474,40 +477,40 @@ void cgit_print_pageheader(char *title, int show_search)
474	html("<tr><td class='sidebar'>\n<a href='");	477	html("<tr><td class='sidebar'>\n<a href='");
475	html_attr(cgit_rooturl());	478	html_attr(cgit_rooturl());
476	htmlf("'><img src='%s' alt='cgit'/></a>\n",	479	htmlf("'><img src='%s' alt='cgit'/></a>\n",
477	cgit_logo);	480	ctx->cfg.logo);
478	html("</td></tr>\n<tr><td class='sidebar'>\n");	481	html("</td></tr>\n<tr><td class='sidebar'>\n");
479	if (cgit_query_repo) {	482	if (ctx->repo) {
480	html("<h1 class='first'>");	483	html("<h1 class='first'>");
481	html_txt(strrpart(cgit_repo->name, 20));	484	html_txt(strrpart(ctx->repo->name, 20));
482	html("</h1>\n");	485	html("</h1>\n");
483	html_txt(cgit_repo->desc);	486	html_txt(ctx->repo->desc);
484	if (cgit_repo->owner) {	487	if (ctx->repo->owner) {
485	html("<h1>owner</h1>\n");	488	html("<h1>owner</h1>\n");
486	html_txt(cgit_repo->owner);	489	html_txt(ctx->repo->owner);
487	}	490	}
488	html("<h1>navigate</h1>\n");	491	html("<h1>navigate</h1>\n");
489	reporevlink(NULL, "summary", NULL, "menu", cgit_query_head,	492	reporevlink(NULL, "summary", NULL, "menu", ctx->qry.head,
490	NULL, NULL);	493	NULL, NULL);
491	cgit_log_link("log", NULL, "menu", cgit_query_head, NULL, NULL,	494	cgit_log_link("log", NULL, "menu", ctx->qry.head, NULL, NULL,
492	0, NULL, NULL);	495	0, NULL, NULL);
493	cgit_tree_link("tree", NULL, "menu", cgit_query_head,	496	cgit_tree_link("tree", NULL, "menu", ctx->qry.head,
494	cgit_query_sha1, NULL);	497	ctx->qry.sha1, NULL);
495	cgit_commit_link("commit", NULL, "menu", cgit_query_head,	498	cgit_commit_link("commit", NULL, "menu", ctx->qry.head,
496	cgit_query_sha1);	499	ctx->qry.sha1);
497	cgit_diff_link("diff", NULL, "menu", cgit_query_head,	500	cgit_diff_link("diff", NULL, "menu", ctx->qry.head,
498	cgit_query_sha1, cgit_query_sha2, NULL);	501	ctx->qry.sha1, ctx->qry.sha2, NULL);
499	cgit_patch_link("patch", NULL, "menu", cgit_query_head,	502	cgit_patch_link("patch", NULL, "menu", ctx->qry.head,
500	cgit_query_sha1);	503	ctx->qry.sha1);
501		504
502	for_each_ref(print_archive_ref, &header);	505	for_each_ref(print_archive_ref, &header);
503		506
504	if (cgit_repo->clone_url \|\| cgit_clone_prefix) {	507	if (ctx->repo->clone_url \|\| ctx->cfg.clone_prefix) {
505	html("<h1>clone</h1>\n");	508	html("<h1>clone</h1>\n");
506	if (cgit_repo->clone_url)	509	if (ctx->repo->clone_url)
507	url = cgit_repo->clone_url;	510	url = ctx->repo->clone_url;
508	else	511	else
509	url = fmt("%s%s", cgit_clone_prefix,	512	url = fmt("%s%s", ctx->cfg.clone_prefix,
510	cgit_repo->url);	513	ctx->repo->url);
511	html("<a class='menu' href='");	514	html("<a class='menu' href='");
512	html_attr(url);	515	html_attr(url);
513	html("' title='");	516	html("' title='");
@@ -519,10 +522,10 @@ void cgit_print_pageheader(char *title, int show_search)
519		522
520	html("<h1>branch</h1>\n");	523	html("<h1>branch</h1>\n");
521	html("<form method='get' action=''>\n");	524	html("<form method='get' action=''>\n");
522	add_hidden_formfields(0, 1, cgit_query_page);	525	add_hidden_formfields(0, 1, ctx->qry.page);
523	// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");	526	// html("<table summary='branch selector' class='grid'><tr><td id='branch-dropdown-cell'>");
524	html("<select name='h' onchange='this.form.submit();'>\n");	527	html("<select name='h' onchange='this.form.submit();'>\n");
525	for_each_branch_ref(print_branch_option, cgit_query_head);	528	for_each_branch_ref(print_branch_option, ctx->qry.head);
526	html("</select>\n");	529	html("</select>\n");
527	// html("</td><td>");	530	// html("</td><td>");
528	html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");	531	html("<noscript><input type='submit' id='switch-btn' value='switch'/></noscript>\n");
@@ -531,22 +534,22 @@ void cgit_print_pageheader(char *title, int show_search)
531		534
532	html("<h1>search</h1>\n");	535	html("<h1>search</h1>\n");
533	html("<form method='get' action='");	536	html("<form method='get' action='");
534	if (cgit_virtual_root)	537	if (ctx->cfg.virtual_root)
535	html_attr(cgit_fileurl(cgit_query_repo, "log",	538	html_attr(cgit_fileurl(ctx->qry.repo, "log",
536	cgit_query_path, NULL));	539	ctx->qry.path, NULL));
537	html("'>\n");	540	html("'>\n");
538	add_hidden_formfields(1, 0, "log");	541	add_hidden_formfields(1, 0, "log");
539	html("<select name='qt'>\n");	542	html("<select name='qt'>\n");
540	html_option("grep", "log msg", cgit_query_grep);	543	html_option("grep", "log msg", ctx->qry.grep);
541	html_option("author", "author", cgit_query_grep);	544	html_option("author", "author", ctx->qry.grep);
542	html_option("committer", "committer", cgit_query_grep);	545	html_option("committer", "committer", ctx->qry.grep);
543	html("</select>\n");	546	html("</select>\n");
544	html("<input class='txt' type='text' name='q' value='");	547	html("<input class='txt' type='text' name='q' value='");
545	html_attr(cgit_query_search);	548	html_attr(ctx->qry.search);
546	html("'/>\n");	549	html("'/>\n");
547	html("</form>\n");	550	html("</form>\n");
548	} else {	551	} else {
549	if (!cgit_index_info \|\| html_include(cgit_index_info))	552	if (!ctx->cfg.index_info \|\| html_include(ctx->cfg.index_info))
550	html(default_info);	553	html(default_info);
551	}	554	}
552		555
@@ -555,16 +558,34 @@ void cgit_print_pageheader(char *title, int show_search)
555	html("<td id='content'>\n");	558	html("<td id='content'>\n");
556	}	559	}
557		560
558		561	void cgit_print_filemode(unsigned short mode)
559	void cgit_print_snapshot_start(const char mimetype, const char filename,
560	struct cacheitem *item)
561	{	562	{
562	htmlf("Content-Type: %s\n", mimetype);	563	if (S_ISDIR(mode))
563	htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);	564	html("d");
564	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));	565	else if (S_ISLNK(mode))
565	htmlf("Expires: %s\n", http_date(item->st.st_mtime +	566	html("l");
566	ttl_seconds(item->ttl)));	567	else if (S_ISGITLINK(mode))
567	html("\n");	568	html("m");
		569	else
		570	html("-");
		571	html_fileperm(mode >> 6);
		572	html_fileperm(mode >> 3);
		573	html_fileperm(mode);
568	}	574	}
569		575
570	/* vim:set sw=8: */	576	void cgit_print_snapshot_links(const char repo, const char head,
		577	const char *hex, int snapshots)
		578	{
		579	const struct cgit_snapshot_format* f;
		580	char *filename;
		581
		582	for (f = cgit_snapshot_formats; f->suffix; f++) {
		583	if (!(snapshots & f->bit))
		584	continue;
		585	filename = fmt("%s-%s%s", cgit_repobasename(repo), hex,
		586	f->suffix);
		587	cgit_snapshot_link(filename, NULL, NULL, (char *)head,
		588	(char *)hex, filename);
		589	html("<br/>");
		590	}
		591	}