diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 22:32:30 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-11-09 22:32:30 +0000 |
| commit | f98007683f0ffd84a12a6f6cbcdd717f6eee8832 (patch) | |
| tree | feb0904f9456a059babb8a7f17e5e98c1c864cdd /apps/app_voicemail.c | |
| parent | e34ce54a05609fd159b06dbfc7c8fbcfb46ca1ff (diff) | |
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/branches/1.4@47398 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -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 150319983..b7cda7e1f 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -7398,13 +7398,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]); @@ -7422,13 +7426,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]); |