1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 8a7cc32..d1b020b 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -405,129 +405,129 @@ void cgit_print_date(time_t secs, char *format, int local_time)
        if(local_time)
                time = localtime(&secs);
        else
                time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
        html_txt(buf);
 }
 void cgit_print_age(time_t t, time_t max_relative, char *format)
 {
        time_t now, secs;
        if (!t)
                return;
        time(&now);
        secs = now - t;
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format, ctx.cfg.local_time);
                return;
        }
        if (secs < TM_HOUR * 2) {
                htmlf("<span class='age-mins'>%.0f min.</span>",
                      secs * 1.0 / TM_MIN);
                return;
        }
        if (secs < TM_DAY * 2) {
                htmlf("<span class='age-hours'>%.0f hours</span>",
                      secs * 1.0 / TM_HOUR);
                return;
        }
        if (secs < TM_WEEK * 2) {
                htmlf("<span class='age-days'>%.0f days</span>",
                      secs * 1.0 / TM_DAY);
                return;
        }
        if (secs < TM_MONTH * 2) {
                htmlf("<span class='age-weeks'>%.0f weeks</span>",
                      secs * 1.0 / TM_WEEK);
                return;
        }
        if (secs < TM_YEAR * 2) {
                htmlf("<span class='age-months'>%.0f months</span>",
                      secs * 1.0 / TM_MONTH);
                return;
        }
        htmlf("<span class='age-years'>%.0f years</span>",
              secs * 1.0 / TM_YEAR);
 }
 void cgit_print_http_headers(struct cgit_context *ctx)
 {
        if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
                return;
        if (ctx->page.status)
                htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
        if (ctx->page.mimetype && ctx->page.charset)
                htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
                      ctx->page.charset);
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.size)
-                htmlf("Content-Length: %ld\n", 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);
        htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
        htmlf("Expires: %s\n", http_date(ctx->page.expires));
        if (ctx->page.etag)
                htmlf("ETag: \"%s\"\n", ctx->page.etag);
        html("\n");
        if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
                exit(0);
 }
 void cgit_print_docstart(struct cgit_context *ctx)
 {
        if (ctx->cfg.embedded) {
                if (ctx->cfg.header)
                        html_include(ctx->cfg.header);
                return;
        }
        char *host = cgit_hosturl();
        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(ctx->page.title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        if (ctx->cfg.robots && *ctx->cfg.robots)
                htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(ctx->cfg.css);
        html("'/>\n");
        if (ctx->cfg.favicon) {
                html("<link rel='shortcut icon' href='");
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }
        if (host && ctx->repo) {
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
                html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
                                       fmt("h=%s", ctx->qry.head)));
                html("' type='application/atom+xml'/>\n");
        }
        if (ctx->cfg.head_include)
                html_include(ctx->cfg.head_include);
        html("</head>\n");
        html("<body>\n");
        if (ctx->cfg.header)
                html_include(ctx->cfg.header);
 }
 void cgit_print_docend()
 {
        html("</div> <!-- class=content -->\n");
        if (ctx.cfg.embedded) {
                html("</div> <!-- id=cgit -->\n");
                if (ctx.cfg.footer)
                        html_include(ctx.cfg.footer);
                return;
        }
        if (ctx.cfg.footer)

diff --git a/ui-shared.c b/ui-shared.c index 8a7cc32..d1b020b 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -405,129 +405,129 @@ void cgit_print_date(time_t secs, char *format, int local_time)
405	if(local_time)	405	if(local_time)
406	time = localtime(&secs);	406	time = localtime(&secs);
407	else	407	else
408	time = gmtime(&secs);	408	time = gmtime(&secs);
409	strftime(buf, sizeof(buf)-1, format, time);	409	strftime(buf, sizeof(buf)-1, format, time);
410	html_txt(buf);	410	html_txt(buf);
411	}	411	}
412		412
413	void cgit_print_age(time_t t, time_t max_relative, char *format)	413	void cgit_print_age(time_t t, time_t max_relative, char *format)
414	{	414	{
415	time_t now, secs;	415	time_t now, secs;
416		416
417	if (!t)	417	if (!t)
418	return;	418	return;
419	time(&now);	419	time(&now);
420	secs = now - t;	420	secs = now - t;
421		421
422	if (secs > max_relative && max_relative >= 0) {	422	if (secs > max_relative && max_relative >= 0) {
423	cgit_print_date(t, format, ctx.cfg.local_time);	423	cgit_print_date(t, format, ctx.cfg.local_time);
424	return;	424	return;
425	}	425	}
426		426
427	if (secs < TM_HOUR * 2) {	427	if (secs < TM_HOUR * 2) {
428	htmlf("<span class='age-mins'>%.0f min.</span>",	428	htmlf("<span class='age-mins'>%.0f min.</span>",
429	secs * 1.0 / TM_MIN);	429	secs * 1.0 / TM_MIN);
430	return;	430	return;
431	}	431	}
432	if (secs < TM_DAY * 2) {	432	if (secs < TM_DAY * 2) {
433	htmlf("<span class='age-hours'>%.0f hours</span>",	433	htmlf("<span class='age-hours'>%.0f hours</span>",
434	secs * 1.0 / TM_HOUR);	434	secs * 1.0 / TM_HOUR);
435	return;	435	return;
436	}	436	}
437	if (secs < TM_WEEK * 2) {	437	if (secs < TM_WEEK * 2) {
438	htmlf("<span class='age-days'>%.0f days</span>",	438	htmlf("<span class='age-days'>%.0f days</span>",
439	secs * 1.0 / TM_DAY);	439	secs * 1.0 / TM_DAY);
440	return;	440	return;
441	}	441	}
442	if (secs < TM_MONTH * 2) {	442	if (secs < TM_MONTH * 2) {
443	htmlf("<span class='age-weeks'>%.0f weeks</span>",	443	htmlf("<span class='age-weeks'>%.0f weeks</span>",
444	secs * 1.0 / TM_WEEK);	444	secs * 1.0 / TM_WEEK);
445	return;	445	return;
446	}	446	}
447	if (secs < TM_YEAR * 2) {	447	if (secs < TM_YEAR * 2) {
448	htmlf("<span class='age-months'>%.0f months</span>",	448	htmlf("<span class='age-months'>%.0f months</span>",
449	secs * 1.0 / TM_MONTH);	449	secs * 1.0 / TM_MONTH);
450	return;	450	return;
451	}	451	}
452	htmlf("<span class='age-years'>%.0f years</span>",	452	htmlf("<span class='age-years'>%.0f years</span>",
453	secs * 1.0 / TM_YEAR);	453	secs * 1.0 / TM_YEAR);
454	}	454	}
455		455
456	void cgit_print_http_headers(struct cgit_context *ctx)	456	void cgit_print_http_headers(struct cgit_context *ctx)
457	{	457	{
458	if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))	458	if (ctx->env.no_http && !strcmp(ctx->env.no_http, "1"))
459	return;	459	return;
460		460
461	if (ctx->page.status)	461	if (ctx->page.status)
462	htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);	462	htmlf("Status: %d %s\n", ctx->page.status, ctx->page.statusmsg);
463	if (ctx->page.mimetype && ctx->page.charset)	463	if (ctx->page.mimetype && ctx->page.charset)
464	htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,	464	htmlf("Content-Type: %s; charset=%s\n", ctx->page.mimetype,
465	ctx->page.charset);	465	ctx->page.charset);
466	else if (ctx->page.mimetype)	466	else if (ctx->page.mimetype)
467	htmlf("Content-Type: %s\n", ctx->page.mimetype);	467	htmlf("Content-Type: %s\n", ctx->page.mimetype);
468	if (ctx->page.size)	468	if (ctx->page.size)
469	htmlf("Content-Length: %ld\n", ctx->page.size);	469	htmlf("Content-Length: %zd\n", ctx->page.size);
470	if (ctx->page.filename)	470	if (ctx->page.filename)
471	htmlf("Content-Disposition: inline; filename=\"%s\"\n",	471	htmlf("Content-Disposition: inline; filename=\"%s\"\n",
472	ctx->page.filename);	472	ctx->page.filename);
473	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));	473	htmlf("Last-Modified: %s\n", http_date(ctx->page.modified));
474	htmlf("Expires: %s\n", http_date(ctx->page.expires));	474	htmlf("Expires: %s\n", http_date(ctx->page.expires));
475	if (ctx->page.etag)	475	if (ctx->page.etag)
476	htmlf("ETag: \"%s\"\n", ctx->page.etag);	476	htmlf("ETag: \"%s\"\n", ctx->page.etag);
477	html("\n");	477	html("\n");
478	if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))	478	if (ctx->env.request_method && !strcmp(ctx->env.request_method, "HEAD"))
479	exit(0);	479	exit(0);
480	}	480	}
481		481
482	void cgit_print_docstart(struct cgit_context *ctx)	482	void cgit_print_docstart(struct cgit_context *ctx)
483	{	483	{
484	if (ctx->cfg.embedded) {	484	if (ctx->cfg.embedded) {
485	if (ctx->cfg.header)	485	if (ctx->cfg.header)
486	html_include(ctx->cfg.header);	486	html_include(ctx->cfg.header);
487	return;	487	return;
488	}	488	}
489		489
490	char *host = cgit_hosturl();	490	char *host = cgit_hosturl();
491	html(cgit_doctype);	491	html(cgit_doctype);
492	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");	492	html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
493	html("<head>\n");	493	html("<head>\n");
494	html("<title>");	494	html("<title>");
495	html_txt(ctx->page.title);	495	html_txt(ctx->page.title);
496	html("</title>\n");	496	html("</title>\n");
497	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	497	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
498	if (ctx->cfg.robots && *ctx->cfg.robots)	498	if (ctx->cfg.robots && *ctx->cfg.robots)
499	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);	499	htmlf("<meta name='robots' content='%s'/>\n", ctx->cfg.robots);
500	html("<link rel='stylesheet' type='text/css' href='");	500	html("<link rel='stylesheet' type='text/css' href='");
501	html_attr(ctx->cfg.css);	501	html_attr(ctx->cfg.css);
502	html("'/>\n");	502	html("'/>\n");
503	if (ctx->cfg.favicon) {	503	if (ctx->cfg.favicon) {
504	html("<link rel='shortcut icon' href='");	504	html("<link rel='shortcut icon' href='");
505	html_attr(ctx->cfg.favicon);	505	html_attr(ctx->cfg.favicon);
506	html("'/>\n");	506	html("'/>\n");
507	}	507	}
508	if (host && ctx->repo) {	508	if (host && ctx->repo) {
509	html("<link rel='alternate' title='Atom feed' href='");	509	html("<link rel='alternate' title='Atom feed' href='");
510	html(cgit_httpscheme());	510	html(cgit_httpscheme());
511	html_attr(cgit_hosturl());	511	html_attr(cgit_hosturl());
512	html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,	512	html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path,
513	fmt("h=%s", ctx->qry.head)));	513	fmt("h=%s", ctx->qry.head)));
514	html("' type='application/atom+xml'/>\n");	514	html("' type='application/atom+xml'/>\n");
515	}	515	}
516	if (ctx->cfg.head_include)	516	if (ctx->cfg.head_include)
517	html_include(ctx->cfg.head_include);	517	html_include(ctx->cfg.head_include);
518	html("</head>\n");	518	html("</head>\n");
519	html("<body>\n");	519	html("<body>\n");
520	if (ctx->cfg.header)	520	if (ctx->cfg.header)
521	html_include(ctx->cfg.header);	521	html_include(ctx->cfg.header);
522	}	522	}
523		523
524	void cgit_print_docend()	524	void cgit_print_docend()
525	{	525	{
526	html("</div> <!-- class=content -->\n");	526	html("</div> <!-- class=content -->\n");
527	if (ctx.cfg.embedded) {	527	if (ctx.cfg.embedded) {
528	html("</div> <!-- id=cgit -->\n");	528	html("</div> <!-- id=cgit -->\n");
529	if (ctx.cfg.footer)	529	if (ctx.cfg.footer)
530	html_include(ctx.cfg.footer);	530	html_include(ctx.cfg.footer);
531	return;	531	return;
532	}	532	}
533	if (ctx.cfg.footer)	533	if (ctx.cfg.footer)