diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-31 19:34:30 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-03-31 19:34:30 +0000 |
commit | 97ff6bcda5976e05cbbca0df6c0d2cf789638b8f (patch) | |
tree | e4237775805e77ed72235fe24dd215a4698305bf | |
parent | aa7b9d2412a215fab4b9f216a28504a4283c704c (diff) |
Recorded merge of revisions 255592 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r255592 | tilghman | 2010-03-31 14:13:02 -0500 (Wed, 31 Mar 2010) | 22 lines
Recorded merge of revisions 255591 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r255591 | tilghman | 2010-03-31 14:09:46 -0500 (Wed, 31 Mar 2010) | 15 lines
Ensure line terminators in email are consistent.
Fixes an issue with certain Mail Transport Agents, where attachments are not
interpreted correctly.
(closes issue #16557)
Reported by: jcovert
Patches:
20100308__issue16557__1.4.diff.txt uploaded by tilghman (license 14)
20100308__issue16557__1.6.0.diff.txt uploaded by tilghman (license 14)
20100308__issue16557__trunk.diff.txt uploaded by tilghman (license 14)
Tested by: ebroad, zktech
Reviewboard: https://reviewboard.asterisk.org/r/544/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@255674 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_voicemail.c | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 6b6bfd75f..2633516a3 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -210,7 +210,11 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate); #define BASELINELEN 72 #define BASEMAXINLINE 256 -#define eol "\r\n" +#ifdef IMAP_STORAGE +#define ENDL "\r\n" +#else +#define ENDL "\n" +#endif #define MAX_DATETIME_FORMAT 512 #define MAX_NUM_CID_CONTEXTS 10 @@ -3315,14 +3319,16 @@ static int inchar(struct baseio *bio, FILE *fi) static int ochar(struct baseio *bio, int c, FILE *so) { if (bio->linelength >= BASELINELEN) { - if (fputs(eol, so) == EOF) + if (fputs(ENDL, so) == EOF) { return -1; + } - bio->linelength= 0; + bio->linelength = 0; } - if (putc(((unsigned char)c), so) == EOF) + if (putc(((unsigned char)c), so) == EOF) { return -1; + } bio->linelength++; @@ -3382,8 +3388,9 @@ static int base_encode(char *filename, FILE *so) fclose(fi); - if (fputs(eol, so) == EOF) + if (fputs(ENDL, so) == EOF) { return 0; + } return 1; } @@ -3581,12 +3588,6 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in size_t len_passdata = 0, len_passdata2, tmplen; char *greeting_attachment; -#ifdef IMAP_STORAGE -#define ENDL "\r\n" -#else -#define ENDL "\n" -#endif - /* One alloca for multiple fields */ len_passdata2 = strlen(vmu->fullname); if (emailsubject && (tmplen = strlen(emailsubject)) > len_passdata2) { @@ -3754,7 +3755,22 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in memset(passdata, 0, vmlen); prep_email_sub_vars(ast, vmu, msgnum + 1, context, mailbox, fromfolder, cidnum, cidname, dur, date, passdata, vmlen, category); pbx_substitute_variables_helper(ast, emailbody, passdata, vmlen); +#ifdef IMAP_STORAGE + { + /* Convert body to native line terminators for IMAP backend */ + char *line = passdata, *next; + do { + /* Terminate line before outputting it to the file */ + if ((next = strchr(line, '\n'))) { + *next++ = '\0'; + } + fprintf(p, "%s" ENDL, line); + line = next; + } while (!ast_strlen_zero(line)); + } +#else fprintf(p, "%s" ENDL, passdata); +#endif ast_channel_free(ast); } else ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n"); @@ -3852,7 +3868,6 @@ plain_message: unlink(newtmp); } } -#undef ENDL } static int sendmail(char *srcemail, struct ast_vm_user *vmu, int msgnum, char *context, char *mailbox, const char *fromfolder, char *cidnum, char *cidname, char *attach, char *format, int duration, int attach_user_voicemail, struct ast_channel *chan, const char *category) |