diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-06 21:34:48 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-06 21:34:48 +0000 |
commit | aa996bacc92553728eae808f1b832b907401490b (patch) | |
tree | acc08ae9e6e3174c1235ca972dc0033463faac1c /apps | |
parent | 13faecdf6362026ba18214548b24caee316831f7 (diff) |
Merged revisions 210908 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@210911 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_stack.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index e3f09ea1e..c9cf41de4 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -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'; |