kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow escaping of commas as well as ability to use quotes (bug #1826)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3209 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-14 21:43:16 +00:00
parent ee664e6ccd
commit c53e76528d
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
pbx/pbx_config.c
View File

@@ -97,6 +97,36 @@ static char reload_extensions_help[] =
"\n"
"Example: extensions reload\n";
/*
* Static code
*/
static char* process_quotes_and_slashes( char* start, char find, char replace_with )
{
char* dataPut = start;
int inEscape = 0;
int inQuotes = 0;
for( ; *start; start++ ) {
if( inEscape ) {
*dataPut++ = *start; /* Always goes verbatim */
inEscape = 0;
}
else {
if( *start == '\\' ) {
inEscape = 1; /* Do not copy \ into the data */
}
else if( *start == '\"' ) {
inQuotes = 1-inQuotes; /* Do not copy " into the data */
}
else {
/* Replace , with |, unless in quotes */
*dataPut++ = inQuotes ? *start : ((*start==find) ? replace_with : *start);
}
}
}
*dataPut = 0;
return dataPut;
}
/*
* Implementation of functions provided by this module
*/
@@ -1144,9 +1174,7 @@ static int handle_context_add_extension(int fd, int argc, char *argv[])
if (app && (start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
*start = *end = '\0';
app_data = start + 1;
for (start = app_data; *start; start++)
if (*start == ',')
*start = '|';
process_quotes_and_slashes(app_data,',','|');
} else
app_data = whole_exten;
@@ -1615,9 +1643,7 @@ static int pbx_load_module(void)
if (start && (end = strrchr(appl, ')'))) {
*start = *end = '\0';
data = start + 1;
for (start = data; *start; start++)
if (*start == ',')
*start = '|';
process_quotes_and_slashes(data,',','|');
} else if (stringp!=NULL && *stringp=='"') {
stringp++;
data = strsep(&stringp, "\"");