[Asterisk-cvs] asterisk pbx.c,1.212,1.213

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv497

Modified Files:
	pbx.c 
Log Message:
Merge builtin If function (bug #3779)


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- pbx.c	14 Mar 2005 05:51:20 -0000	1.212
+++ pbx.c	17 Mar 2005 20:20:37 -0000	1.213
@@ -1183,6 +1183,41 @@
 	return cmd ? ret_true : ret_false;
 }
 
+static char *builtin_function_if(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) 
+{
+	char *ret = NULL;
+	char *mydata = NULL;
+	char *expr = NULL;
+	char *iftrue = NULL;
+	char *iffalse = NULL;
+
+	if((mydata = ast_strdupa(data))) {
+		expr = mydata;
+		if ((iftrue = strchr(mydata, '?'))) {
+			*iftrue = '\0';
+			iftrue++;
+			if ((iffalse = strchr(iftrue, ':'))) {
+				*iffalse = '\0';
+				iffalse++;
+			}
+		} else 
+			iffalse = "";
+		if (expr && iftrue) {
+			ret = ast_true(expr) ? iftrue : iffalse;
+			strncpy(buf, ret, len);
+			ret = buf;
+		} else {
+			ast_log(LOG_WARNING, "Syntax $(if <expr>?[<truecond>][:<falsecond>])\n");
+			ret = NULL;
+		}
+	} else {
+		ast_log(LOG_WARNING, "Memory Error!\n");
+		ret = NULL;
+	}
+
+	return ret;
+}
+
 static char *builtin_function_regex(struct ast_channel *chan, char *cmd, char *data, char *buf, size_t len) 
 {
 	char *ret_true = "1", *ret_false = "0", *ret;
@@ -3392,6 +3427,14 @@
     .function = builtin_function_exists,
 };
 
+static struct ast_custom_function_obj if_function = {
+    .name = "if",
+    .desc = "Conditional: Returns the data following '?' if true else the data following ':'",
+    .syntax = "$(if <expr>?<true>:<false>)",
+    .function = builtin_function_if,
+};
+
+
 /*
  * CLI entries for upper commands ...
  */
@@ -5766,6 +5809,7 @@
 	ast_custom_function_register(&regex_function);
 	ast_custom_function_register(&isnull_function);
 	ast_custom_function_register(&exists_function);
+	ast_custom_function_register(&if_function);
 
 	/* Register builtin applications */
 	for (x=0; x<sizeof(builtins) / sizeof(struct pbx_builtin); x++) {