kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-24 02:18:57 +00:00
Code Issues Projects Releases Wiki Activity

FS-5945 - cond api improved

Browse Source
This commit is contained in:
Aron Podrigal 2014-12-24 21:22:23 -05:00
parent ca2d2c9b66
commit 625c95a5b1
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/mod/applications/mod_commands/mod_commands.c
View File

@ -1893,13 +1893,13 @@ typedef enum {
SWITCH_STANDARD_API(cond_function) SWITCH_STANDARD_API(cond_function)
{ {
int argc; int argc;
char *mydata = NULL, *argv[2]; char *mydata = NULL, *argv[3];
char *expr; char *expr;
char *a, *b; char *a, *b;
double a_f = 0.0, b_f = 0.0; double a_f = 0.0, b_f = 0.0;
int a_is_quoted = 0, b_is_quoted = 0;
o_t o = O_NONE; o_t o = O_NONE;
int is_true = 0; int is_true = 0;
char *p = NULL;
if (!cmd) { if (!cmd) {
goto error; goto error;
@ -1911,37 +1911,38 @@ SWITCH_STANDARD_API(cond_function)
a = mydata; a = mydata;
if (*a == '\'') { if (*a == '\'') {
for (expr = ++a; expr && *expr; expr++) { a_is_quoted = 1;
for (expr = ++a; *expr; expr++) {
if (*expr == '\\') { if (*expr == '\\') {
if (expr + 1 && (*(expr + 1) == '\\' || *(expr + 1) == '\'')) { if (*(expr + 1) == '\\' || *(expr + 1) == '\'') {
expr++; expr++;
} }
} else if (*expr == '\'') { } else if (*expr == '\'') {
break; break;
} }
} }
if (!expr) { if (!*expr) {
stream->write_function(stream, "-ERR while looking for closing quote near %s \n", a); stream->write_function(stream, "-ERR while looking for closing quote near < %s > \n", a);
goto end; goto end;
} }
*expr++ = '\0'; *expr++ = '\0';
if (expr && *expr != ' ' && *expr != '\t') { if (!switch_isspace(*expr)) {
stream->write_function(stream, "-ERR, Syntax error near %s \n", expr); stream->write_function(stream, "-ERR, Syntax error near < %s > \n", expr);
goto end; goto end;
} }
} else { } else {
if ((expr = strchr(a, ' '))) { if ((expr = strchr(a, ' '))) {
*expr++ = '\0'; *expr++ = '\0';
} else { } else {
stream->write_function(stream, "-ERR, Syntax error near %s \n", a); stream->write_function(stream, "-ERR, Syntax error near < %s > \n", a);
goto end; goto end;
} }
} }
while (expr && (*expr == ' ' || *expr == '\t')) expr++; while (switch_isspace(*expr)) expr++;
while (expr && *expr) { while (*expr) {
switch (*expr) { switch (*expr) {
case '!': case '!':
case '<': case '<':
@ -2003,57 +2004,58 @@ operator:
int a_is_num, b_is_num; int a_is_num, b_is_num;
expr++; expr++;
while (expr && (*expr == ' ' || *expr == '\t')) expr++; while (switch_isspace(*expr)) expr++;
b = expr; b = expr;
if (b && *b == '\'') { if (*b == '\'') {
for (expr = ++b; expr && *expr; expr++) { b_is_quoted = 1;
if (*expr == '\\') { for (expr = ++b; *expr; expr++) {
if (expr + 1 && (*(expr + 1) == '\\' || *(expr + 1) == '\'')) { if (*expr == '\\') {
expr++; if (*(expr + 1) == '\\' || *(expr + 1) == '\'') {
expr++;
}
} else if (*expr == '\'') {
break;
} }
} else if (*expr == '\'') {
break;
} }
} if (!*expr) {
if (!expr) {
stream->write_function(stream, "-ERR while looking for closing quote near < %s >!\n", b); stream->write_function(stream, "-ERR while looking for closing quote near < %s >!\n", b);
goto end; goto end;
} }
*expr++ = '\0'; *expr++ = '\0';
if (expr && *expr != ' ' && *expr != '\t') { if (!switch_isspace(*expr)) {
stream->write_function(stream, "-ERR, Syntax error near %s \n", expr); stream->write_function(stream, "-ERR, Syntax error near < %s > \n", expr);
goto end; goto end;
} }
} else { } else {
if ((expr = strchr(b, ' '))) { if ((expr = strchr(b, ' '))) {
*expr++ = '\0'; *expr++ = '\0';
} else { } else {
stream->write_function(stream, "-ERR, Syntax error near %s \n", b); stream->write_function(stream, "-ERR, Syntax error near < %s > \n", b);
goto end; goto end;
} }
} }
if ((p = strchr(expr, '?'))) { while (switch_isspace(*expr)) expr++;
expr = ++p;
while (expr && (*expr == ' ' || *expr == '\t')) expr++; if (*expr != '?') {
} else { stream->write_function(stream, "-ERR, Syntax error near < %s > no expression found.\n", expr);
stream->write_function(stream, "-ERR, Syntax error near %s , no expression found.\n", expr);
goto end; goto end;
} }
argc = switch_separate_string(expr, ':', argv, (sizeof (argv) / sizeof (argv[0]))); *expr = ':';
argc = switch_separate_string(expr, ':', argv, (sizeof(argv) / sizeof(argv[0])));
if (!(argc >= 2 && argc <= 3)) { if (!(argc >= 2 && argc <= 3)) {
stream->write_function(stream, "-ERR, Syntax error near %s , Invalid expression.\n", expr); stream->write_function(stream, "-ERR, Syntax error near < %s > , Invalid expression.\n", ++expr);
goto end; goto end;
} }
s_a = a; s_a = a;
s_b = b; s_b = b;
a_is_num = switch_is_number(s_a); a_is_num = (switch_is_number(s_a) && !a_is_quoted);
b_is_num = switch_is_number(s_b); b_is_num = (switch_is_number(s_b) && !b_is_quoted);
a_f = a_is_num ? atof(s_a) : (float) strlen(s_a); a_f = a_is_num ? atof(s_a) : (float) strlen(s_a);
b_f = b_is_num ? atof(s_b) : (float) strlen(s_b); b_f = b_is_num ? atof(s_b) : (float) strlen(s_b);
@ -2089,10 +2091,10 @@ operator:
break; break;
} }
if ((argc == 1 && !is_true)) { if ((argc == 2 && !is_true)) {
stream->write_function(stream, ""); stream->write_function(stream, "");
} else { } else {
stream->write_function(stream, "%s", is_true ? argv[0] : argv[1]); stream->write_function(stream, "%s", is_true ? argv[1] : argv[2]);
} }
goto end; goto end;
} }