From 721b3c8a0eae7bd327ea6aa0e2de14ac1a13cbda Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Mon, 26 Nov 2007 17:21:37 +0000
Subject: [PATCH] Merged revisions 89586 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r89586 | kpfleming | 2007-11-26 11:20:36 -0600 (Mon, 26 Nov 2007) | 2 lines
when parsing application options that take arguments, don't indicate that the option was supplied unless a non-zero-length argument was found for it
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89588 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_controlplayback.c | 2 +-
main/app.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/app_controlplayback.c b/apps/app_controlplayback.c
index 80df5926de..edf10a1820 100644
--- a/apps/app_controlplayback.c
+++ b/apps/app_controlplayback.c
@@ -124,7 +124,7 @@ static int controlplayback_exec(struct ast_channel *chan, void *data)
if (args.options) {
ast_app_parse_options(cpb_opts, &opts, opt_args, args.options);
- if (ast_test_flag(&opts, OPT_OFFSET) && !ast_strlen_zero(opt_args[OPT_ARG_OFFSET]))
+ if (ast_test_flag(&opts, OPT_OFFSET))
offsetms = atol(opt_args[OPT_ARG_OFFSET]);
}
diff --git a/main/app.c b/main/app.c
index fd286fa172..4fda65ce0d 100644
--- a/main/app.c
+++ b/main/app.c
@@ -1608,7 +1608,6 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
s = optstr;
while (*s) {
curarg = *s++ & 0x7f; /* the array (in app.h) has 128 entries */
- ast_set_flag(flags, options[curarg].flag);
argloc = options[curarg].arg_index;
if (*s == '(') {
/* Has argument */
@@ -1625,6 +1624,8 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags
} else if (argloc) {
args[argloc - 1] = NULL;
}
+ if (!argloc || !ast_strlen_zero(args[argloc - 1]))
+ ast_set_flag(flags, options[curarg].flag);
}
return res;
--
GitLab