");
+ html_txt(path);
+ html("");
}
- html("'>");
- html_txt(path);
- html("");
html_txtf(" @ %.7s", rev);
if (item && tail)
path[len - 1] = tail;
}
-void cgit_print_date(time_t secs, const char *format, int local_time)
+static const char *fmt_date(time_t secs, const char *format, int local_time)
{
- char buf[64];
+ static char buf[64];
struct tm *time;
if (!secs)
- return;
+ return "";
if (local_time)
time = localtime(&secs);
else
time = gmtime(&secs);
strftime(buf, sizeof(buf)-1, format, time);
- html_txt(buf);
+ return buf;
+}
+
+void cgit_print_date(time_t secs, const char *format, int local_time)
+{
+ html_txt(fmt_date(secs, format, local_time));
}
static void print_rel_date(time_t t, double value,
const char *class, const char *suffix)
{
- char buf[64];
- struct tm *time;
-
- if (ctx.cfg.local_time)
- time = localtime(&t);
- else
- time = gmtime(&t);
- strftime(buf, sizeof(buf) - 1, FMT_LONGDATE, time);
-
htmlf("%.0f %s", value, suffix);
}
-void cgit_print_age(time_t t, time_t max_relative, const char *format)
+void cgit_print_age(time_t t, time_t max_relative)
{
time_t now, secs;
@@ -623,7 +647,11 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
secs = 0;
if (secs > max_relative && max_relative >= 0) {
- cgit_print_date(t, format, ctx.cfg.local_time);
+ html("");
+ cgit_print_date(t, FMT_SHORTDATE, ctx.cfg.local_time);
+ html("");
return;
}
@@ -664,9 +692,11 @@ void cgit_print_http_headers(void)
htmlf("Content-Type: %s\n", ctx.page.mimetype);
if (ctx.page.size)
htmlf("Content-Length: %zd\n", ctx.page.size);
- if (ctx.page.filename)
- htmlf("Content-Disposition: inline; filename=\"%s\"\n",
- ctx.page.filename);
+ if (ctx.page.filename) {
+ html("Content-Disposition: inline; filename=\"");
+ html_header_arg_in_quotes(ctx.page.filename);
+ html("\"\n");
+ }
if (!ctx.env.authenticated)
html("Cache-Control: no-cache, no-store\n");
htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
@@ -678,6 +708,15 @@ void cgit_print_http_headers(void)
exit(0);
}
+void cgit_redirect(const char *url, bool permanent)
+{
+ htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");
+ html("Location: ");
+ html_url_path(url);
+ html("\n\n");
+ exit(0);
+}
+
static void print_rel_vcs_link(const char *url)
{
html("\n");
html("\n");
@@ -714,16 +753,19 @@ void cgit_print_docstart(void)
html("'/>\n");
}
if (host && ctx.repo && ctx.qry.head) {
+ char *fileurl;
struct strbuf sb = STRBUF_INIT;
strbuf_addf(&sb, "h=%s", ctx.qry.head);
html("\n");
strbuf_release(&sb);
+ free(fileurl);
}
if (ctx.repo)
cgit_add_clone_urls(print_rel_vcs_link);
@@ -733,6 +775,7 @@ void cgit_print_docstart(void)
html("\n");
if (ctx.cfg.header)
html_include(ctx.cfg.header);
+ free(host);
}
void cgit_print_docend(void)
@@ -756,6 +799,33 @@ void cgit_print_docend(void)
html("\n\n");
}
+void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
+{
+ va_list ap;
+ ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
+ ctx.page.status = code;
+ ctx.page.statusmsg = msg;
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
+ va_start(ap, fmt);
+ cgit_vprint_error(fmt, ap);
+ va_end(ap);
+ cgit_print_docend();
+}
+
+void cgit_print_layout_start(void)
+{
+ cgit_print_http_headers();
+ cgit_print_docstart();
+ cgit_print_pageheader();
+}
+
+void cgit_print_layout_end(void)
+{
+ cgit_print_docend();
+}
+
static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
{
struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
@@ -781,7 +851,7 @@ void cgit_add_clone_urls(void (*fn)(const char *))
add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
}
-static int print_branch_option(const char *refname, const unsigned char *sha1,
+static int print_branch_option(const char *refname, const struct object_id *oid,
int flags, void *cb_data)
{
char *name = (char *)refname;
@@ -823,6 +893,9 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
static const char *hc(const char *page)
{
+ if (!ctx.qry.page)
+ return NULL;
+
return strcmp(ctx.qry.page, page) ? NULL : "active";
}
@@ -884,6 +957,8 @@ static void print_header(void)
cgit_add_hidden_formfields(0, 1, ctx.qry.page);
html(" ");
html("");
html("");
@@ -924,7 +999,7 @@ void cgit_print_pageheader(void)
ctx.qry.sha1, NULL);
cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
NULL, ctx.qry.vpath, 0, NULL, NULL,
- ctx.qry.showmsg);
+ ctx.qry.showmsg, ctx.qry.follow);
cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
ctx.qry.sha1, ctx.qry.vpath);
cgit_commit_link("commit", NULL, hc("commit"),
@@ -936,9 +1011,12 @@ void cgit_print_pageheader(void)
ctx.qry.head, ctx.qry.vpath);
html("| ");
html("\n");
} else if (ctx.env.authenticated) {
+ char *currenturl = cgit_currenturl();
site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0, 1);
if (ctx.cfg.root_readme)
site_link("about", "about", NULL, hc("about"),
NULL, NULL, 0, 1);
html(" | ");
html("");
+ free(currenturl);
}
html(" | \n");
if (ctx.env.authenticated && ctx.qry.vpath) {
html("");
html("path: ");
cgit_print_path_crumbs(ctx.qry.vpath);
+ if (ctx.cfg.enable_follow_links && !strcmp(ctx.qry.page, "log")) {
+ html(" (");
+ ctx.qry.follow = !ctx.qry.follow;
+ cgit_self_link(ctx.qry.follow ? "follow" : "unfollow",
+ NULL, NULL);
+ ctx.qry.follow = !ctx.qry.follow;
+ html(")");
+ }
html("
");
}
html("");