kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 02:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow Gosub to recognize quote delimiters without consuming them.

Browse Source 
(closes issue #15557)
 Reported by: rain
 Patches: 
       20090723__issue15557.diff.txt uploaded by tilghman (license 14)
 Tested by: rain
 
Review: https://reviewboard.asterisk.org/r/316/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@210908 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-08-06 21:29:26 +00:00
parent d669ba24d7
commit a737df8603
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
main/app.c
View File

@@ -1174,7 +1174,10 @@ int ast_app_group_list_unlock(void)
return AST_RWLIST_UNLOCK(&groups);
}
unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen)
#undef ast_app_separate_args
unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen);
unsigned int __ast_app_separate_args(char *buf, char delim, int remove_chars, char **array, int arraylen)
{
int argc;
char *scan, *wasdelim = NULL;
@@ -1199,12 +1202,18 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra
}
} else if (*scan == '"' && delim != '"') {
quote = quote ? 0 : 1;
/* Remove quote character from argument */
memmove(scan, scan + 1, strlen(scan));
scan--;
if (remove_chars) {
/* Remove quote character from argument */
memmove(scan, scan + 1, strlen(scan));
scan--;
}
} else if (*scan == '\\') {
/* Literal character, don't parse */
memmove(scan, scan + 1, strlen(scan));
if (remove_chars) {
/* Literal character, don't parse */
memmove(scan, scan + 1, strlen(scan));
} else {
scan++;
}
} else if ((*scan == delim) && !paren && !quote) {
wasdelim = scan;
*scan++ = '\0';
@@ -1222,6 +1231,12 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra
return argc;
}
/* ABI compatible function */
unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen)
{
return __ast_app_separate_args(buf, delim, 1, array, arraylen);
}
static enum AST_LOCK_RESULT ast_lock_path_lockfile(const char *path)
{
char *s;