comparison src/readpst.c @ 110:7133b39975f7 stable-0-6-22

patch from David Cuadrado to process emails with type PST_TYPE_OTHER base64_encode_multiple() may insert newline, needs larger malloc subject lines shorter than 2 bytes could segfault
author Carl Byington <carl@five-ten-sg.com>
date Fri, 28 Nov 2008 11:36:53 -0800
parents 39ba19372732
children ed2a260bbb98
comparison
equal deleted inserted replaced
109:7947334d53ad 110:7133b39975f7
156 if (contact_mode == CMODE_VCARD) 156 if (contact_mode == CMODE_VCARD)
157 write_vcard(ff.output, item->contact, item->comment); 157 write_vcard(ff.output, item->contact, item->comment);
158 else 158 else
159 fprintf(ff.output, "%s <%s>\n", item->contact->fullname, item->contact->address1); 159 fprintf(ff.output, "%s <%s>\n", item->contact->fullname, item->contact->address1);
160 160
161 } else if (item->email && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) { 161 } else if (item->email && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT || item->type == PST_TYPE_OTHER)) {
162 if (mode == MODE_SEPARATE) mk_separate_file(&ff); 162 if (mode == MODE_SEPARATE) mk_separate_file(&ff);
163 ff.email_count++; 163 ff.email_count++;
164 DEBUG_MAIN(("main: Processing Email\n")); 164 DEBUG_MAIN(("main: Processing Email\n"));
165 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_REPORT)) { 165 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_REPORT) && (ff.type != PST_TYPE_OTHER)) {
166 DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n")); 166 DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n"));
167 } 167 }
168 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body); 168 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body);
169 169
170 } else if (item->journal && (item->type == PST_TYPE_JOURNAL)) { 170 } else if (item->journal && (item->type == PST_TYPE_JOURNAL)) {