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

freetdm: change CLI parsing (ftdm_separate_string) to properly ignore white space (fixes Sangoma issue #778) 

minor change into SS7 CLI to use ftdm_array_len() instead of duplicating it
This commit is contained in:
Moises Silva 2011-06-23 14:09:06 -04:00
parent c2a1935850
commit fa2ef5e724
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/freetdm/src/ftdm_io.c
View File

@ -5771,6 +5771,9 @@ FT_DECLARE(uint32_t) ftdm_separate_string(char *buf, char delim, char **array, i
ptr = buf; ptr = buf;
/* we swallow separators that are contiguous */
while (*ptr == delim) ptr++;
for (argc = 0; *ptr && (argc < arraylen - 1); argc++) { for (argc = 0; *ptr && (argc < arraylen - 1); argc++) {
array[argc] = ptr; array[argc] = ptr;
for (; *ptr; ptr++) { for (; *ptr; ptr++) {
@ -5782,6 +5785,8 @@ FT_DECLARE(uint32_t) ftdm_separate_string(char *buf, char delim, char **array, i
} }
} else if ((*ptr == delim) && !quot) { } else if ((*ptr == delim) && !quot) {
*ptr++ = '\0'; *ptr++ = '\0';
/* we swallow separators that are contiguous */
while (*ptr == delim) ptr++;
break; break;
} }
} }
@ -5791,22 +5796,13 @@ FT_DECLARE(uint32_t) ftdm_separate_string(char *buf, char delim, char **array, i
array[argc++] = ptr; array[argc++] = ptr;
} }
/* strip quotes and leading / trailing spaces */ /* strip quotes */
for (x = 0; x < argc; x++) { for (x = 0; x < argc; x++) {
char *p; char *p = array[x];
while(*(array[x]) == ' ') {
(array[x])++;
}
p = array[x];
while((p = strchr(array[x], qc))) { while((p = strchr(array[x], qc))) {
memmove(p, p+1, strlen(p)); memmove(p, p+1, strlen(p));
p++; p++;
} }
p = array[x] + (strlen(array[x]) - 1);
while(*p == ' ') {
*p-- = '\0';
}
} }
return argc; return argc;

2
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_cli.c
View File

@ -106,7 +106,7 @@ ftdm_status_t ftdm_sngss7_handle_cli_cmd(ftdm_stream_handle_t *stream, const cha
if (data) { if (data) {
mycmd = ftdm_strdup(data); mycmd = ftdm_strdup(data);
argc = ftdm_separate_string(mycmd,' ',argv,(sizeof(argv) / sizeof(argv[0]))); argc = ftdm_separate_string(mycmd, ' ', argv, ftdm_array_len(argv));
} }
if (check_arg_count(argc, 1)) goto handle_cli_error_argc; if (check_arg_count(argc, 1)) goto handle_cli_error_argc;