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

Properly handle | within ()'s when doing app arg parsing... (bug #4911)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6294 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-08-06 16:52:56 +00:00
parent 51c390db61
commit 6b6ecee06d
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app.c
View File

@@ -1066,9 +1066,9 @@ int ast_app_group_match_get_count(char *groupmatch, char *category)
int ast_separate_app_args(char *buf, char delim, char **array, int arraylen)
{
int x;
int argc;
char *scan;
char delims[2];
int paren = 0;
if (!buf || !array || !arraylen)
return 0;
@@ -1076,21 +1076,26 @@ int ast_separate_app_args(char *buf, char delim, char **array, int arraylen)
memset(array, 0, arraylen * sizeof(*array));
scan = buf;
delims[0] = delim;
delims[1] = '\0';
x = 0;
while (x < arraylen - 1) {
array[x] = strsep(&scan, delims);
x++;
if (!scan)
break;
for (argc = 0; *scan && (argc < arraylen - 1); argc++) {
array[argc] = scan;
for (; *scan; scan++) {
if (*scan == '(')
paren++;
else if (*scan == ')') {
if (paren)
paren--;
} else if ((*scan == delim) && !paren) {
*scan++ = '\0';
break;
}
}
}
if (scan)
array[x++] = scan;
if (*scan)
array[argc++] = scan;
return x;
return argc;
}
enum AST_LOCK_RESULT ast_lock_path(const char *path)