X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/77078ba716ccdfdc954741355dd6a17632db961b..47a81c77fdd017227632c4df9a0b7b135b8a738d:/parsing.c

diff --git a/parsing.c b/parsing.c
index 4d5cc74..36b0f0c 100644
--- a/parsing.c
+++ b/parsing.c
@@ -64,19 +64,42 @@ int read_config_line(FILE *f, char *line, const char **value, int bufsize)
 
 int cgit_read_config(const char *filename, configfn fn)
 {
-	int ret = 0, len;
+	static int nesting;
+	int len;
 	char line[256];
 	const char *value;
-	FILE *f = fopen(filename, "r");
+	FILE *f;
 
-	if (!f)
+	/* cancel deeply nested include-commands */
+	if (nesting > 8)
 		return -1;
-
+	if (!(f = fopen(filename, "r")))
+		return -1;
+	nesting++;
 	while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
 		(*fn)(line, value);
-
+	nesting--;
 	fclose(f);
-	return ret;
+	return 0;
+}
+
+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 cgit_parse_query(char *txt, configfn fn)
@@ -87,11 +110,15 @@ int cgit_parse_query(char *txt, configfn fn)
 		return 0;
 
 	t = txt = xstrdup(txt);
- 
+
 	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);
@@ -122,6 +149,12 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 
 	ret = xmalloc(sizeof(*ret));
 	ret->commit = commit;
+	ret->author = NULL;
+	ret->author_email = NULL;
+	ret->committer = NULL;
+	ret->committer_email = NULL;
+	ret->subject = NULL;
+	ret->msg = NULL;
 
 	if (strncmp(p, "tree ", 5))
 		die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
@@ -157,12 +190,60 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 		p = strchr(p, '\n') + 1;
 
 	t = strchr(p, '\n');
-	ret->subject = substr(p, t);
-	p = t + 1;
+	if (t && *t) {
+		ret->subject = substr(p, t);
+		p = t + 1;
 
-	while (*p == '\n')
+		while (*p == '\n')
+			p = strchr(p, '\n') + 1;
+		ret->msg = p;
+	}
+	return ret;
+}
+
+
+struct taginfo *cgit_parse_tag(struct tag *tag)
+{
+	void *data;
+	enum object_type type;
+	unsigned long size;
+	char *p, *t;
+	struct taginfo *ret;
+
+	data = read_sha1_file(tag->object.sha1, &type, &size);
+	if (!data || type != OBJ_TAG) {
+		free(data);
+		return 0;
+	}
+
+	ret = xmalloc(sizeof(*ret));
+	ret->tagger = NULL;
+	ret->tagger_email = NULL;
+	ret->tagger_date = 0;
+	ret->msg = NULL;
+
+	p = data;
+
+	while (p && *p) {
+		if (*p == '\n')
+			break;
+
+		if (!strncmp(p, "tagger ", 7)) {
+			p += 7;
+			t = strchr(p, '<') - 1;
+			ret->tagger = substr(p, t);
+			p = t;
+			t = strchr(t, '>') + 1;
+			ret->tagger_email = substr(p, t);
+			ret->tagger_date = atol(++t);
+		}
 		p = strchr(p, '\n') + 1;
-	ret->msg = p;
+	}
 
+	while (p && (*p == '\n'))
+		p = strchr(p, '\n') + 1;
+	if (p && *p)
+		ret->msg = xstrdup(p);
+	free(data);
 	return ret;
 }