godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Config: Apply second patch of mseed/PeVe about conf split: Can comment @include line in conf.

Browse Source
This commit is contained in:
Martin Duquesnoy 2010-08-18 23:42:31 +02:00
parent dce3b8eb3c
commit 4f42436098
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/parse/parse.c
View File

@ -275,6 +275,8 @@ get_conf(const char *name)
char *tmp_inc_list = NULL;
char *incname = NULL;
char *tmp_inc = NULL;
char *rem_inc_tmp = NULL;
Bool rem = False;
if (!name)
return (-1);
@ -296,6 +298,20 @@ get_conf(const char *name)
while(pos && (strlen(buf) > 0))
{
rem_inc_tmp = pos;
rem = False;
while(buf > rem_inc_tmp)
{
if((rem_inc_tmp[0] == '\n') || (rem_inc_tmp[0] == '\r'))
break;
if(rem_inc_tmp[0] == '#')
{
rem = True;
break;
}
rem_inc_tmp = rem_inc_tmp - sizeof(char);
}
xpos = strstr(buf, inc);
xpos = xpos + strlen(inc);
xend = strstr(xpos, inc_end);
@ -313,7 +329,7 @@ get_conf(const char *name)
strcat(tmp_inc, "]");
tmpbuf = NULL;
if(!strstr(inc_list, tmp_inc))
if(!strstr(inc_list, tmp_inc) && !rem)
{
tmp_inc_list = (char *) malloc(sizeof(char) * (strlen(tmp_inc) + strlen(inc_list) + 5));
strcpy(tmp_inc_list, "\r\n");
@ -334,6 +350,7 @@ get_conf(const char *name)
buffer = (char *)malloc(sizeof(char) * (strlen(buf) + strlen(tmpbuf) + 1));
strncpy(buffer, buf, (pos - buf));
memset(buffer + (pos - buf), 0, sizeof(char));
strcat(buffer, tmpbuf);
strcat(buffer, pos_end);
free(buf);