mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-01 11:02:53 +00:00
merge in sep str changes from big brother
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@332 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
parent
6b88eec7bf
commit
60191d9c84
@ -2034,8 +2034,7 @@ uint32_t zap_separate_string(char *buf, char delim, char **array, int arraylen)
|
||||
int argc;
|
||||
char *ptr;
|
||||
int quot = 0;
|
||||
char qc = '"';
|
||||
char *e;
|
||||
char qc = '\'';
|
||||
int x;
|
||||
|
||||
if (!buf || !array || !arraylen) {
|
||||
@ -2066,13 +2065,21 @@ uint32_t zap_separate_string(char *buf, char delim, char **array, int arraylen)
|
||||
array[argc++] = ptr;
|
||||
}
|
||||
|
||||
/* strip quotes */
|
||||
/* strip quotes and leading / trailing spaces */
|
||||
for (x = 0; x < argc; x++) {
|
||||
if (*(array[x]) == qc) {
|
||||
char *p;
|
||||
|
||||
while(*(array[x]) == ' ') {
|
||||
(array[x])++;
|
||||
if ((e = strchr(array[x], qc))) {
|
||||
*e = '\0';
|
||||
}
|
||||
}
|
||||
p = array[x];
|
||||
while((p = strchr(array[x], qc))) {
|
||||
memmove(p, p+1, strlen(p));
|
||||
p++;
|
||||
}
|
||||
p = array[x] + (strlen(array[x]) - 1);
|
||||
while(*p == ' ') {
|
||||
*p-- = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user