Merged revisions 233116 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r233116 | dvossel | 2009-12-04 11:21:34 -0600 (Fri, 04 Dec 2009) | 6 lines document and rename strip_control() in app_voicemail (closes issue #16291) Reported by: wdoekes ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@233121 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
64c3f33340
commit
3e936b42a8
|
@ -856,7 +856,13 @@ static int write_password_to_file(const char *secretfn, const char *password);
|
|||
static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit);
|
||||
#endif
|
||||
|
||||
static char *strip_control(const char *input, char *buf, size_t buflen)
|
||||
/*!
|
||||
* \brief Strips control and non 7-bit clean characters from input string.
|
||||
*
|
||||
* \note To map control and none 7-bit characters to a 7-bit clean characters
|
||||
* please use ast_str_encode_mine().
|
||||
*/
|
||||
static char *strip_control_and_high(const char *input, char *buf, size_t buflen)
|
||||
{
|
||||
char *bufptr = buf;
|
||||
for (; *input; input++) {
|
||||
|
@ -4210,10 +4216,10 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
|
|||
#endif
|
||||
|
||||
if (cidnum) {
|
||||
strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum));
|
||||
strip_control_and_high(cidnum, enc_cidnum, sizeof(enc_cidnum));
|
||||
}
|
||||
if (cidname) {
|
||||
strip_control(cidname, enc_cidname, sizeof(enc_cidname));
|
||||
strip_control_and_high(cidname, enc_cidname, sizeof(enc_cidname));
|
||||
}
|
||||
gethostname(host, sizeof(host) - 1);
|
||||
|
||||
|
@ -4544,10 +4550,10 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
|
|||
}
|
||||
|
||||
if (cidnum) {
|
||||
strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum));
|
||||
strip_control_and_high(cidnum, enc_cidnum, sizeof(enc_cidnum));
|
||||
}
|
||||
if (cidname) {
|
||||
strip_control(cidname, enc_cidname, sizeof(enc_cidname));
|
||||
strip_control_and_high(cidname, enc_cidname, sizeof(enc_cidname));
|
||||
}
|
||||
|
||||
if ((p = vm_mkftemp(tmp)) == NULL) {
|
||||
|
|
Reference in New Issue