aboutsummaryrefslogtreecommitdiffstats
path: root/parsing.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2007-05-15 06:40:33 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-05-15 06:40:33 (JST)
commit5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39 (patch)
tree5c844c0ba53cfd2e838368ffbbd4583ac63d3608 /parsing.c
parent9ecde6568a9e39c942f4c5585ffa494c5df870e4 (diff)
downloadcgit-5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39.zip
cgit-5ec6e02bd1cc0c05b7cfd0d53371e7d176daec39.tar.gz
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)
64 64
65int cgit_read_config(const char *filename, configfn fn) 65int cgit_read_config(const char *filename, configfn fn)
66{ 66{
67 int ret = 0, len; 67 static int nesting;
68 int len;
68 char line[256]; 69 char line[256];
69 const char *value; 70 const char *value;
70 FILE *f = fopen(filename, "r"); 71 FILE *f;
71 72
72 if (!f) 73 /* cancel the reading of yet another configfile after 16 invocations */
74 if (nesting++ > 16)
75 return -1;
76 if (!(f = fopen(filename, "r")))
73 return -1; 77 return -1;
74
75 while((len = read_config_line(f, line, &value, sizeof(line))) > 0) 78 while((len = read_config_line(f, line, &value, sizeof(line))) > 0)
76 (*fn)(line, value); 79 (*fn)(line, value);
77
78 fclose(f); 80 fclose(f);
79 return ret; 81 return 0;
80} 82}
81 83
82char *convert_query_hexchar(char *txt) 84char *convert_query_hexchar(char *txt)