[asterisk-commits] mnick: branch 1.6.0 r233236 - in /branches/1.6.0: ./ pbx/pbx_config.c

[SVN commits to the Asterisk project]

Author: mnick
Date: Fri Dec  4 14:29:30 2009
New Revision: 233236

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=233236
Log:
Merged revisions 233093 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r233093 | mnick | 2009-12-04 11:15:47 -0600 (Fri, 04 Dec 2009) | 8 lines
  
  Parse global variables or expressions in hint extensions
  
  Parse global variables or expressions in hint extensions. Like: exten => 400,hint,DAHDI/i2/${GLOBAL(var)}
  
  (closes issue #16166)
  Reported by: rmudgett
  Tested by: mnick, rmudgett
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/pbx/pbx_config.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-blocked' - no diff available.

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/pbx/pbx_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/pbx/pbx_config.c?view=diff&rev=233236&r1=233235&r2=233236
==============================================================================
--- branches/1.6.0/pbx/pbx_config.c (original)
+++ branches/1.6.0/pbx/pbx_config.c Fri Dec  4 14:29:30 2009
@@ -1426,21 +1426,36 @@
 						ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno);
 						ipri = 0;
 					}
+
 					appl = S_OR(stringp, "");
 					/* Find the first occurrence of '(' */
-					firstp = strchr(appl, '(');
-					if (!firstp) {
+					if (!(firstp = strchr(appl, '('))) {
 						/* No arguments */
 						data = "";
 					} else {
+						char *orig_appl = ast_strdup(appl);
+
+						if (!orig_appl)
+							return -1;
+
 						appl = strsep(&stringp, "(");
-						data = stringp;
-						end = strrchr(data, ')');
-						if ((end = strrchr(data, ')'))) {
-							*end = '\0';
+
+						/* check if there are variables or expressions without an application, like: exten => 100,hint,DAHDI/g0/${GLOBAL(var)}  */
+						if (strstr(appl, "${") || strstr(appl, "$[")){
+							/* set appl to original one */
+							strcpy(appl, orig_appl);
+							/* set no data */
+							data = "";
+						/* no variable before application found -> go ahead */
 						} else {
-							ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data);
+							data = S_OR(stringp, "");
+							if ((end = strrchr(data, ')'))) {
+								*end = '\0';
+							} else {
+								ast_log(LOG_WARNING, "No closing parenthesis found? '%s(%s'\n", appl, data);
+							}
 						}
+						ast_free(orig_appl);
 					}
 
 					if (!data)