kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-08-14 09:58:17 +00:00
Code Issues Projects Releases Wiki Activity

try this Vagabond

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16517 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2010-01-26 18:20:09 +00:00
parent 77ac925dc5
commit 3049cd5c8d
4 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/switch_utils.c
View File

@@ -1571,9 +1571,6 @@ static char unescape_char(char escaped)
case 's':
unescaped = ' ';
break;
case '\\':
unescaped = 1; /* 1 means double esc */
break;
default:
unescaped = escaped;
}
@@ -1642,16 +1639,12 @@ static char *cleanup_separated_string(char *str, char delim)
for (start = dest = ptr; *ptr; ++ptr) {
char e;
int esc = 0;
if (*ptr == ESCAPE_META) {
e = *(ptr + 1);
if (e == '\'' || e == '"' || (delim && e == delim) || (e = unescape_char(*(ptr + 1))) != *(ptr + 1)) {
if (e == '\'' || e == '"' || (delim && e == delim) || e == ESCAPE_META || (e = unescape_char(*(ptr + 1))) != *(ptr + 1)) {
++ptr;
if (e == 1) {
*dest++ = '\\';
} else {
*dest++ = e;
}
*dest++ = e;
end = dest;
esc++;
}
@@ -1670,6 +1663,7 @@ static char *cleanup_separated_string(char *str, char delim)
if (end) {
*end = '\0';
}
return start;
}
@@ -1727,8 +1721,10 @@ static unsigned int separate_string_char_delim(char *buf, char delim, char **arr
}
}
/* strip quotes, escaped chars and leading / trailing spaces */
for (i = 0; i < count; ++i) {
array[i] = cleanup_separated_string(array[i], delim);
if (count > 1) {
for (i = 0; i < count; ++i) {
array[i] = cleanup_separated_string(array[i], delim);
}
}
return count;
}
@@ -1785,8 +1781,10 @@ static unsigned int separate_string_blank_delim(char *buf, char **array, unsigne
}
}
/* strip quotes, escaped chars and leading / trailing spaces */
for (i = 0; i < count; ++i) {
array[i] = cleanup_separated_string(array[i], 0);
if (count > 1) {
for (i = 0; i < count; ++i) {
array[i] = cleanup_separated_string(array[i], 0);
}
}
return count;
}