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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@210910 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_stack.c b/apps/app_stack.c
index 994ddbc34060ea57633467864b845f2c8e8c2e81..08a6c38c31437e53684a396e12d581883a69412a 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -264,7 +264,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;
 
@@ -326,13 +326,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))

diff --git a/include/asterisk/app.h b/include/asterisk/app.h
index a34a8eec5488b6a6570a2463c6875122e07a7676..f73010ef980d1bd36a01130f184bc8ca4bc84e49 100644 (file)
--- a/include/asterisk/app.h
+++ b/include/asterisk/app.h
@@ -355,7 +355,9 @@ int ast_app_group_list_unlock(void);
   the argc argument counter field.
  */
 #define AST_STANDARD_APP_ARGS(args, parse) \
-       args.argc = ast_app_separate_args(parse, ',', args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
+       args.argc = __ast_app_separate_args(parse, ',', 1, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
+#define AST_STANDARD_RAW_ARGS(args, parse) \
+       args.argc = __ast_app_separate_args(parse, ',', 0, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
 
 /*!
   \brief Performs the 'nonstandard' argument separation process for an application.
@@ -368,12 +370,15 @@ int ast_app_group_list_unlock(void);
   the argc argument counter field.
  */
 #define AST_NONSTANDARD_APP_ARGS(args, parse, sep) \
-       args.argc = ast_app_separate_args(parse, sep, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
+       args.argc = __ast_app_separate_args(parse, sep, 1, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
+#define AST_NONSTANDARD_RAW_ARGS(args, parse, sep) \
+       args.argc = __ast_app_separate_args(parse, sep, 0, args.argv, ((sizeof(args) - offsetof(typeof(args), argv)) / sizeof(args.argv[0])))
 
 /*!
   \brief Separate a string into arguments in an array
   \param buf The string to be parsed (this must be a writable copy, as it will be modified)
   \param delim The character to be used to delimit arguments
+  \param remove_chars Remove backslashes and quote characters, while parsing
   \param array An array of 'char *' to be filled in with pointers to the found arguments
   \param arraylen The number of elements in the array (i.e. the number of arguments you will accept)
 
@@ -384,7 +389,8 @@ int ast_app_group_list_unlock(void);
 
   \return The number of arguments found, or zero if the function arguments are not valid.
 */
-unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen);
+unsigned int __ast_app_separate_args(char *buf, char delim, int remove_chars, char **array, int arraylen);
+#define ast_app_separate_args(a,b,c,d) __ast_app_separate_args(a,b,1,c,d)
 
 /*!
   \brief A structure to hold the description of an application 'option'.

diff --git a/main/app.c b/main/app.c
index 5c0449a3d380ff5dd84e33dff4294b050b57b935..80bdd4a03338c9edc8bf5f364ebb6b527c75241e 100644 (file)
--- a/main/app.c
+++ b/main/app.c
@@ -1076,7 +1076,10 @@ int ast_app_group_list_unlock(void)
        return AST_RWLIST_UNLOCK(&groups);
 }
 
-unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen)
+#undef ast_app_separate_args
+unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen);
+
+unsigned int __ast_app_separate_args(char *buf, char delim, int remove_chars, char **array, int arraylen)
 {
        int argc;
        char *scan, *wasdelim = NULL;
@@ -1099,12 +1102,18 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra
                                        paren--;
                        } else if (*scan == '"' && delim != '"') {
                                quote = quote ? 0 : 1;
-                               /* Remove quote character from argument */
-                               memmove(scan, scan + 1, strlen(scan));
-                               scan--;
+                               if (remove_chars) {
+                                       /* Remove quote character from argument */
+                                       memmove(scan, scan + 1, strlen(scan));
+                                       scan--;
+                               }
                        } else if (*scan == '\\') {
-                               /* Literal character, don't parse */
-                               memmove(scan, scan + 1, strlen(scan));
+                               if (remove_chars) {
+                                       /* Literal character, don't parse */
+                                       memmove(scan, scan + 1, strlen(scan));
+                               } else {
+                                       scan++;
+                               }
                        } else if ((*scan == delim) && !paren && !quote) {
                                wasdelim = scan;
                                *scan++ = '\0';
@@ -1122,6 +1131,12 @@ unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arra
        return argc;
 }
 
+/* ABI compatible function */
+unsigned int ast_app_separate_args(char *buf, char delim, char **array, int arraylen)
+{
+       return __ast_app_separate_args(buf, delim, 1, array, arraylen);
+}
+
 static enum AST_LOCK_RESULT ast_lock_path_lockfile(const char *path)
 {
        char *s;