X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/66091f934a2d064ae55095cdc5ae008b43ea60fe..723469962b42de9f73960a883403cfdc422f176f:/parsing.c

diff --git a/parsing.c b/parsing.c
index 4412dee..36b0f0c 100644
--- a/parsing.c
+++ b/parsing.c
@@ -64,19 +64,23 @@ 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)
@@ -106,7 +110,7 @@ int cgit_parse_query(char *txt, configfn fn)
 		return 0;
 
 	t = txt = xstrdup(txt);
- 
+
 	while((c=*t) != '\0') {
 		if (c=='=') {
 			*t = '\0';
@@ -196,3 +200,50 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 	}
 	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;
+	}
+
+	while (p && (*p == '\n'))
+		p = strchr(p, '\n') + 1;
+	if (p && *p)
+		ret->msg = xstrdup(p);
+	free(data);
+	return ret;
+}