comparison src/pst2dii.cpp.in @ 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 56fa05fd5271
children 0f1492b7fe8b
comparison
equal deleted inserted replaced
109:7947334d53ad 110:7133b39975f7
622 if (item) { 622 if (item) {
623 if (item->folder && d_ptr->child ) { 623 if (item->folder && d_ptr->child ) {
624 //if this is a non-empty folder, we want to recurse into it 624 //if this is a non-empty folder, we want to recurse into it
625 fprintf(stderr, "entering folder %s\n", item->file_as); 625 fprintf(stderr, "entering folder %s\n", item->file_as);
626 process(item, &ff, d_ptr->child); 626 process(item, &ff, d_ptr->child);
627 } else if (item->email && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) { 627 } else if (item->email && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT || item->type == PST_TYPE_OTHER)) {
628 ff.email_count++; 628 ff.email_count++;
629 DEBUG_MAIN(("main: Processing Email\n")); 629 DEBUG_MAIN(("main: Processing Email\n"));
630 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_REPORT)) { 630 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_REPORT) && (ff.type != PST_TYPE_OTHER)) {
631 DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n")); 631 DEBUG_MAIN(("main: I have an email, but the folder isn't an email folder. Processing anyway\n"));
632 } 632 }
633 write_normal_email(ff, item, &pstfile); 633 write_normal_email(ff, item, &pstfile);
634 } 634 }
635 pst_freeItem(item); 635 pst_freeItem(item);