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

Confparse: Simplify get_sec()

Browse Source 
Just find start and end section then copy it into the return string.
Prevent multiple call to _strdup.
This commit is contained in:
Philippe Pepiot 2009-08-27 07:39:30 +02:00
parent fda24134a6
commit 64ad8d22a1
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/confparse/confparse.c
View File

@ -81,8 +81,10 @@ file_to_str(char *path)
char* char*
get_sec(char *src, char *name) get_sec(char *src, char *name)
{ {
char *ret, *p; char *ret = NULL, *start, *end;
char **sec; char **sec;
size_t len;
Bool is_char = False;
if(!src) if(!src)
return NULL; return NULL;
@ -91,20 +93,39 @@ get_sec(char *src, char *name)
return src; return src;
sec = secname(name); sec = secname(name);
len = strlen(sec[SecStart]);
ret = _strdup(src); /* Find start section pointer */
for(start = src; *start != '\0'; start++)
if((p = strstr(erase_delim_content(src), sec[SecStart])))
{ {
ret += strlen(ret) - strlen(p) + strlen(sec[SecStart]) + 1; if(strchr("\"'", *start))
is_char = !is_char;
if((p = strstr(erase_delim_content(ret), sec[SecEnd]))) if(is_char == False && !strncmp(start, sec[SecStart], len))
*(ret + (strlen(ret) - strlen(p))) = '\0'; break;
else }
ret = NULL;
if(*start != '\0')
{
/* Here is_char == False */
start += len;
/* Find end section pointer */
for(end = start; *end != '\0'; end++)
{
if(strchr("\"'", *end))
is_char = !is_char;
if(is_char == False && !strncmp(end, sec[SecEnd], len+1))
break;
}
/* Allocate and set ret */
if(end != '\0')
{
len = end - start;
ret = emalloc(len + 1, sizeof(char));
memcpy(ret, start, len);
ret[len] = '\0';
}
} }
else
ret = NULL;
free_secname(sec); free_secname(sec);