Add commit->msg_encoding, allocate msg dynamicly.

author: Jonathan Bastien-Filiatrault <joe@x2a.org> 2007-10-26 22:09:06 (UTC)
committer: Jonathan Bastien-Filiatrault <joe@x2a.org> 2007-11-05 23:13:30 (UTC)
commit: 3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b (patch) (unidiff)
tree: 548671b6339e9a1a252ded4d534f11bfcd560043 /ui-shared.c
parent: 72ede12551af320b6d8eade853dbd2cd6f2222cc (diff)
download: cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.zip
cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.gz
cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.bz2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui-shared.c b/ui-shared.c
index 72a7b44..7c69f60 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -259,193 +259,193 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        if (new_rev && strcmp(new_rev, cgit_query_head)) {
                html(delim);
                html("id=");
                html_attr(new_rev);
                delim = "&amp;";
        }
        if (old_rev) {
                html(delim);
                html("id2=");
                html_attr(old_rev);
        }
        html("'>");
        html_txt(name);
        html("</a>");
 }
 void cgit_object_link(struct object *obj)
 {
        char *page, *arg, *url;
        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));
                return;
        } else if (obj->type == OBJ_TREE) {
                page = "tree";
                arg = "id";
        } else if (obj->type == OBJ_TAG) {
                page = "tag";
                arg = "id";
        } else {
                page = "blob";
                arg = "id";
        }
        url = cgit_pageurl(cgit_query_repo, page,
                           fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
        html_link_open(url, NULL, NULL);
        htmlf("%s %s", typename(obj->type),
              sha1_to_hex(obj->sha1));
        html_link_close();
 }
 void cgit_print_date(time_t secs, char *format)
 {
        char buf[64];
        struct tm *time;
        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;
        time(&now);
        secs = now - t;
        if (secs > max_relative && max_relative >= 0) {
                cgit_print_date(t, format);
                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_docstart(char *title, struct cacheitem *item)
 {
-        html("Content-Type: text/html; charset=utf-8\n");
+        html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                         ttl_seconds(item->ttl)));
        html("\n");
        html(cgit_doctype);
        html("<html>\n");
        html("<head>\n");
        html("<title>");
        html_txt(title);
        html("</title>\n");
        htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(cgit_css);
        html("'/>\n");
        html("</head>\n");
        html("<body>\n");
 }
 void cgit_print_docend()
 {
        html("</td>\n</tr>\n<table>\n</body>\n</html>\n");
 }
 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);
        return 0;
 }
 int print_archive_ref(const char *refname, const unsigned char *sha1,
                       int flags, void *cb_data)
 {
        struct tag *tag;
        struct taginfo *info;
        struct object *obj;
        char buf[256], *url;
        unsigned char fileid[20];
        int *header = (int *)cb_data;
        if (prefixcmp(refname, "refs/archives"))
                return 0;
        strncpy(buf, refname+14, sizeof(buf));
        obj = parse_object(sha1);
        if (!obj)
                return 1;
        if (obj->type == OBJ_TAG) {
                tag = lookup_tag(sha1);
                if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                        return 0;
                hashcpy(fileid, tag->tagged->sha1);
        } else if (obj->type != OBJ_BLOB) {
                return 0;
        } else {
                hashcpy(fileid, sha1);
        }
        if (!*header) {
                html("<p><h1>download</h1>");
                *header = 1;
        }
        url = cgit_pageurl(cgit_query_repo, "blob",
                           fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
                               buf));
        html_link_open(url, NULL, "menu");
        html_txt(strlpart(buf, 20));
        html_link_close();
        return 0;
 }
 void add_hidden_formfields(int incl_head, int incl_search, char *page)
 {
        char *url;
        if (!cgit_virtual_root) {
                url = fmt("%s/%s", cgit_query_repo, page);
                if (cgit_query_path)
                        url = fmt("%s/%s", url, cgit_query_path);
                html_hidden("url", url);
        }
        if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
                html_hidden("h", cgit_query_head);
        if (cgit_query_sha1)
                html_hidden("id", cgit_query_sha1);
        if (cgit_query_sha2)
                html_hidden("id2", cgit_query_sha2);
        if (incl_search) {
                if (cgit_query_grep)
                        html_hidden("qt", cgit_query_grep);
                if (cgit_query_search)
                        html_hidden("q", cgit_query_search);
        }
 }
author	Jonathan Bastien-Filiatrault <joe@x2a.org>	2007-10-26 22:09:06 (UTC)
committer	Jonathan Bastien-Filiatrault <joe@x2a.org>	2007-11-05 23:13:30 (UTC)
commit	3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b (patch) (unidiff)
tree	548671b6339e9a1a252ded4d534f11bfcd560043 /ui-shared.c
parent	72ede12551af320b6d8eade853dbd2cd6f2222cc (diff)
download	cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.zip cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.gz cgit-3845e177e4e0b231efb6fda0ac3cd3a2d8f34d4b.tar.bz2

diff --git a/ui-shared.c b/ui-shared.c index 72a7b44..7c69f60 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -259,193 +259,193 @@ void cgit_diff_link(char name, char title, char class, char head,
259	if (new_rev && strcmp(new_rev, cgit_query_head)) {	259	if (new_rev && strcmp(new_rev, cgit_query_head)) {
260	html(delim);	260	html(delim);
261	html("id=");	261	html("id=");
262	html_attr(new_rev);	262	html_attr(new_rev);
263	delim = "&";	263	delim = "&";
264	}	264	}
265	if (old_rev) {	265	if (old_rev) {
266	html(delim);	266	html(delim);
267	html("id2=");	267	html("id2=");
268	html_attr(old_rev);	268	html_attr(old_rev);
269	}	269	}
270	html("'>");	270	html("'>");
271	html_txt(name);	271	html_txt(name);
272	html("</a>");	272	html("</a>");
273	}	273	}
274		274
275	void cgit_object_link(struct object *obj)	275	void cgit_object_link(struct object *obj)
276	{	276	{
277	char page, arg, *url;	277	char page, arg, *url;
278		278
279	if (obj->type == OBJ_COMMIT) {	279	if (obj->type == OBJ_COMMIT) {
280	cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,	280	cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
281	cgit_query_head, sha1_to_hex(obj->sha1));	281	cgit_query_head, sha1_to_hex(obj->sha1));
282	return;	282	return;
283	} else if (obj->type == OBJ_TREE) {	283	} else if (obj->type == OBJ_TREE) {
284	page = "tree";	284	page = "tree";
285	arg = "id";	285	arg = "id";
286	} else if (obj->type == OBJ_TAG) {	286	} else if (obj->type == OBJ_TAG) {
287	page = "tag";	287	page = "tag";
288	arg = "id";	288	arg = "id";
289	} else {	289	} else {
290	page = "blob";	290	page = "blob";
291	arg = "id";	291	arg = "id";
292	}	292	}
293		293
294	url = cgit_pageurl(cgit_query_repo, page,	294	url = cgit_pageurl(cgit_query_repo, page,
295	fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));	295	fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
296	html_link_open(url, NULL, NULL);	296	html_link_open(url, NULL, NULL);
297	htmlf("%s %s", typename(obj->type),	297	htmlf("%s %s", typename(obj->type),
298	sha1_to_hex(obj->sha1));	298	sha1_to_hex(obj->sha1));
299	html_link_close();	299	html_link_close();
300	}	300	}
301		301
302	void cgit_print_date(time_t secs, char *format)	302	void cgit_print_date(time_t secs, char *format)
303	{	303	{
304	char buf[64];	304	char buf[64];
305	struct tm *time;	305	struct tm *time;
306		306
307	time = gmtime(&secs);	307	time = gmtime(&secs);
308	strftime(buf, sizeof(buf)-1, format, time);	308	strftime(buf, sizeof(buf)-1, format, time);
309	html_txt(buf);	309	html_txt(buf);
310	}	310	}
311		311
312	void cgit_print_age(time_t t, time_t max_relative, char *format)	312	void cgit_print_age(time_t t, time_t max_relative, char *format)
313	{	313	{
314	time_t now, secs;	314	time_t now, secs;
315		315
316	time(&now);	316	time(&now);
317	secs = now - t;	317	secs = now - t;
318		318
319	if (secs > max_relative && max_relative >= 0) {	319	if (secs > max_relative && max_relative >= 0) {
320	cgit_print_date(t, format);	320	cgit_print_date(t, format);
321	return;	321	return;
322	}	322	}
323		323
324	if (secs < TM_HOUR * 2) {	324	if (secs < TM_HOUR * 2) {
325	htmlf("<span class='age-mins'>%.0f min.</span>",	325	htmlf("<span class='age-mins'>%.0f min.</span>",
326	secs * 1.0 / TM_MIN);	326	secs * 1.0 / TM_MIN);
327	return;	327	return;
328	}	328	}
329	if (secs < TM_DAY * 2) {	329	if (secs < TM_DAY * 2) {
330	htmlf("<span class='age-hours'>%.0f hours</span>",	330	htmlf("<span class='age-hours'>%.0f hours</span>",
331	secs * 1.0 / TM_HOUR);	331	secs * 1.0 / TM_HOUR);
332	return;	332	return;
333	}	333	}
334	if (secs < TM_WEEK * 2) {	334	if (secs < TM_WEEK * 2) {
335	htmlf("<span class='age-days'>%.0f days</span>",	335	htmlf("<span class='age-days'>%.0f days</span>",
336	secs * 1.0 / TM_DAY);	336	secs * 1.0 / TM_DAY);
337	return;	337	return;
338	}	338	}
339	if (secs < TM_MONTH * 2) {	339	if (secs < TM_MONTH * 2) {
340	htmlf("<span class='age-weeks'>%.0f weeks</span>",	340	htmlf("<span class='age-weeks'>%.0f weeks</span>",
341	secs * 1.0 / TM_WEEK);	341	secs * 1.0 / TM_WEEK);
342	return;	342	return;
343	}	343	}
344	if (secs < TM_YEAR * 2) {	344	if (secs < TM_YEAR * 2) {
345	htmlf("<span class='age-months'>%.0f months</span>",	345	htmlf("<span class='age-months'>%.0f months</span>",
346	secs * 1.0 / TM_MONTH);	346	secs * 1.0 / TM_MONTH);
347	return;	347	return;
348	}	348	}
349	htmlf("<span class='age-years'>%.0f years</span>",	349	htmlf("<span class='age-years'>%.0f years</span>",
350	secs * 1.0 / TM_YEAR);	350	secs * 1.0 / TM_YEAR);
351	}	351	}
352		352
353	void cgit_print_docstart(char title, struct cacheitem item)	353	void cgit_print_docstart(char title, struct cacheitem item)
354	{	354	{
355	html("Content-Type: text/html; charset=utf-8\n");	355	html("Content-Type: text/html; charset=" PAGE_ENCODING "\n");
356	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));	356	htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
357	htmlf("Expires: %s\n", http_date(item->st.st_mtime +	357	htmlf("Expires: %s\n", http_date(item->st.st_mtime +
358	ttl_seconds(item->ttl)));	358	ttl_seconds(item->ttl)));
359	html("\n");	359	html("\n");
360	html(cgit_doctype);	360	html(cgit_doctype);
361	html("<html>\n");	361	html("<html>\n");
362	html("<head>\n");	362	html("<head>\n");
363	html("<title>");	363	html("<title>");
364	html_txt(title);	364	html_txt(title);
365	html("</title>\n");	365	html("</title>\n");
366	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);	366	htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
367	html("<link rel='stylesheet' type='text/css' href='");	367	html("<link rel='stylesheet' type='text/css' href='");
368	html_attr(cgit_css);	368	html_attr(cgit_css);
369	html("'/>\n");	369	html("'/>\n");
370	html("</head>\n");	370	html("</head>\n");
371	html("<body>\n");	371	html("<body>\n");
372	}	372	}
373		373
374	void cgit_print_docend()	374	void cgit_print_docend()
375	{	375	{
376	html("</td>\n</tr>\n<table>\n</body>\n</html>\n");	376	html("</td>\n</tr>\n<table>\n</body>\n</html>\n");
377	}	377	}
378		378
379	int print_branch_option(const char refname, const unsigned char sha1,	379	int print_branch_option(const char refname, const unsigned char sha1,
380	int flags, void *cb_data)	380	int flags, void *cb_data)
381	{	381	{
382	char name = (char )refname;	382	char name = (char )refname;
383	html_option(name, name, cgit_query_head);	383	html_option(name, name, cgit_query_head);
384	return 0;	384	return 0;
385	}	385	}
386		386
387	int print_archive_ref(const char refname, const unsigned char sha1,	387	int print_archive_ref(const char refname, const unsigned char sha1,
388	int flags, void *cb_data)	388	int flags, void *cb_data)
389	{	389	{
390	struct tag *tag;	390	struct tag *tag;
391	struct taginfo *info;	391	struct taginfo *info;
392	struct object *obj;	392	struct object *obj;
393	char buf[256], *url;	393	char buf[256], *url;
394	unsigned char fileid[20];	394	unsigned char fileid[20];
395	int header = (int )cb_data;	395	int header = (int )cb_data;
396		396
397	if (prefixcmp(refname, "refs/archives"))	397	if (prefixcmp(refname, "refs/archives"))
398	return 0;	398	return 0;
399	strncpy(buf, refname+14, sizeof(buf));	399	strncpy(buf, refname+14, sizeof(buf));
400	obj = parse_object(sha1);	400	obj = parse_object(sha1);
401	if (!obj)	401	if (!obj)
402	return 1;	402	return 1;
403	if (obj->type == OBJ_TAG) {	403	if (obj->type == OBJ_TAG) {
404	tag = lookup_tag(sha1);	404	tag = lookup_tag(sha1);
405	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))	405	if (!tag \|\| parse_tag(tag) \|\| !(info = cgit_parse_tag(tag)))
406	return 0;	406	return 0;
407	hashcpy(fileid, tag->tagged->sha1);	407	hashcpy(fileid, tag->tagged->sha1);
408	} else if (obj->type != OBJ_BLOB) {	408	} else if (obj->type != OBJ_BLOB) {
409	return 0;	409	return 0;
410	} else {	410	} else {
411	hashcpy(fileid, sha1);	411	hashcpy(fileid, sha1);
412	}	412	}
413	if (!*header) {	413	if (!*header) {
414	html("<p><h1>download</h1>");	414	html("<p><h1>download</h1>");
415	*header = 1;	415	*header = 1;
416	}	416	}
417	url = cgit_pageurl(cgit_query_repo, "blob",	417	url = cgit_pageurl(cgit_query_repo, "blob",
418	fmt("id=%s&path=%s", sha1_to_hex(fileid),	418	fmt("id=%s&path=%s", sha1_to_hex(fileid),
419	buf));	419	buf));
420	html_link_open(url, NULL, "menu");	420	html_link_open(url, NULL, "menu");
421	html_txt(strlpart(buf, 20));	421	html_txt(strlpart(buf, 20));
422	html_link_close();	422	html_link_close();
423	return 0;	423	return 0;
424	}	424	}
425		425
426	void add_hidden_formfields(int incl_head, int incl_search, char *page)	426	void add_hidden_formfields(int incl_head, int incl_search, char *page)
427	{	427	{
428	char *url;	428	char *url;
429		429
430	if (!cgit_virtual_root) {	430	if (!cgit_virtual_root) {
431	url = fmt("%s/%s", cgit_query_repo, page);	431	url = fmt("%s/%s", cgit_query_repo, page);
432	if (cgit_query_path)	432	if (cgit_query_path)
433	url = fmt("%s/%s", url, cgit_query_path);	433	url = fmt("%s/%s", url, cgit_query_path);
434	html_hidden("url", url);	434	html_hidden("url", url);
435	}	435	}
436		436
437	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))	437	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
438	html_hidden("h", cgit_query_head);	438	html_hidden("h", cgit_query_head);
439		439
440	if (cgit_query_sha1)	440	if (cgit_query_sha1)
441	html_hidden("id", cgit_query_sha1);	441	html_hidden("id", cgit_query_sha1);
442	if (cgit_query_sha2)	442	if (cgit_query_sha2)
443	html_hidden("id2", cgit_query_sha2);	443	html_hidden("id2", cgit_query_sha2);
444		444
445	if (incl_search) {	445	if (incl_search) {
446	if (cgit_query_grep)	446	if (cgit_query_grep)
447	html_hidden("qt", cgit_query_grep);	447	html_hidden("qt", cgit_query_grep);
448	if (cgit_query_search)	448	if (cgit_query_search)
449	html_hidden("q", cgit_query_search);	449	html_hidden("q", cgit_query_search);
450	}	450	}
451	}	451	}