Supply status description to html_status()

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 12 insertions, 14 deletions

diff --git a/html.c b/html.c
index 83fc7a9..36e9a2f 100644
--- a/html.c
+++ b/html.c
@@ -1,257 +1,257 @@
 /* html.c: helper functions for html output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
 
 int htmlfd = STDOUT_FILENO;
 
 char *fmt(const char *format, ...)
 {
 	static char buf[8][1024];
 	static int bufidx;
 	int len;
 	va_list args;
 
 	bufidx++;
 	bufidx &= 7;
 
 	va_start(args, format);
 	len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args);
 	va_end(args);
 	if (len>sizeof(buf[bufidx])) {
 		fprintf(stderr, "[html.c] string truncated: %s\n", format);
 		exit(1);
 	}
 	return buf[bufidx];
 }
 
 void html_raw(const char *data, size_t size)
 {
 	write(htmlfd, data, size);
 }
 
 void html(const char *txt)
 {
 	write(htmlfd, txt, strlen(txt));
 }
 
 void htmlf(const char *format, ...)
 {
 	static char buf[65536];
 	va_list args;
 
 	va_start(args, format);
 	vsnprintf(buf, sizeof(buf), format, args);
 	va_end(args);
 	html(buf);
 }
 
-void html_status(int code, int more_headers)
+void html_status(int code, const char *msg, int more_headers)
 {
-	htmlf("Status: %d\n", code);
+	htmlf("Status: %d %s\n", code, msg);
 	if (!more_headers)
 		html("\n");
 }
 
 void html_txt(char *txt)
 {
 	char *t = txt;
 	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
 			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
 				html("&lt;");
 			else if (c=='&')
 				html("&amp;");
 			txt = t+1;
 		}
 		t++;
 	}
 	if (t!=txt)
 		html(txt);
 }
 
 void html_ntxt(int len, char *txt)
 {
 	char *t = txt;
 	while(t && *t && len--){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='&') {
 			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
 				html("&lt;");
 			else if (c=='&')
 				html("&amp;");
 			txt = t+1;
 		}
 		t++;
 	}
 	if (t!=txt)
 		write(htmlfd, txt, t - txt);
 	if (len<0)
 		html("...");
 }
 
 void html_attr(char *txt)
 {
 	char *t = txt;
 	while(t && *t){
 		int c = *t;
 		if (c=='<' || c=='>' || c=='\'') {
 			write(htmlfd, txt, t - txt);
 			if (c=='>')
 				html("&gt;");
 			else if (c=='<')
 				html("&lt;");
 			else if (c=='\'')
 				html("&quote;");
 			txt = t+1;
 		}
 		t++;
 	}
 	if (t!=txt)
 		html(txt);
 }
 
 void html_hidden(char *name, char *value)
 {
 	html("<input type='hidden' name='");
 	html_attr(name);
 	html("' value='");
 	html_attr(value);
 	html("'/>");
 }
 
 void html_option(char *value, char *text, char *selected_value)
 {
 	html("<option value='");
 	html_attr(value);
 	html("'");
 	if (selected_value && !strcmp(selected_value, value))
 		html(" selected='selected'");
 	html(">");
 	html_txt(text);
 	html("</option>\n");
 }
 
 void html_link_open(char *url, char *title, char *class)
 {
 	html("<a href='");
 	html_attr(url);
 	if (title) {
 		html("' title='");
 		html_attr(title);
 	}
 	if (class) {
 		html("' class='");
 		html_attr(class);
 	}
 	html("'>");
 }
 
 void html_link_close(void)
 {
 	html("</a>");
 }
 
 void html_fileperm(unsigned short mode)
 {
 	htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
 	      (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
 }
 
 int html_include(const char *filename)
 {
 	FILE *f;
 	char buf[4096];
 	size_t len;
 
 	if (!(f = fopen(filename, "r"))) {
 		fprintf(stderr, "[cgit] Failed to include file %s: %s (%d).\n",
 			filename, strerror(errno), errno);
 		return -1;
 	}
 	while((len = fread(buf, 1, 4096, f)) > 0)
 		write(htmlfd, buf, len);
 	fclose(f);
 	return 0;
 }
 
 int hextoint(char c)
 {
 	if (c >= 'a' && c <= 'f')
 		return 10 + c - 'a';
 	else if (c >= 'A' && c <= 'F')
 		return 10 + c - 'A';
 	else if (c >= '0' && c <= '9')
 		return c - '0';
 	else
 		return -1;
 }
 
 char *convert_query_hexchar(char *txt)
 {
 	int d1, d2;
 	if (strlen(txt) < 3) {
 		*txt = '\0';
 		return txt-1;
 	}
 	d1 = hextoint(*(txt+1));
 	d2 = hextoint(*(txt+2));
 	if (d1<0 || d2<0) {
 		strcpy(txt, txt+3);
 		return txt-1;
 	} else {
 		*txt = d1 * 16 + d2;
 		strcpy(txt+1, txt+3);
 		return txt;
 	}
 }
 
 int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))
 {
 	char *t, *value = NULL, c;
 
 	if (!txt)
 		return 0;
 
 	t = txt = strdup(txt);
 	if (t == NULL) {
 		printf("Out of memory\n");
 		exit(1);
 	}
 	while((c=*t) != '\0') {
 		if (c=='=') {
 			*t = '\0';
 			value = t+1;
 		} else if (c=='+') {
 			*t = ' ';
 		} else if (c=='%') {
 			t = convert_query_hexchar(t);
 		} else if (c=='&') {
 			*t = '\0';
 			(*fn)(txt, value);
 			txt = t+1;
 			value = NULL;
 		}
 		t++;
 	}
 	if (t!=txt)
 		(*fn)(txt, value);
 	return 0;
 }
diff --git a/html.h b/html.h
index 49462a2..3c32935 100644
--- a/html.h
+++ b/html.h
@@ -1,22 +1,22 @@
 #ifndef HTML_H
 #define HTML_H
 
 extern int htmlfd;
 
 extern void html_raw(const char *txt, size_t size);
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
-extern void html_status(int code, int more_headers);
+extern void html_status(int code, const char *msg, int more_headers);
 extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_hidden(char *name, char *value);
 extern void html_option(char *value, char *text, char *selected_value);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_fileperm(unsigned short mode);
 extern int html_include(const char *filename);
 
 extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value));
 
 #endif /* HTML_H */
diff --git a/ui-clone.c b/ui-clone.c
index 3a037ad..81e7a4e 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -1,104 +1,102 @@
 /* ui-clone.c: functions for http cloning, based on
  * git's http-backend.c by Shawn O. Pearce
  *
  * Copyright (C) 2008 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 static int print_ref_info(const char *refname, const unsigned char *sha1,
                           int flags, void *cb_data)
 {
 	struct object *obj;
 
 	if (!(obj = parse_object(sha1)))
 		return 0;
 
 	if (!strcmp(refname, "HEAD") || !prefixcmp(refname, "refs/heads/"))
 		htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
 	else if (!prefixcmp(refname, "refs/tags") && obj->type == OBJ_TAG) {
 		if (!(obj = deref_tag(obj, refname, 0)))
 			return 0;
 		htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
 		htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname);
 	}
 	return 0;
 }
 
 static void print_pack_info(struct cgit_context *ctx)
 {
 	struct packed_git *pack;
 	int ofs;
 
 	ctx->page.mimetype = "text/plain";
 	ctx->page.filename = "objects/info/packs";
 	cgit_print_http_headers(ctx);
 	ofs = strlen(ctx->repo->path) + strlen("/objects/pack/");
 	prepare_packed_git();
 	for (pack = packed_git; pack; pack = pack->next)
 		if (pack->pack_local)
 			htmlf("P %s\n", pack->pack_name + ofs);
 }
 
 static void send_file(struct cgit_context *ctx, char *path)
 {
 	struct stat st;
-	int err;
 
 	if (stat(path, &st)) {
 		switch (errno) {
 		case ENOENT:
-			err = 404;
+			html_status(404, "Not found", 0);
 			break;
 		case EACCES:
-			err = 403;
+			html_status(403, "Forbidden", 0);
 			break;
 		default:
-			err = 400;
+			html_status(400, "Bad request", 0);
 		}
-		html_status(err, 0);
 		return;
 	}
 	ctx->page.mimetype = "application/octet-stream";
 	ctx->page.filename = path;
 	if (prefixcmp(ctx->repo->path, path))
 		ctx->page.filename += strlen(ctx->repo->path) + 1;
 	cgit_print_http_headers(ctx);
 	html_include(path);
 }
 
 void cgit_clone_info(struct cgit_context *ctx)
 {
 	if (!ctx->qry.path || strcmp(ctx->qry.path, "refs"))
 		return;
 
 	ctx->page.mimetype = "text/plain";
 	ctx->page.filename = "info/refs";
 	cgit_print_http_headers(ctx);
 	for_each_ref(print_ref_info, ctx);
 }
 
 void cgit_clone_objects(struct cgit_context *ctx)
 {
 	if (!ctx->qry.path) {
-		html_status(400, 0);
+		html_status(400, "Bad request", 0);
 		return;
 	}
 
 	if (!strcmp(ctx->qry.path, "info/packs")) {
 		print_pack_info(ctx);
 		return;
 	}
 
 	send_file(ctx, git_path("objects/%s", ctx->qry.path));
 }
 
 void cgit_clone_head(struct cgit_context *ctx)
 {
 	send_file(ctx, git_path("%s", "HEAD"));
 }
diff --git a/ui-plain.c b/ui-plain.c
index 28deae5..35888a0 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,82 +1,82 @@
 /* ui-plain.c: functions for output of plain blobs by path
  *
  * Copyright (C) 2008 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int match;
 
 static void print_object(const unsigned char *sha1, const char *path)
 {
 	enum object_type type;
 	char *buf;
 	size_t size;
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD) {
-		html_status(404, 0);
+		html_status(404, "Not found", 0);
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
-		html_status(404, 0);
+		html_status(404, "Not found", 0);
 		return;
 	}
 	ctx.page.mimetype = "text/plain";
 	ctx.page.filename = fmt("%s", path);
 	ctx.page.size = size;
 	cgit_print_http_headers(&ctx);
 	html_raw(buf, size);
 	match = 1;
 }
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 		     const char *pathname, unsigned mode, int stage,
 		     void *cbdata)
 {
 	fprintf(stderr, "[cgit] walk_tree.pathname=%s", pathname);
 
 	if (!pathname || strcmp(match_path, pathname))
 		return READ_TREE_RECURSIVE;
 
 	if (S_ISREG(mode))
 		print_object(sha1, pathname);
 
 	return 0;
 }
 
 void cgit_print_plain(struct cgit_context *ctx)
 {
 	const char *rev = ctx->qry.sha1;
 	unsigned char sha1[20];
 	struct commit *commit;
 	const char *paths[] = {ctx->qry.path, NULL};
 
 	if (!rev)
 		rev = ctx->qry.head;
 
 	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
-		html_status(404, 0);
+		html_status(404, "Not found", 0);
 		return;
 	}
 	commit = lookup_commit_reference(sha1);
 	if (!commit || parse_commit(commit)) {
-		html_status(404, 0);
+		html_status(404, "Not found", 0);
 		return;
 	}
 	match_path = ctx->qry.path;
 	fprintf(stderr, "[cgit] match_path=%s", match_path);
 	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
 	if (!match)
-		html_status(404, 0);
+		html_status(404, "Not found", 0);
 }