MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-13 16:03:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

escape commas in multivalued string, closing ticket #128

Browse Source
This commit is contained in:
Ron Pedde 2006-05-31 04:15:06 +00:00
parent f15d1d7d96
commit b567d86d46
1 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/conf.c
View File

@ -1126,7 +1126,6 @@ int conf_set_string(char *section, char *key, char *value, int verify) {
* @returns TRUE if writable, FALSE otherwise * @returns TRUE if writable, FALSE otherwise
*/ */
int conf_iswritable(void) { int conf_iswritable(void) {
FILE *fp;
int retval = FALSE; int retval = FALSE;
/* don't want configfile reopened under us */ /* don't want configfile reopened under us */
@ -1297,6 +1296,7 @@ int _conf_split(char *s, char *delimiters, char ***argvp) {
char *t; char *t;
char *tokptr; char *tokptr;
char *tmp; char *tmp;
char *fix_src, *fix_dst;
if ((s == NULL) || (delimiters == NULL) || (argvp == NULL)) if ((s == NULL) || (delimiters == NULL) || (argvp == NULL))
return -1; return -1;
@ -1306,12 +1306,20 @@ int _conf_split(char *s, char *delimiters, char ***argvp) {
return -1; return -1;
strcpy(t, snew); strcpy(t, snew);
numtokens = 0; numtokens = 1;
tokptr = NULL; tokptr = NULL;
tmp = t; tmp = t;
while(strtok_r(tmp,delimiters,&tokptr) != NULL) {
tmp=NULL; tmp = s;
numtokens++; while(*tmp) {
if(strchr(delimiters,*tmp) && (*(tmp+1) == *tmp)) {
tmp += 2;
} else if(strchr(delimiters,*tmp)) {
numtokens++;
tmp++;
} else {
tmp++;
}
} }
DPRINTF(E_DBG,L_CONF,"Found %d tokens in %s\n",numtokens,s); DPRINTF(E_DBG,L_CONF,"Found %d tokens in %s\n",numtokens,s);
@ -1324,12 +1332,32 @@ int _conf_split(char *s, char *delimiters, char ***argvp) {
if (numtokens == 0) if (numtokens == 0)
free(t); free(t);
else { else {
strcpy(t, snew); tokptr = t;
tokptr = NULL;
tmp = t; tmp = t;
for (i = 0; i < numtokens; i++) { for (i = 0; i < numtokens; i++) {
*((*argvp) + i) = strtok_r(tmp, delimiters, &tokptr); while(*tmp) {
tmp=NULL; if(strchr(delimiters,*tmp) && (*(tmp+1) != *tmp))
break;
if(strchr(delimiters,*tmp)) {
tmp += 2;
} else {
tmp++;
}
}
*tmp = '\0';
tmp++;
(*argvp)[i] = tokptr;
fix_src = fix_dst = tokptr;
while(*fix_src) {
if(strchr(delimiters,*fix_src) && (*(fix_src+1) == *fix_src)) {
fix_src++;
}
*fix_dst++ = *fix_src++;
}
*fix_dst = '\0';
tokptr = tmp;
DPRINTF(E_DBG,L_CONF,"Token %d: %s\n",i+1,(*argvp)[i]); DPRINTF(E_DBG,L_CONF,"Token %d: %s\n",i+1,(*argvp)[i]);
} }
} }