diff options
Diffstat (limited to 'main')
-rw-r--r-- | main/app.c | 88 |
1 files changed, 51 insertions, 37 deletions
diff --git a/main/app.c b/main/app.c index 0619151d8..bfdec4fdd 100644 --- a/main/app.c +++ b/main/app.c @@ -1809,13 +1809,19 @@ char *ast_read_textfile(const char *filename) return output; } -int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags *flags, char **args, char *optstr) +static int parse_options(const struct ast_app_option *options, void *_flags, char **args, char *optstr, int flaglen) { char *s, *arg; int curarg, res = 0; unsigned int argloc; + struct ast_flags *flags = _flags; + struct ast_flags64 *flags64 = _flags; - ast_clear_flag(flags, AST_FLAGS_ALL); + if (flaglen == 32) { + ast_clear_flag(flags, AST_FLAGS_ALL); + } else { + flags64->flags = 0; + } if (!optstr) { return 0; @@ -1826,8 +1832,40 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags curarg = *s++ & 0x7f; /* the array (in app.h) has 128 entries */ argloc = options[curarg].arg_index; if (*s == '(') { + int paren = 1, quote = 0; + int parsequotes = (s[1] == '"') ? 1 : 0; + /* Has argument */ arg = ++s; + for (; *s; s++) { + if (*s == '(' && !quote) { + paren++; + } else if (*s == ')' && !quote) { + /* Count parentheses, unless they're within quotes (or backslashed, below) */ + paren--; + } else if (*s == '"' && parsequotes) { + /* Leave embedded quotes alone, unless they are the first character */ + quote = quote ? 0 : 1; + ast_copy_string(s, s + 1, INT_MAX); + s--; + } else if (*s == '\\') { + if (!quote) { + /* If a backslash is found outside of quotes, remove it */ + ast_copy_string(s, s + 1, INT_MAX); + } else if (quote && s[1] == '"') { + /* Backslash for a quote character within quotes, remove the backslash */ + ast_copy_string(s, s + 1, INT_MAX); + } else { + /* Backslash within quotes, keep both characters */ + s++; + } + } + + if (paren == 0) { + break; + } + } + /* This will find the closing paren we found above, or none, if the string ended before we found one. */ if ((s = strchr(s, ')'))) { if (argloc) { args[argloc - 1] = arg; @@ -1841,48 +1879,24 @@ int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags } else if (argloc) { args[argloc - 1] = ""; } - ast_set_flag(flags, options[curarg].flag); + if (flaglen == 32) { + ast_set_flag(flags, options[curarg].flag); + } else { + ast_set_flag64(flags64, options[curarg].flag); + } } return res; } -int ast_app_parse_options64(const struct ast_app_option *options, struct ast_flags64 *flags, char **args, char *optstr) +int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags *flags, char **args, char *optstr) { - char *s, *arg; - int curarg, res = 0; - unsigned int argloc; - - flags->flags = 0; - - if (!optstr) { - return 0; - } - - s = optstr; - while (*s) { - curarg = *s++ & 0x7f; /* the array (in app.h) has 128 entries */ - ast_set_flag64(flags, options[curarg].flag); - argloc = options[curarg].arg_index; - if (*s == '(') { - /* Has argument */ - arg = ++s; - if ((s = strchr(s, ')'))) { - if (argloc) { - args[argloc - 1] = arg; - } - *s++ = '\0'; - } else { - ast_log(LOG_WARNING, "Missing closing parenthesis for argument '%c' in string '%s'\n", curarg, arg); - res = -1; - break; - } - } else if (argloc) { - args[argloc - 1] = NULL; - } - } + return parse_options(options, flags, args, optstr, 32); +} - return res; +int ast_app_parse_options64(const struct ast_app_option *options, struct ast_flags64 *flags, char **args, char *optstr) +{ + return parse_options(options, flags, args, optstr, 64); } void ast_app_options2str64(const struct ast_app_option *options, struct ast_flags64 *flags, char *buf, size_t len) |