mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-08 19:08:14 +00:00
Merged revisions 233121 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r233121 | dvossel | 2009-12-04 11:22:31 -0600 (Fri, 04 Dec 2009) | 12 lines 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@233166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -721,7 +721,13 @@ static int is_valid_dtmf(const char *key);
|
|||||||
static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit);
|
static int __has_voicemail(const char *context, const char *mailbox, const char *folder, int shortcircuit);
|
||||||
#endif
|
#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;
|
char *bufptr = buf;
|
||||||
for (; *input; input++) {
|
for (; *input; input++) {
|
||||||
@@ -4001,10 +4007,10 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
|
|||||||
passdata2 = alloca(len_passdata2);
|
passdata2 = alloca(len_passdata2);
|
||||||
|
|
||||||
if (cidnum) {
|
if (cidnum) {
|
||||||
strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum));
|
strip_control_and_high(cidnum, enc_cidnum, sizeof(enc_cidnum));
|
||||||
}
|
}
|
||||||
if (cidname) {
|
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);
|
gethostname(host, sizeof(host) - 1);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user