- move the string join() function to utils.c since it is used in both cli.c and res_agi.c

- reimplement ast_join to be of linear effieciency instead of quadratic
- remove some useless checks for "if (e)"
- reorder checks for strings starting with '_' to avoid a useless call to ast_join()
- check array bounds when parsing arguments to AGI
(issue #5868)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7556 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2005-12-20 20:20:04 +00:00
parent 9398c57e6f
commit 0da13c21b4
4 changed files with 52 additions and 53 deletions

19
utils.c
View File

@@ -903,3 +903,22 @@ char *ast_process_quotes_and_slashes(char *start, char find, char replace_with)
*dataPut = 0;
return dataPut;
}
void ast_join(char *s, size_t len, char * const w[])
{
int x, ofs = 0;
const char *src;
/* Join words into a string */
if (!s)
return;
for (x=0; ofs < len && w[x]; x++) {
if (x > 0)
s[ofs++] = ' ';
for (src = w[x]; *src && ofs < len; src++)
s[ofs++] = *src;
}
if (ofs == len)
ofs--;
s[ofs] = '\0';
}