Merged revisions 257560 via svnmerge from

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

................
  r257560 | tilghman | 2010-04-15 16:26:19 -0500 (Thu, 15 Apr 2010) | 13 lines

  Merged revisions 257544 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r257544 | tilghman | 2010-04-15 16:23:24 -0500 (Thu, 15 Apr 2010) | 6 lines

    Allow application options with arguments to contain parentheses, through a variety of escaping techniques.

    Fixes SWP-1194 (ABE-2143).

    Review: https://reviewboard.asterisk.org/r/604/
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@257594 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index 497c99ee43f047d4c5e744e5326bc5a5aacb1e47..b311258cd4985402515a4d40c860a59d70b6f748 100644 (file)
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -481,8 +481,7 @@ struct ast_app_option {
 
        ... do any argument parsing here ...
 
-       if (ast_parseoptions(my_app_options, &opts, opt_args, options)) {
-               ast_module_user_remove(u);
+       if (ast_app_parse_options(my_app_options, &opts, opt_args, options)) {
                return -1;
        }
   }

diff --git a/main/app.c b/main/app.c
index 494db102187344fc55e18bf980f64bba1388ecef..188bf10f056f5b440ce5695628b3d5f79e9d4566 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -1691,13 +1691,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;
@@ -1707,8 +1713,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;
@@ -1721,50 +1759,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;
 }
 
-/* the following function will probably only be used in app_dial, until app_dial is reorganized to
-   better handle the large number of options it provides. After it is, you need to get rid of this variant 
-   -- unless, of course, someone else digs up some use for large flag fields. */
+int ast_app_parse_options(const struct ast_app_option *options, struct ast_flags *flags, char **args, char *optstr)
+{
+       return parse_options(options, flags, args, optstr, 32);
+}
 
 int ast_app_parse_options64(const struct ast_app_option *options, struct ast_flags64 *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 res;
+       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)