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

Merged revisions 210908 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r210908 | tilghman | 2009-08-06 16:29:26 -0500 (Thu, 06 Aug 2009) | 9 lines
  
  Allow Gosub to recognize quote delimiters without consuming them.
  (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/branches/1.6.2@210911 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-08-06 21:34:48 +00:00
parent 65793b16c4
commit fe6107aba0
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/app_stack.c
View File

@@ -365,7 +365,7 @@ static int gosub_exec(struct ast_channel *chan, void *data)
*endparen = '\0';
else
ast_log(LOG_WARNING, "Ouch. No closing paren: '%s'?\n", (char *)data);
AST_STANDARD_APP_ARGS(args2, tmp);
AST_STANDARD_RAW_ARGS(args2, tmp);
} else
args2.argc = 0;
@@ -429,13 +429,13 @@ static int gosubif_exec(struct ast_channel *chan, void *data)
}
args = ast_strdupa(data);
AST_NONSTANDARD_APP_ARGS(cond, args, '?');
AST_NONSTANDARD_RAW_ARGS(cond, args, '?');
if (cond.argc != 2) {
ast_log(LOG_WARNING, "GosubIf requires an argument: GosubIf(cond?label1(args):label2(args)\n");
return 0;
}
AST_NONSTANDARD_APP_ARGS(label, cond.labels, ':');
AST_NONSTANDARD_RAW_ARGS(label, cond.labels, ':');
if (pbx_checkcondition(cond.ition)) {
if (!ast_strlen_zero(label.iftrue))
@@ -517,7 +517,7 @@ static int peek_read(struct ast_channel *chan, const char *cmd, char *data, char
return -1;
}
AST_STANDARD_APP_ARGS(args, data);
AST_STANDARD_RAW_ARGS(args, data);
n = atoi(args.n);
*buf = '\0';