kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1843 from greenbea/patch-17 

[mod_commands] Fix and improve coalesce function
This commit is contained in:
Andrey Volk 2023-03-27 20:03:40 +03:00 committed by GitHub
parent 49eb8a77ee 8cf90dae41
commit 2c36dcdd50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5653,22 +5653,26 @@ SWITCH_STANDARD_API(alias_function)
#define COALESCE_SYNTAX "[^^<delim>]<value1>,<value2>,..." #define COALESCE_SYNTAX "[^^<delim>]<value1>,<value2>,..."
SWITCH_STANDARD_API(coalesce_function) SWITCH_STANDARD_API(coalesce_function)
{ {
switch_status_t status = SWITCH_STATUS_FALSE;
char *data = (char *) cmd;
char *mydata = NULL, *argv[256] = { 0 }; char *mydata = NULL, *argv[256] = { 0 };
char *arg = (char *) cmd;
int argc = -1; int argc = -1;
char delim = ',';
if (data && *data && (mydata = strdup(data))) { if (!zstr(arg) && *arg == '^' && *(arg+1) == '^') {
argc = switch_separate_string(mydata, ',', argv, arg += 2;
delim = *arg++;
}
if (!zstr(arg) && (mydata = strdup(arg))) {
argc = switch_separate_string(mydata, delim, argv,
(sizeof(argv) / sizeof(argv[0]))); (sizeof(argv) / sizeof(argv[0])));
} }
if (argc > 0) { if (argc > 0) {
int i; int i;
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (argv[i] && *argv[i]) { if (!zstr(argv[i])) {
stream->write_function(stream, argv[i]); stream->write_function(stream, argv[i]);
status = SWITCH_STATUS_SUCCESS;
break; break;
} }
} }
@ -5676,7 +5680,9 @@ SWITCH_STANDARD_API(coalesce_function)
stream->write_function(stream, "-USAGE: %s\n", COALESCE_SYNTAX); stream->write_function(stream, "-USAGE: %s\n", COALESCE_SYNTAX);
} }
return status; switch_safe_free(mydata);
return SWITCH_STATUS_SUCCESS;
} }
#define SHOW_SYNTAX "codec|endpoint|application|api|dialplan|file|timer|calls [count]|channels [count|like <match string>]|calls|detailed_calls|bridged_calls|detailed_bridged_calls|aliases|complete|chat|management|modules|nat_map|say|interfaces|interface_types|tasks|limits|status" #define SHOW_SYNTAX "codec|endpoint|application|api|dialplan|file|timer|calls [count]|channels [count|like <match string>]|calls|detailed_calls|bridged_calls|detailed_bridged_calls|aliases|complete|chat|management|modules|nat_map|say|interfaces|interface_types|tasks|limits|status"