summaryrefslogtreecommitdiff
path: root/parsing.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2007-05-14 23:40:33 +0200
committerLars Hjemli <hjemli@gmail.com>2007-05-14 23:40:33 +0200
commit5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39 (patch)
tree5c844c0ba53cfd2e838368ffbbd4583ac63d3608 /parsing.c
parent9ecde6568a9e39c942f4c5585ffa494c5df870e4 (diff)
Add include-parameter to config files
This parameter can be used to include another config-file, like a standalone repository listing. Suggested in a patch by Kristian Høgsberg <krh@bitplanet.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'parsing.c')
-rw-r--r--parsing.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/parsing.c b/parsing.c
index 332d61c..8e15e5a 100644
--- a/parsing.c
+++ b/parsing.c
@@ -64,19 +64,21 @@ 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 the reading of yet another configfile after 16 invocations */
+ if (nesting++ > 16)
+ return -1;
+ if (!(f = fopen(filename, "r")))
return -1;
-
while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
(*fn)(line, value);
-
fclose(f);
- return ret;
+ return 0;
}
char *convert_query_hexchar(char *txt)