diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 22:34:00 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 22:34:00 +0000 |
commit | cf7e97a806e73f20fa183221911c0c274adc0bc4 (patch) | |
tree | 434309e455bac4038d37b779218739f2bfdf6162 /apps | |
parent | 9783223be7f899b999dcc606862171405ec41ef7 (diff) |
Merged revisions 47398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r47398 | file | 2006-11-09 17:32:30 -0500 (Thu, 09 Nov 2006) | 2 lines
Do conversion in a more easier to read and working way for \r, \n, and \t. (issue #8324 reported by johnlange)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@47399 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_voicemail.c | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 647170fa2..7ff75bc1d 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -7512,13 +7512,17 @@ static int load_config(void) tmpread = tmpwrite = emailbody; while ((tmpwrite = strchr(tmpread,'\\'))) { switch (tmpwrite[1]) { + case 'r': + memmove(tmpwrite + 1, tmpwrite + 2, strlen(tmpwrite + 2) + 1); + *tmpwrite = '\r'; + break; case 'n': - *tmpwrite++ = '\n'; - memmove(tmpwrite, tmpwrite + 1, strlen(tmpwrite + 1) + 1); + memmove(tmpwrite + 1, tmpwrite + 2, strlen(tmpwrite + 2) + 1); + *tmpwrite = '\n'; break; case 't': - *tmpwrite++ = '\t'; - memmove(tmpwrite, tmpwrite + 1, strlen(tmpwrite + 1) + 1); + memmove(tmpwrite + 1, tmpwrite + 2, strlen(tmpwrite + 2) + 1); + *tmpwrite = '\t'; break; default: ast_log(LOG_NOTICE, "Substitution routine does not support this character: %c\n", tmpwrite[1]); @@ -7536,13 +7540,17 @@ static int load_config(void) tmpread = tmpwrite = pagerbody; while ((tmpwrite = strchr(tmpread, '\\'))) { switch (tmpwrite[1]) { + case 'r': + memmove(tmpwrite + 1, tmpwrite + 2, strlen(tmpwrite + 2) + 1); + *tmpwrite = '\r'; + break; case 'n': - *tmpwrite++ = '\n'; - memmove(tmpwrite, tmpwrite + 1, strlen(tmpwrite + 1) + 1); + memmove(tmpwrite + 1, tmpwrite + 2, strlen(tmpwrite + 2) + 1); + *tmpwrite = '\n'; break; case 't': - *tmpwrite++ = '\t'; - memmove(tmpwrite, tmpwrite + 1, strlen(tmpwrite + 1) + 1); + memmove(tmpwrite + 1, tmpwrite + 2, strlen(tmpwrite + 2) + 1); + *tmpwrite = '\t'; break; default: ast_log(LOG_NOTICE, "Substitution routine does not support this character: %c\n", tmpwrite[1]); |