libpst: src/readpst.c annotate

annotate src/readpst.c @ 253:115b871c61a1

fixes from fedora for python 2.7

author	Carl Byington <carl@five-ten-sg.com>
date	Wed, 28 Jul 2010 20:38:17 -0700
parents	85d77d7b034b
children	fb66d428347d

rev	line source
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	1 /***
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	2 * readpst.c
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	3 * Part of the LibPST project
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	4 * Written by David Smith
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	5 * dave.s@earthcorp.com
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	6 */
59 7d5c637aaafb General cleanup and code fixes. Carl Byington <carl@five-ten-sg.com> parents: 52 diff changeset	7
122 bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h Carl Byington <carl@five-ten-sg.com> parents: 121 diff changeset	8 #include "define.h"
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h Carl Byington <carl@five-ten-sg.com> parents: 121 diff changeset	9 #include "lzfu.h"
bdb38b434c0a more changes from Fridrich Strba to avoid installing our config.h Carl Byington <carl@five-ten-sg.com> parents: 121 diff changeset	10
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	11 #define OUTPUT_TEMPLATE "%s"
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	12 #define OUTPUT_KMAIL_DIR_TEMPLATE ".%s.directory"
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	13 #define KMAIL_INDEX ".%s.index"
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	14 #define SEP_MAIL_FILE_TEMPLATE "%i%s"
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	15
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	16 // max size of the c_time char*. It will store the date of the email
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	17 #define C_TIME_SIZE 500
59 7d5c637aaafb General cleanup and code fixes. Carl Byington <carl@five-ten-sg.com> parents: 52 diff changeset	18
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	19 struct file_ll {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	20 char *name;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	21 char *dname;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	22 FILE * output;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	23 int32_t stored_count;
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	24 int32_t item_count;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	25 int32_t skip_count;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	26 int32_t type;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	27 };
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	28
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	29 int grim_reaper();
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	30 pid_t try_fork(char* folder);
186 0a4f7ecd7452 more cleanup of external names in the shared library Carl Byington <carl@five-ten-sg.com> parents: 182 diff changeset	31 void process(pst_item outeritem, pst_desc_tree d_ptr);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	32 void write_email_body(FILE f, char body);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	33 void removeCR(char *c);
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	34 void usage();
0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	35 void version();
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	36 char* mk_kmail_dir(char* fname);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	37 int close_kmail_dir();
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	38 char* mk_recurse_dir(char* dir, int32_t folder_type);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	39 int close_recurse_dir();
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	40 char* mk_separate_dir(char *dir);
87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	41 int close_separate_dir();
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	42 int mk_separate_file(struct file_ll f, char extension);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	43 char* my_stristr(char haystack, char needle);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	44 void check_filename(char *fname);
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	45 void write_separate_attachment(char f_name[], pst_item_attach* attach, int attach_num, pst_file* pst);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	46 void write_embedded_message(FILE* f_output, pst_item_attach* attach, char boundary, pst_file pf, char** extra_mime_headers);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	47 void write_inline_attachment(FILE* f_output, pst_item_attach* attach, char boundary, pst_file pst);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	48 void header_has_field(char header, char field, int *flag);
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	49 void header_get_subfield(char field, const char subfield, char *body_subfield, size_t size_subfield);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	50 char* header_get_field(char header, char field);
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	51 char* header_end_field(char *field);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	52 void header_strip_field(char header, char field);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	53 int test_base64(char *body);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	54 void find_html_charset(char html, char charset, size_t charsetlen);
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	55 void find_rfc822_headers(char** extra_mime_headers);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	56 void write_body_part(FILE* f_output, pst_string body, char mime, char charset, char boundary, pst_file* pst);
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	57 void write_schedule_part_data(FILE* f_output, pst_item* item, const char* sender, const char* method);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	58 void write_schedule_part(FILE* f_output, pst_item* item, const char* sender, const char* boundary);
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	59 void write_normal_email(FILE* f_output, char f_name[], pst_item* item, int mode, int mode_MH, pst_file* pst, int save_rtf, char** extra_mime_headers);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	60 void write_vcard(FILE* f_output, pst_item item, pst_item_contact contact, char comment[]);
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	61 int write_extra_categories(FILE* f_output, pst_item* item);
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	62 void write_journal(FILE* f_output, pst_item* item);
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	63 void write_appointment(FILE* f_output, pst_item *item);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	64 void create_enter_dir(struct file_ll* f, pst_item *item);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	65 void close_enter_dir(struct file_ll *f);
34 07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes carl parents: 33 diff changeset	66
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	67 const char* prog_name;
34 07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes carl parents: 33 diff changeset	68 char* output_dir = ".";
07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes carl parents: 33 diff changeset	69 char* kmail_chdir = NULL;
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	70
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	71 // Normal mode just creates mbox format files in the current directory. Each file is named
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	72 // the same as the folder's name that it represents
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	73 #define MODE_NORMAL 0
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	74
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	75 // KMail mode creates a directory structure suitable for being used directly
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	76 // by the KMail application
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	77 #define MODE_KMAIL 1
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	78
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	79 // recurse mode creates a directory structure like the PST file. Each directory
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	80 // contains only one file which stores the emails in mbox format.
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	81 #define MODE_RECURSE 2
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	82
87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	83 // separate mode creates the same directory structure as recurse. The emails are stored in
87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	84 // separate files, numbering from 1 upward. Attachments belonging to the emails are
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	85 // saved as email_no-filename (e.g. 1-samplefile.doc or 1-Attachment2.zip)
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	86 #define MODE_SEPARATE 3
87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	87
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	88
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	89 // Output Normal just prints the standard information about what is going on
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	90 #define OUTPUT_NORMAL 0
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	91
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	92 // Output Quiet is provided so that only errors are printed
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	93 #define OUTPUT_QUIET 1
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	94
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	95 // default mime-type for attachments that have a null mime-type
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	96 #define MIME_TYPE_DEFAULT "application/octet-stream"
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	97 #define RFC822 "message/rfc822"
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	98
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	99 // output mode for contacts
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	100 #define CMODE_VCARD 0
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	101 #define CMODE_LIST 1
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	102
100 1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	103 // output mode for deleted items
1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	104 #define DMODE_EXCLUDE 0
1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	105 #define DMODE_INCLUDE 1
1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	106
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	107 // Output type mode flags
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	108 #define OTMODE_EMAIL 1
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	109 #define OTMODE_APPOINTMENT 2
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	110 #define OTMODE_JOURNAL 4
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	111 #define OTMODE_CONTACT 8
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	112
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	113 // output settings for RTF bodies
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	114 // filename for the attachment
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	115 #define RTF_ATTACH_NAME "rtf-body.rtf"
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	116 // mime type for the attachment
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	117 #define RTF_ATTACH_TYPE "application/rtf"
34 07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes carl parents: 33 diff changeset	118
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	119 // global settings
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	120 int mode = MODE_NORMAL;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	121 int mode_MH = 0; // a submode of MODE_SEPARATE
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	122 int mode_EX = 0; // a submode of MODE_SEPARATE
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	123 int mode_thunder = 0; // a submode of MODE_RECURSE
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	124 int output_mode = OUTPUT_NORMAL;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	125 int contact_mode = CMODE_VCARD;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	126 int deleted_mode = DMODE_EXCLUDE;
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	127 int output_type_mode = 0xff; // Default to all.
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	128 int contact_mode_specified = 0;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	129 int overwrite = 0;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	130 int save_rtf_body = 1;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	131 int file_name_len = 10; // enough room for MODE_SPEARATE file name
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	132 pst_file pstfile;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	133 regex_t meta_charset_pattern;
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	134
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	135 int number_processors = 1; // number of cpus we have
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	136 int max_children = 0; // based on number of cpus and command line args
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	137 int max_child_specified = 0;// have command line arg -j
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	138 int active_children; // number of children of this process, cannot be larger than max_children
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	139 pid_t* child_processes; // setup by main(), and at the start of new child process
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	140
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	141 #ifdef HAVE_SEMAPHORE_H
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	142 int shared_memory_id;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	143 sem_t* global_children = NULL;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	144 sem_t* output_mutex = NULL;
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	145 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	146
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	147
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	148 int grim_reaper(int waitall)
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	149 {
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	150 int available = 0;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	151 #ifdef HAVE_FORK
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	152 #ifdef HAVE_SEMAPHORE_H
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	153 if (global_children) {
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	154 sem_getvalue(global_children, &available);
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	155 //printf("grim reaper %s for pid %d (parent %d) with %d children, %d available\n", (waitall) ? "all" : "", getpid(), getppid(), active_children, available);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	156 //fflush(stdout);
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	157 int i,j;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	158 for (i=0; i<active_children; i++) {
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	159 pid_t child = child_processes[i];
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	160 pid_t ch = waitpid(child, NULL, ((waitall) ? 0 : WNOHANG));
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	161 if (ch == child) {
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	162 // this has terminated, remove it from the list
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	163 for (j=i; j<active_children-1; j++) {
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	164 child_processes[j] = child_processes[j+1];
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	165 }
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	166 active_children--;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	167 i--;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	168 }
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	169 }
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	170 sem_getvalue(global_children, &available);
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	171 //printf("grim reaper %s for pid %d with %d children, %d available\n", (waitall) ? "all" : "", getpid(), active_children, available);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	172 //fflush(stdout);
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	173 }
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	174 #endif
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	175 #endif
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	176 return available;
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	177 }
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	178
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	179
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	180 pid_t try_fork(char *folder)
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	181 {
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	182 #ifdef HAVE_FORK
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	183 #ifdef HAVE_SEMAPHORE_H
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	184 int available = grim_reaper(0);
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	185 if (available) {
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	186 sem_wait(global_children);
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	187 pid_t child = fork();
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	188 if (child < 0) {
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	189 // fork failed, pretend it worked and we are the child
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	190 return 0;
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	191 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	192 else if (child == 0) {
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	193 // fork worked, and we are the child, reinitialize our list of children
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	194 active_children = 0;
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	195 memset(child_processes, 0, sizeof(pid_t) * max_children);
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	196 pst_reopen(&pstfile); // close and reopen the pst file to get an independent file position pointer
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	197 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	198 else {
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	199 // fork worked, and we are the parent, record this child that we need to wait for
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	200 //pid_t me = getpid();
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	201 //printf("parent %d forked child pid %d to process folder %s\n", me, child, folder);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	202 //fflush(stdout);
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	203 child_processes[active_children++] = child;
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	204 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	205 return child;
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	206 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	207 else {
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	208 return 0; // pretend to have forked and we are the child
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	209 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	210 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	211 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	212 return 0;
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	213 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	214
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	215
186 0a4f7ecd7452 more cleanup of external names in the shared library Carl Byington <carl@five-ten-sg.com> parents: 182 diff changeset	216 void process(pst_item outeritem, pst_desc_tree d_ptr)
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	217 {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	218 struct file_ll ff;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	219 pst_item *item = NULL;
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	220
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	221 DEBUG_ENT("process");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	222 memset(&ff, 0, sizeof(ff));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	223 create_enter_dir(&ff, outeritem);
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	224
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	225 for (; d_ptr; d_ptr = d_ptr->next) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	226 DEBUG_INFO(("New item record\n"));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	227 if (!d_ptr->desc) {
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	228 ff.skip_count++;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	229 DEBUG_WARN(("ERROR item's desc record is NULL\n"));
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	230 continue;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	231 }
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	232 DEBUG_INFO(("Desc Email ID %#"PRIx64" [d_ptr->d_id = %#"PRIx64"]\n", d_ptr->desc->i_id, d_ptr->d_id));
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	233
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	234 item = pst_parse_item(&pstfile, d_ptr, NULL);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	235 DEBUG_INFO(("About to process item\n"));
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	236
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	237 if (!item) {
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	238 ff.skip_count++;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	239 DEBUG_INFO(("A NULL item was seen\n"));
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	240 continue;
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	241 }
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	242
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	243 if (item->subject.str) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	244 DEBUG_INFO(("item->subject = %s\n", item->subject.str));
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	245 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	246
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	247 if (item->folder && item->file_as.str) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	248 DEBUG_INFO(("Processing Folder \"%s\"\n", item->file_as.str));
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	249 if (output_mode != OUTPUT_QUIET) {
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	250 pst_debug_lock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	251 printf("Processing Folder \"%s\"\n", item->file_as.str);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	252 fflush(stdout);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	253 pst_debug_unlock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	254 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	255 ff.item_count++;
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	256 if (d_ptr->child && (deleted_mode == DMODE_INCLUDE \|\| strcasecmp(item->file_as.str, "Deleted Items"))) {
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	257 //if this is a non-empty folder other than deleted items, we want to recurse into it
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	258 pid_t parent = getpid();
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	259 pid_t child = try_fork(item->file_as.str);
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	260 if (child == 0) {
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	261 // we are the child process, or the original parent if no children were available
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	262 pid_t me = getpid();
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	263 process(item, d_ptr->child);
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	264 #ifdef HAVE_FORK
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	265 #ifdef HAVE_SEMAPHORE_H
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	266 if (me != parent) {
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	267 // we really were a child, forked for the sole purpose of processing this folder
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	268 // free my child count slot before really exiting, since
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	269 // all I am doing here is waiting for my children to exit
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	270 sem_post(global_children);
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	271 grim_reaper(1); // wait for all my child processes to exit
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	272 exit(0); // really exit
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	273 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	274 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	275 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	276 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	277 }
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	278
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	279 } else if (item->contact && (item->type == PST_TYPE_CONTACT)) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	280 DEBUG_INFO(("Processing Contact\n"));
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	281 if (!(output_type_mode & OTMODE_CONTACT)) {
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	282 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	283 DEBUG_INFO(("skipping contact: not in output type list\n"));
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	284 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	285 else {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	286 if (!ff.type) ff.type = item->type;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	287 if ((ff.type != PST_TYPE_CONTACT) && (mode != MODE_SEPARATE)) {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	288 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	289 DEBUG_INFO(("I have a contact, but the folder type %"PRIi32" isn't a contacts folder. Skipping it\n", ff.type));
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	290 }
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	291 else {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	292 ff.item_count++;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	293 if (mode == MODE_SEPARATE) mk_separate_file(&ff, (mode_EX) ? ".vcf" : "");
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	294 if (contact_mode == CMODE_VCARD) {
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	295 pst_convert_utf8_null(item, &item->comment);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	296 write_vcard(ff.output, item, item->contact, item->comment.str);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	297 }
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	298 else {
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	299 pst_convert_utf8(item, &item->contact->fullname);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	300 pst_convert_utf8(item, &item->contact->address1);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	301 fprintf(ff.output, "%s <%s>\n", item->contact->fullname.str, item->contact->address1.str);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	302 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	303 }
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	304 }
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	305
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	306 } else if (item->email && ((item->type == PST_TYPE_NOTE) \|\| (item->type == PST_TYPE_SCHEDULE) \|\| (item->type == PST_TYPE_REPORT))) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	307 DEBUG_INFO(("Processing Email\n"));
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	308 if (!(output_type_mode & OTMODE_EMAIL)) {
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	309 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	310 DEBUG_INFO(("skipping email: not in output type list\n"));
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	311 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	312 else {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	313 if (!ff.type) ff.type = item->type;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	314 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_SCHEDULE) && (ff.type != PST_TYPE_REPORT) && (mode != MODE_SEPARATE)) {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	315 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	316 DEBUG_INFO(("I have an email type %"PRIi32", but the folder type %"PRIi32" isn't an email folder. Skipping it\n", item->type, ff.type));
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	317 }
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	318 else {
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	319 char *extra_mime_headers = NULL;
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	320 ff.item_count++;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	321 if (mode == MODE_SEPARATE) mk_separate_file(&ff, (mode_EX) ? ".eml" : "");
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	322 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body, &extra_mime_headers);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	323 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	324 }
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	325
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	326 } else if (item->journal && (item->type == PST_TYPE_JOURNAL)) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	327 DEBUG_INFO(("Processing Journal Entry\n"));
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	328 if (!(output_type_mode & OTMODE_JOURNAL)) {
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	329 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	330 DEBUG_INFO(("skipping journal entry: not in output type list\n"));
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	331 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	332 else {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	333 if (!ff.type) ff.type = item->type;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	334 if ((ff.type != PST_TYPE_JOURNAL) && (mode != MODE_SEPARATE)) {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	335 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	336 DEBUG_INFO(("I have a journal entry, but the folder type %"PRIi32" isn't a journal folder. Skipping it\n", ff.type));
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	337 }
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	338 else {
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	339 ff.item_count++;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	340 if (mode == MODE_SEPARATE) mk_separate_file(&ff, (mode_EX) ? ".ics" : "");
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	341 write_journal(ff.output, item);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	342 fprintf(ff.output, "\n");
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	343 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	344 }
79 56fa05fd5271 Patch from Robert Simpson for encryption type 2. Carl Byington <carl@five-ten-sg.com> parents: 77 diff changeset	345
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	346 } else if (item->appointment && (item->type == PST_TYPE_APPOINTMENT)) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	347 DEBUG_INFO(("Processing Appointment Entry\n"));
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	348 if (!(output_type_mode & OTMODE_APPOINTMENT)) {
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	349 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	350 DEBUG_INFO(("skipping appointment: not in output type list\n"));
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	351 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	352 else {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	353 if (!ff.type) ff.type = item->type;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	354 if ((ff.type != PST_TYPE_APPOINTMENT) && (mode != MODE_SEPARATE)) {
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	355 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	356 DEBUG_INFO(("I have an appointment, but the folder type %"PRIi32" isn't an appointment folder. Skipping it\n", ff.type));
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	357 }
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	358 else {
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	359 ff.item_count++;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	360 if (mode == MODE_SEPARATE) mk_separate_file(&ff, (mode_EX) ? ".ics" : "");
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	361 write_schedule_part_data(ff.output, item, NULL, NULL);
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	362 fprintf(ff.output, "\n");
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	363 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	364 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	365
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	366 } else if (item->message_store) {
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	367 // there should only be one message_store, and we have already done it
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	368 ff.skip_count++;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	369 DEBUG_INFO(("item with message store content, type %i %s folder type %i, skipping it\n", item->type, item->ascii_type, ff.type));
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	370
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	371 } else {
40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	372 ff.skip_count++;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	373 DEBUG_INFO(("Unknown item type %i (%s) name (%s)\n",
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	374 item->type, item->ascii_type, item->file_as.str));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	375 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	376 pst_freeItem(item);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	377 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	378 close_enter_dir(&ff);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	379 DEBUG_RET();
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	380 }
2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	381
2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	382
34 07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes carl parents: 33 diff changeset	383
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	384 int main(int argc, char* const* argv) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	385 pst_item *item = NULL;
186 0a4f7ecd7452 more cleanup of external names in the shared library Carl Byington <carl@five-ten-sg.com> parents: 182 diff changeset	386 pst_desc_tree *d_ptr;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	387 char * fname = NULL;
48 f66078abed38 more fixes for 64 bit format carl parents: 46 diff changeset	388 char *d_log = NULL;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	389 int c,x;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	390 char *temp = NULL; //temporary char pointer
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	391 prog_name = argv[0];
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	392
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	393 time_t now = time(NULL);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	394 srand((unsigned)now);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	395
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	396 if (regcomp(&meta_charset_pattern, "<meta[^>]content=\"[^>]charset=([^>\";]*)[\";]", REG_ICASE \| REG_EXTENDED)) {
123 ab2a11e72250 more cleanup of #include files. Carl Byington <carl@five-ten-sg.com> parents: 122 diff changeset	397 printf("cannot compile regex pattern to find content charset in html bodies\n");
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	398 exit(3);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	399 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	400
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	401 // command-line option handling
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	402 while ((c = getopt(argc, argv, "bc:Dd:ehj:kMo:qrSt:uVw"))!= -1) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	403 switch (c) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	404 case 'b':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	405 save_rtf_body = 0;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	406 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	407 case 'c':
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	408 if (optarg && optarg[0]=='v') {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	409 contact_mode=CMODE_VCARD;
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	410 contact_mode_specified = 1;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	411 }
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	412 else if (optarg && optarg[0]=='l') {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	413 contact_mode=CMODE_LIST;
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	414 contact_mode_specified = 1;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	415 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	416 else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	417 usage();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	418 exit(0);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	419 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	420 break;
100 1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	421 case 'D':
1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	422 deleted_mode = DMODE_INCLUDE;
1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	423 break;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	424 case 'd':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	425 d_log = optarg;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	426 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	427 case 'h':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	428 usage();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	429 exit(0);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	430 break;
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	431 case 'j':
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	432 max_children = atoi(optarg);
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	433 max_child_specified = 1;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	434 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	435 case 'k':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	436 mode = MODE_KMAIL;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	437 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	438 case 'M':
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	439 mode = MODE_SEPARATE;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	440 mode_MH = 1;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	441 mode_EX = 0;
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	442 break;
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	443 case 'e':
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	444 mode = MODE_SEPARATE;
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	445 mode_MH = 1;
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	446 mode_EX = 1;
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	447 file_name_len = 14;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	448 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	449 case 'o':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	450 output_dir = optarg;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	451 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	452 case 'q':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	453 output_mode = OUTPUT_QUIET;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	454 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	455 case 'r':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	456 mode = MODE_RECURSE;
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	457 mode_thunder = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	458 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	459 case 'S':
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	460 mode = MODE_SEPARATE;
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	461 mode_MH = 0;
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	462 mode_EX = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	463 break;
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	464 case 't':
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	465 // email, appointment, contact, other
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	466 if (!optarg) {
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	467 usage();
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	468 exit(0);
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	469 }
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	470 temp = optarg;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	471 output_type_mode = 0;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	472 while (*temp > 0) {
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	473 switch (temp[0]) {
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	474 case 'e':
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	475 output_type_mode \|= OTMODE_EMAIL;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	476 break;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	477 case 'a':
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	478 output_type_mode \|= OTMODE_APPOINTMENT;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	479 break;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	480 case 'j':
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	481 output_type_mode \|= OTMODE_JOURNAL;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	482 break;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	483 case 'c':
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	484 output_type_mode \|= OTMODE_CONTACT;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	485 break;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	486 default:
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	487 usage();
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	488 exit(0);
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	489 break;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	490 }
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	491 temp++;
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	492 }
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	493 break;
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	494 case 'u':
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	495 mode = MODE_RECURSE;
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	496 mode_thunder = 1;
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	497 break;
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	498 case 'V':
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	499 version();
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	500 exit(0);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	501 break;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	502 case 'w':
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	503 overwrite = 1;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	504 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	505 default:
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	506 usage();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	507 exit(1);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	508 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	509 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	510 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	511
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	512 if (argc > optind) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	513 fname = argv[optind];
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	514 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	515 usage();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	516 exit(2);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	517 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	518
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	519 #ifdef _SC_NPROCESSORS_ONLN
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	520 number_processors = sysconf(_SC_NPROCESSORS_ONLN);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	521 #endif
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	522 max_children = (max_child_specified) ? max_children : number_processors * 4;
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	523 active_children = 0;
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	524 child_processes = (pid_t )pst_malloc(sizeof(pid_t) max_children);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	525 memset(child_processes, 0, sizeof(pid_t) * max_children);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	526
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	527 #ifdef HAVE_SEMAPHORE_H
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	528 if (max_children) {
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	529 shared_memory_id = shmget(IPC_PRIVATE, sizeof(sem_t)*2, 0777);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	530 if (shared_memory_id >= 0) {
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	531 global_children = (sem_t *)shmat(shared_memory_id, NULL, 0);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	532 if (global_children == (sem_t *)-1) global_children = NULL;
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	533 if (global_children) {
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	534 output_mutex = &(global_children[1]);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	535 sem_init(global_children, 1, max_children);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	536 sem_init(output_mutex, 1, 1);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	537 }
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	538 shmctl(shared_memory_id, IPC_RMID, NULL);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	539 }
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	540 }
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	541 #endif
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	542
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	543 #ifdef DEBUG_ALL
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	544 // force a log file
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	545 if (!d_log) d_log = "readpst.log";
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	546 #endif // defined DEBUG_ALL
212 8e17efed33c1 patch from Fridrich Strba to build on win32 Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	547 #ifdef HAVE_SEMAPHORE_H
8e17efed33c1 patch from Fridrich Strba to build on win32 Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	548 DEBUG_INIT(d_log, output_mutex);
8e17efed33c1 patch from Fridrich Strba to build on win32 Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	549 #else
8e17efed33c1 patch from Fridrich Strba to build on win32 Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	550 DEBUG_INIT(d_log, NULL);
8e17efed33c1 patch from Fridrich Strba to build on win32 Carl Byington <carl@five-ten-sg.com> parents: 211 diff changeset	551 #endif
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	552 DEBUG_ENT("main");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	553
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	554 if (output_mode != OUTPUT_QUIET) printf("Opening PST file and indexes...\n");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	555
59 7d5c637aaafb General cleanup and code fixes. Carl Byington <carl@five-ten-sg.com> parents: 52 diff changeset	556 RET_DERROR(pst_open(&pstfile, fname), 1, ("Error opening File\n"));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	557 RET_DERROR(pst_load_index(&pstfile), 2, ("Index Error\n"));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	558
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	559 pst_load_extended_attributes(&pstfile);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	560
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	561 if (chdir(output_dir)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	562 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	563 pst_close(&pstfile);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	564 DEBUG_RET();
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	565 DIE(("Cannot change to output dir %s: %s\n", output_dir, strerror(x)));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	566 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	567
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	568 d_ptr = pstfile.d_head; // first record is main record
143 fdc58ad2c758 fix embedded rfc822 messages with attachments Carl Byington <carl@five-ten-sg.com> parents: 142 diff changeset	569 item = pst_parse_item(&pstfile, d_ptr, NULL);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	570 if (!item \|\| !item->message_store) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	571 DEBUG_RET();
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	572 DIE(("Could not get root record\n"));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	573 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	574
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	575 // default the file_as to the same as the main filename if it doesn't exist
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	576 if (!item->file_as.str) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	577 if (!(temp = strrchr(fname, '/')))
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	578 if (!(temp = strrchr(fname, '\\')))
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	579 temp = fname;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	580 else
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	581 temp++; // get past the "\\"
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	582 else
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	583 temp++; // get past the "/"
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	584 item->file_as.str = (char*)pst_malloc(strlen(temp)+1);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	585 strcpy(item->file_as.str, temp);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	586 item->file_as.is_utf8 = 1;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	587 DEBUG_INFO(("file_as was blank, so am using %s\n", item->file_as.str));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	588 }
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	589 DEBUG_INFO(("Root Folder Name: %s\n", item->file_as.str));
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	590
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	591 d_ptr = pst_getTopOfFolders(&pstfile, item);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	592 if (!d_ptr) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	593 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	594 DIE(("Top of folders record not found. Cannot continue\n"));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	595 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	596
63 cfd6175f9334 Start work on pst2dii to convert to Summation dii load file format. Carl Byington <carl@five-ten-sg.com> parents: 59 diff changeset	597 process(item, d_ptr->child); // do the children of TOPF
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	598 grim_reaper(1); // wait for all child processes
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	599
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	600 pst_freeItem(item);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	601 pst_close(&pstfile);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	602 DEBUG_RET();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	603
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	604 #ifdef HAVE_SEMAPHORE_H
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	605 if (global_children) {
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	606 sem_destroy(global_children);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	607 sem_destroy(output_mutex);
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	608 shmdt(global_children);
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	609 }
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	610 #endif
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	611
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	612 regfree(&meta_charset_pattern);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	613 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	614 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	615
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	616
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	617 void write_email_body(FILE f, char body) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	618 char *n = body;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	619 DEBUG_ENT("write_email_body");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	620 while (n) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	621 if (strncmp(body, "From ", 5) == 0)
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	622 fprintf(f, ">");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	623 if ((n = strchr(body, '\n'))) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	624 n++;
73 3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	625 pst_fwrite(body, n-body, 1, f); //write just a line
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	626 body = n;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	627 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	628 }
73 3cb02cb1e6cd Patch from Robert Simpson to fix doubly-linked list in the cache_ptr code, and allow arrays of unicode strings (without converting them). Carl Byington <carl@five-ten-sg.com> parents: 70 diff changeset	629 pst_fwrite(body, strlen(body), 1, f);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	630 DEBUG_RET();
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	631 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	632
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	633
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	634 void removeCR (char *c) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	635 // converts \r\n to \n
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	636 char a, b;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	637 DEBUG_ENT("removeCR");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	638 a = b = c;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	639 while (*a != '\0') {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	640 b = a;
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	641 if (*a != '\r') b++;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	642 a++;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	643 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	644 *b = '\0';
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	645 DEBUG_RET();
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	646 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	647
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	648
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	649 void usage() {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	650 DEBUG_ENT("usage");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	651 version();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	652 printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	653 printf("OPTIONS:\n");
104 39ba19372732 many fixes in pst2ldif by Robert Harris Carl Byington <carl@five-ten-sg.com> parents: 100 diff changeset	654 printf("\t-V\t- Version. Display program version\n");
100 1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	655 printf("\t-D\t- Include deleted items in output\n");
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	656 printf("\t-M\t- Write emails in the MH (rfc822) format\n");
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	657 printf("\t-S\t- Separate. Write emails in the separate format\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	658 printf("\t-b\t- Don't save RTF-Body attachments\n");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	659 printf("\t-c[v\|l]\t- Set the Contact output mode. -cv = VCard, -cl = EMail list\n");
238 410b6422d65b fix --help usage; readpstlog is gone Carl Byington <carl@five-ten-sg.com> parents: 236 diff changeset	660 printf("\t-d <filename> \t- Debug to file.\n");
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	661 printf("\t-e\t- As with -M, but include extensions on output files\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	662 printf("\t-h\t- Help. This screen\n");
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	663 printf("\t-j <integer>\t- Number of parallel jobs to run\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	664 printf("\t-k\t- KMail. Output in kmail format\n");
63 cfd6175f9334 Start work on pst2dii to convert to Summation dii load file format. Carl Byington <carl@five-ten-sg.com> parents: 59 diff changeset	665 printf("\t-o <dirname>\t- Output directory to write files to. CWD is changed after opening pst file\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	666 printf("\t-q\t- Quiet. Only print error messages\n");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	667 printf("\t-r\t- Recursive. Output in a recursive format\n");
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	668 printf("\t-t[eajc]\t- Set the output type list. e = email, a = attachment, j = journal, c = contact\n");
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	669 printf("\t-u\t- Thunderbird mode. Write two extra .size and .type files\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	670 printf("\t-w\t- Overwrite any output mbox files\n");
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	671 printf("\n");
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	672 printf("Only one of -k -M -r -S should be specified\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	673 DEBUG_RET();
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	674 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	675
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	676
118 0f1492b7fe8b patch from Fridrich Strba for building on mingw and general cleanup of autoconf files Carl Byington <carl@five-ten-sg.com> parents: 116 diff changeset	677 void version() {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	678 DEBUG_ENT("version");
50 fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	679 printf("ReadPST / LibPST v%s\n", VERSION);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	680 #if BYTE_ORDER == BIG_ENDIAN
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	681 printf("Big Endian implementation being used.\n");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	682 #elif BYTE_ORDER == LITTLE_ENDIAN
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	683 printf("Little Endian implementation being used.\n");
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	684 #else
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	685 # error "Byte order not supported by this library"
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	686 #endif
c508ee15dfca switch to automake/autoconf carl parents: diff changeset	687 #ifdef __GNUC__
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	688 printf("GCC %d.%d : %s %s\n", __GNUC__, __GNUC_MINOR__, __DATE__, __TIME__);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	689 #endif
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	690 DEBUG_RET();
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	691 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	692
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	693
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	694 char mk_kmail_dir(char fname) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	695 //change to that directory
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	696 //make a directory based on OUTPUT_KMAIL_DIR_TEMPLATE
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	697 //allocate space for OUTPUT_TEMPLATE and form a char* with fname
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	698 //return that value
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	699 char dir, out_name, *index;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	700 int x;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	701 DEBUG_ENT("mk_kmail_dir");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	702 if (kmail_chdir && chdir(kmail_chdir)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	703 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	704 DIE(("mk_kmail_dir: Cannot change to directory %s: %s\n", kmail_chdir, strerror(x)));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	705 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	706 dir = malloc(strlen(fname)+strlen(OUTPUT_KMAIL_DIR_TEMPLATE)+1);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	707 sprintf(dir, OUTPUT_KMAIL_DIR_TEMPLATE, fname);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	708 check_filename(dir);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	709 if (D_MKDIR(dir)) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	710 if (errno != EEXIST) { // not an error because it exists
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	711 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	712 DIE(("mk_kmail_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	713 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	714 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	715 kmail_chdir = realloc(kmail_chdir, strlen(dir)+1);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	716 strcpy(kmail_chdir, dir);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	717 free (dir);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	718
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	719 //we should remove any existing indexes created by KMail, cause they might be different now
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	720 index = malloc(strlen(fname)+strlen(KMAIL_INDEX)+1);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	721 sprintf(index, KMAIL_INDEX, fname);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	722 unlink(index);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	723 free(index);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	724
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	725 out_name = malloc(strlen(fname)+strlen(OUTPUT_TEMPLATE)+1);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	726 sprintf(out_name, OUTPUT_TEMPLATE, fname);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	727 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	728 return out_name;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	729 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	730
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	731
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	732 int close_kmail_dir() {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	733 // change ..
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	734 int x;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	735 DEBUG_ENT("close_kmail_dir");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	736 if (kmail_chdir) { //only free kmail_chdir if not NULL. do not change directory
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	737 free(kmail_chdir);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	738 kmail_chdir = NULL;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	739 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	740 if (chdir("..")) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	741 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	742 DIE(("close_kmail_dir: Cannot move up dir (..): %s\n", strerror(x)));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	743 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	744 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	745 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	746 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	747 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	748
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	749
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	750 // this will create a directory by that name,
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	751 // then make an mbox file inside that directory.
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	752 char mk_recurse_dir(char dir, int32_t folder_type) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	753 int x;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	754 char *out_name;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	755 DEBUG_ENT("mk_recurse_dir");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	756 check_filename(dir);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	757 if (D_MKDIR (dir)) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	758 if (errno != EEXIST) { // not an error because it exists
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	759 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	760 DIE(("mk_recurse_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	761 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	762 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	763 if (chdir (dir)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	764 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	765 DIE(("mk_recurse_dir: Cannot change to directory %s: %s\n", dir, strerror(x)));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	766 }
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	767 switch (folder_type) {
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	768 case PST_TYPE_APPOINTMENT:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	769 out_name = strdup("calendar");
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	770 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	771 case PST_TYPE_CONTACT:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	772 out_name = strdup("contacts");
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	773 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	774 case PST_TYPE_JOURNAL:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	775 out_name = strdup("journal");
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	776 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	777 case PST_TYPE_STICKYNOTE:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	778 case PST_TYPE_TASK:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	779 case PST_TYPE_NOTE:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	780 case PST_TYPE_OTHER:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	781 case PST_TYPE_REPORT:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	782 default:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	783 out_name = strdup("mbox");
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	784 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	785 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	786 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	787 return out_name;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	788 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	789
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	790
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	791 int close_recurse_dir() {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	792 int x;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	793 DEBUG_ENT("close_recurse_dir");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	794 if (chdir("..")) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	795 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	796 DIE(("close_recurse_dir: Cannot go up dir (..): %s\n", strerror(x)));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	797 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	798 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	799 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	800 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	801
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	802
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	803 char mk_separate_dir(char dir) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	804 size_t dirsize = strlen(dir) + 10;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	805 char dir_name[dirsize];
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	806 int x = 0, y = 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	807
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	808 DEBUG_ENT("mk_separate_dir");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	809 do {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	810 if (y == 0)
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	811 snprintf(dir_name, dirsize, "%s", dir);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	812 else
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	813 snprintf(dir_name, dirsize, "%s" SEP_MAIL_FILE_TEMPLATE, dir, y, ""); // enough for 9 digits allocated above
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	814
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	815 check_filename(dir_name);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	816 DEBUG_INFO(("about to try creating %s\n", dir_name));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	817 if (D_MKDIR(dir_name)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	818 if (errno != EEXIST) { // if there is an error, and it doesn't already exist
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	819 x = errno;
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	820 DIE(("mk_separate_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	821 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	822 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	823 break;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	824 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	825 y++;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	826 } while (overwrite == 0);
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	827
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	828 if (chdir(dir_name)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	829 x = errno;
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	830 DIE(("mk_separate_dir: Cannot change to directory %s: %s\n", dir, strerror(x)));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	831 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	832
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	833 if (overwrite) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	834 // we should probably delete all files from this directory
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	835 #if !defined(WIN32) && !defined(__CYGWIN__)
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	836 DIR * sdir = NULL;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	837 struct dirent *dirent = NULL;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	838 struct stat filestat;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	839 if (!(sdir = opendir("./"))) {
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	840 DEBUG_WARN(("mk_separate_dir: Cannot open dir \"%s\" for deletion of old contents\n", "./"));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	841 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	842 while ((dirent = readdir(sdir))) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	843 if (lstat(dirent->d_name, &filestat) != -1)
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	844 if (S_ISREG(filestat.st_mode)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	845 if (unlink(dirent->d_name)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	846 y = errno;
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	847 DIE(("mk_separate_dir: unlink returned error on file %s: %s\n", dirent->d_name, strerror(y)));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	848 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	849 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	850 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	851 }
26 9eeba3f4ca4b more cleanup from Arne carl parents: 25 diff changeset	852 #endif
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	853 }
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	854
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	855 // we don't return a filename here cause it isn't necessary.
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	856 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	857 return NULL;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	858 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	859
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	860
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	861 int close_separate_dir() {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	862 int x;
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	863 DEBUG_ENT("close_separate_dir");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	864 if (chdir("..")) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	865 x = errno;
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	866 DIE(("close_separate_dir: Cannot go up dir (..): %s\n", strerror(x)));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	867 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	868 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	869 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	870 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	871
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	872
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	873 int mk_separate_file(struct file_ll f, char extension) {
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	874 DEBUG_ENT("mk_separate_file");
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	875 DEBUG_INFO(("opening next file to save email\n"));
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	876 if (f->item_count > 999999999) { // bigger than nine 9's
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	877 DIE(("mk_separate_file: The number of emails in this folder has become too high to handle\n"));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	878 }
246 5a82d41c883d patches from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 242 diff changeset	879 sprintf(f->name, SEP_MAIL_FILE_TEMPLATE, f->item_count, extension);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	880 if (f->output) fclose(f->output);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	881 f->output = NULL;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	882 check_filename(f->name);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	883 if (!(f->output = fopen(f->name, "w"))) {
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	884 DIE(("mk_separate_file: Cannot open file to save email \"%s\"\n", f->name));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	885 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	886 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	887 return 0;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	888 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	889
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	890
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	891 char my_stristr(char haystack, char *needle) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	892 // my_stristr varies from strstr in that its searches are case-insensitive
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	893 char x=haystack, y=needle, *z = NULL;
52 034641c26ab9 code cleanup carl parents: 50 diff changeset	894 if (!haystack \|\| !needle) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	895 return NULL;
52 034641c26ab9 code cleanup carl parents: 50 diff changeset	896 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	897 while (y != '\0' && x != '\0') {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	898 if (tolower(y) == tolower(x)) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	899 // move y on one
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	900 y++;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	901 if (!z) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	902 z = x; // store first position in haystack where a match is made
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	903 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	904 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	905 y = needle; // reset y to the beginning of the needle
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	906 z = NULL; // reset the haystack storage point
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	907 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	908 x++; // advance the search in the haystack
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	909 }
100 1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	910 // If the haystack ended before our search finished, it's not a match.
1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	911 if (*y != '\0') return NULL;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	912 return z;
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	913 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	914
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	915
41 183ae993b9ad security fix for potential buffer overrun in lz decompress carl parents: 39 diff changeset	916 void check_filename(char *fname) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	917 char *t = fname;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	918 DEBUG_ENT("check_filename");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	919 if (!t) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	920 DEBUG_RET();
52 034641c26ab9 code cleanup carl parents: 50 diff changeset	921 return;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	922 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	923 while ((t = strpbrk(t, "/\\:"))) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	924 // while there are characters in the second string that we don't want
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	925 *t = '_'; //replace them with an underscore
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	926 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	927 DEBUG_RET();
16 c508ee15dfca switch to automake/autoconf carl parents: diff changeset	928 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	929
b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	930
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	931 void write_separate_attachment(char f_name[], pst_item_attach* attach, int attach_num, pst_file* pst)
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	932 {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	933 FILE *fp = NULL;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	934 int x = 0;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	935 char *temp = NULL;
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	936
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	937 // If there is a long filename (filename2) use that, otherwise
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	938 // use the 8.3 filename (filename1)
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	939 char *attach_filename = (attach->filename2.str) ? attach->filename2.str
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	940 : attach->filename1.str;
46 b2a7f2e0926a more fixes for 64 bit format carl parents: 45 diff changeset	941 DEBUG_ENT("write_separate_attachment");
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	942
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	943 if (!attach->data.data) {
164 ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	944 // make sure we can fetch data from the id
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	945 pst_index_ll *ptr = pst_getID(pst, attach->i_id);
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	946 if (!ptr) {
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	947 DEBUG_WARN(("Couldn't find i_id %#"PRIx64". Cannot save attachment to file\n", attach->i_id));
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	948 DEBUG_RET();
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	949 return;
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	950 }
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	951 }
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	952
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	953 check_filename(f_name);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	954 if (!attach_filename) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	955 // generate our own (dummy) filename for the attachement
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	956 temp = pst_malloc(strlen(f_name)+15);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	957 sprintf(temp, "%s-attach%i", f_name, attach_num);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	958 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	959 // have an attachment name, make sure it's unique
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	960 temp = pst_malloc(strlen(f_name)+strlen(attach_filename)+15);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	961 do {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	962 if (fp) fclose(fp);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	963 if (x == 0)
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	964 sprintf(temp, "%s-%s", f_name, attach_filename);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	965 else
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	966 sprintf(temp, "%s-%s-%i", f_name, attach_filename, x);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	967 } while ((fp = fopen(temp, "r")) && ++x < 99999999);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	968 if (x > 99999999) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	969 DIE(("error finding attachment name. exhausted possibilities to %s\n", temp));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	970 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	971 }
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	972 DEBUG_INFO(("Saving attachment to %s\n", temp));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	973 if (!(fp = fopen(temp, "w"))) {
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	974 DEBUG_WARN(("write_separate_attachment: Cannot open attachment save file \"%s\"\n", temp));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	975 } else {
195 320cfcba8058 add python module interface to the shared library for easy scripting. Carl Byington <carl@five-ten-sg.com> parents: 191 diff changeset	976 (void)pst_attach_to_file(pst, attach, fp);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	977 fclose(fp);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	978 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	979 if (temp) free(temp);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	980 DEBUG_RET();
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	981 }
73e8959cd86b patches from Arne carl parents: 21 diff changeset	982
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	983
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	984 void write_embedded_message(FILE* f_output, pst_item_attach* attach, char boundary, pst_file pf, char** extra_mime_headers)
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	985 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	986 pst_index_ll *ptr;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	987 DEBUG_ENT("write_embedded_message");
164 ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	988 ptr = pst_getID(pf, attach->i_id);
143 fdc58ad2c758 fix embedded rfc822 messages with attachments Carl Byington <carl@five-ten-sg.com> parents: 142 diff changeset	989
186 0a4f7ecd7452 more cleanup of external names in the shared library Carl Byington <carl@five-ten-sg.com> parents: 182 diff changeset	990 pst_desc_tree d_ptr;
150 06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	991 d_ptr.d_id = 0;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	992 d_ptr.parent_d_id = 0;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	993 d_ptr.assoc_tree = NULL;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	994 d_ptr.desc = ptr;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	995 d_ptr.no_child = 0;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	996 d_ptr.prev = NULL;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	997 d_ptr.next = NULL;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	998 d_ptr.parent = NULL;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	999 d_ptr.child = NULL;
06aa84023b48 rename some structure fields to reflect our better understanding of the pst format Carl Byington <carl@five-ten-sg.com> parents: 146 diff changeset	1000 d_ptr.child_tail = NULL;
143 fdc58ad2c758 fix embedded rfc822 messages with attachments Carl Byington <carl@five-ten-sg.com> parents: 142 diff changeset	1001
fdc58ad2c758 fix embedded rfc822 messages with attachments Carl Byington <carl@five-ten-sg.com> parents: 142 diff changeset	1002 pst_item *item = pst_parse_item(pf, &d_ptr, attach->id2_head);
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1003 // It appears that if the embedded message contains an appointment/
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1004 // calendar item, pst_parse_item returns NULL due to the presence of
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1005 // an unexpected reference type of 0x1048, which seems to represent
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1006 // an array of GUIDs representing a CLSID. It's likely that this is
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1007 // a reference to an internal Outlook COM class.
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1008 // Log the skipped item and continue on.
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1009 if (!item) {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1010 DEBUG_WARN(("write_embedded_message: pst_parse_item was unable to parse the embedded message in attachment ID %llu", attach->i_id));
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1011 } else {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1012 fprintf(f_output, "\n--%s\n", boundary);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1013 fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1014 write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1015 pst_freeItem(item);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1016 }
143 fdc58ad2c758 fix embedded rfc822 messages with attachments Carl Byington <carl@five-ten-sg.com> parents: 142 diff changeset	1017
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1018 DEBUG_RET();
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1019 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1020
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1021
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1022 void write_inline_attachment(FILE* f_output, pst_item_attach* attach, char boundary, pst_file pst)
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1023 {
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1024 char *attach_filename;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1025 DEBUG_ENT("write_inline_attachment");
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1026 DEBUG_INFO(("Attachment Size is %"PRIu64", id %#"PRIx64"\n", (uint64_t)attach->data.size, attach->i_id));
195 320cfcba8058 add python module interface to the shared library for easy scripting. Carl Byington <carl@five-ten-sg.com> parents: 191 diff changeset	1027
320cfcba8058 add python module interface to the shared library for easy scripting. Carl Byington <carl@five-ten-sg.com> parents: 191 diff changeset	1028 if (!attach->data.data) {
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1029 // make sure we can fetch data from the id
164 ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1030 pst_index_ll *ptr = pst_getID(pst, attach->i_id);
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1031 if (!ptr) {
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1032 DEBUG_WARN(("Couldn't find ID pointer. Cannot save attachment to file\n"));
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1033 DEBUG_RET();
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1034 return;
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1035 }
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1036 }
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1037
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1038 fprintf(f_output, "\n--%s\n", boundary);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1039 if (!attach->mimetype.str) {
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1040 fprintf(f_output, "Content-Type: %s\n", MIME_TYPE_DEFAULT);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1041 } else {
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1042 fprintf(f_output, "Content-Type: %s\n", attach->mimetype.str);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1043 }
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1044 fprintf(f_output, "Content-Transfer-Encoding: base64\n");
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1045
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1046 // If there is a long filename (filename2) use that, otherwise
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1047 // use the 8.3 filename (filename1)
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1048 attach_filename = (attach->filename2.str) ? attach->filename2.str : attach->filename1.str;
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1049 if (!attach_filename) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1050 fprintf(f_output, "Content-Disposition: inline\n\n");
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1051 } else {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1052 fprintf(f_output, "Content-Disposition: attachment; filename=\"%s\"\n\n", attach_filename);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1053 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1054
195 320cfcba8058 add python module interface to the shared library for easy scripting. Carl Byington <carl@five-ten-sg.com> parents: 191 diff changeset	1055 (void)pst_attach_to_file_base64(pst, attach, f_output);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1056 fprintf(f_output, "\n\n");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1057 DEBUG_RET();
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1058 }
73e8959cd86b patches from Arne carl parents: 21 diff changeset	1059
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1060
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1061 void header_has_field(char header, char field, int *flag)
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1062 {
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1063 DEBUG_ENT("header_has_field");
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1064 if (my_stristr(header, field) \|\| (strncasecmp(header, field+1, strlen(field)-1) == 0)) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1065 DEBUG_INFO(("header block has %s header\n", field+1));
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1066 *flag = 1;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1067 }
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1068 DEBUG_RET();
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1069 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1070
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1071
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1072 void header_get_subfield(char field, const char subfield, char *body_subfield, size_t size_subfield)
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1073 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1074 if (!field) return;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1075 DEBUG_ENT("header_get_subfield");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1076 char search[60];
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1077 snprintf(search, sizeof(search), " %s=", subfield);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1078 field++;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1079 char *n = header_end_field(field);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1080 char *s = my_stristr(field, search);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1081 if (n && s && (s < n)) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1082 char e, f, save;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1083 s += strlen(search); // skip over subfield=
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1084 if (*s == '"') {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1085 s++;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1086 e = strchr(s, '"');
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1087 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1088 else {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1089 e = strchr(s, ';');
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1090 f = strchr(s, '\n');
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1091 if (e && f && (f < e)) e = f;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1092 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1093 if (!e \|\| (e > n)) e = n; // use the trailing lf as terminator if nothing better
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1094 save = *e;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1095 *e = '\0';
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1096 snprintf(body_subfield, size_subfield, "%s", s); // copy the subfield to our buffer
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1097 *e = save;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1098 DEBUG_INFO(("body %s %s from headers\n", subfield, body_subfield));
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1099 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1100 DEBUG_RET();
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1101 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1102
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1103 char* header_get_field(char header, char field)
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1104 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1105 char *t = my_stristr(header, field);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1106 if (!t && (strncasecmp(header, field+1, strlen(field)-1) == 0)) t = header;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1107 return t;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1108 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1109
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1110
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1111 // return pointer to \n at the end of this header field,
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1112 // or NULL if this field goes to the end of the string.
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1113 char header_end_field(char field)
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1114 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1115 char *e = strchr(field+1, '\n');
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1116 while (e && ((e[1] == ' ') \|\| (e[1] == '\t'))) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1117 e = strchr(e+1, '\n');
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1118 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1119 return e;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1120 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1121
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1122
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1123 void header_strip_field(char header, char field)
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1124 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1125 char *t = header_get_field(header, field);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1126 if (t) {
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1127 char *e = header_end_field(t);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1128 if (e) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1129 if (t == header) e++; // if t is not \n, we don't want to keep the \n at e either.
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1130 while (*e != '\0') {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1131 t = e;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1132 t++;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1133 e++;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1134 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1135 *t = '\0';
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1136 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1137 else {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1138 // this was the last header field, truncate the headers
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1139 *t = '\0';
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1140 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1141 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1142 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1143
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1144
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1145 int test_base64(char *body)
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1146 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1147 int b64 = 0;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1148 uint8_t b = (uint8_t )body;
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1149 DEBUG_ENT("test_base64");
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1150 while (*b != 0) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1151 if ((b < 32) && (b != 9) && (*b != 10)) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1152 DEBUG_INFO(("found base64 byte %d\n", (int)*b));
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1153 DEBUG_HEXDUMPC(body, strlen(body), 0x10);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1154 b64 = 1;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1155 break;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1156 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1157 b++;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1158 }
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1159 DEBUG_RET();
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1160 return b64;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1161 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1162
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1163
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1164 void find_html_charset(char html, char charset, size_t charsetlen)
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1165 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1166 const int index = 1;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1167 const int nmatch = index+1;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1168 regmatch_t match[nmatch];
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1169 DEBUG_ENT("find_html_charset");
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1170 int rc = regexec(&meta_charset_pattern, html, nmatch, match, 0);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1171 if (rc == 0) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1172 int s = match[index].rm_so;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1173 int e = match[index].rm_eo;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1174 if (s != -1) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1175 char save = html[e];
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1176 html[e] = '\0';
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1177 snprintf(charset, charsetlen, "%s", html+s); // copy the html charset
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1178 html[e] = save;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1179 DEBUG_INFO(("charset %s from html text\n", charset));
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1180 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1181 else {
203 9fb600ef4e03 cleanup debug logging Carl Byington <carl@five-ten-sg.com> parents: 202 diff changeset	1182 DEBUG_INFO(("matching %d %d %d %d\n", match[0].rm_so, match[0].rm_eo, match[1].rm_so, match[1].rm_eo));
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1183 DEBUG_HEXDUMPC(html, strlen(html), 0x10);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1184 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1185 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1186 else {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1187 DEBUG_INFO(("regexec returns %d\n", rc));
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1188 }
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1189 DEBUG_RET();
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1190 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1191
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1192
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1193 void find_rfc822_headers(char** extra_mime_headers)
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1194 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1195 DEBUG_ENT("find_rfc822_headers");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1196 char headers = extra_mime_headers;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1197 if (headers) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1198 char temp, t;
146 0695de3b5a98 fix for 64bit on Fedora 11 Carl Byington <carl@five-ten-sg.com> parents: 143 diff changeset	1199 while ((temp = strstr(headers, "\n\n"))) {
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1200 temp[1] = '\0';
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1201 t = header_get_field(headers, "\nContent-Type: ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1202 if (t) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1203 t++;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1204 DEBUG_INFO(("found content type header\n"));
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1205 char *n = strchr(t, '\n');
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1206 char *s = strstr(t, ": ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1207 char *e = strchr(t, ';');
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1208 if (!e \|\| (e > n)) e = n;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1209 if (s && (s < e)) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1210 s += 2;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1211 if (!strncasecmp(s, RFC822, e-s)) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1212 headers = temp+2; // found rfc822 header
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1213 DEBUG_INFO(("found 822 headers\n%s\n", headers));
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1214 break;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1215 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1216 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1217 }
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1218 //DEBUG_INFO(("skipping to next block after\n%s\n", headers));
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1219 headers = temp+2; // skip to next chunk of headers
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1220 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1221 *extra_mime_headers = headers;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1222 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1223 DEBUG_RET();
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1224 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1225
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1226
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1227 void write_body_part(FILE* f_output, pst_string body, char mime, char charset, char boundary, pst_file* pst)
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1228 {
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1229 DEBUG_ENT("write_body_part");
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1230 if (body->is_utf8 && (strcasecmp("utf-8", charset))) {
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1231 // try to convert to the specified charset since the target
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1232 // is not utf-8, and the data came from a unicode (utf16) field
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1233 // and is now in utf-8.
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1234 size_t rc;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1235 DEBUG_INFO(("Convert %s utf-8 to %s\n", mime, charset));
182 b65e8d0a088a more cleanup on external names in the shared object file Carl Byington <carl@five-ten-sg.com> parents: 172 diff changeset	1236 pst_vbuf *newer = pst_vballoc(2);
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1237 rc = pst_vb_utf8to8bit(newer, body->str, strlen(body->str), charset);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1238 if (rc == (size_t)-1) {
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1239 // unable to convert, change the charset to utf8
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1240 free(newer->b);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1241 DEBUG_INFO(("Failed to convert %s utf-8 to %s\n", mime, charset));
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1242 charset = "utf-8";
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1243 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1244 else {
164 ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1245 // null terminate the output string
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1246 pst_vbgrow(newer, 1);
164 ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1247 newer->b[newer->dlen] = '\0';
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1248 free(body->str);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1249 body->str = newer->b;
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1250 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1251 free(newer);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1252 }
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1253 removeCR(body->str);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1254 int base64 = test_base64(body->str);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1255 fprintf(f_output, "\n--%s\n", boundary);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1256 fprintf(f_output, "Content-Type: %s; charset=\"%s\"\n", mime, charset);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1257 if (base64) fprintf(f_output, "Content-Transfer-Encoding: base64\n");
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1258 fprintf(f_output, "\n");
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1259 if (base64) {
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1260 char *enc = pst_base64_encode(body->str, strlen(body->str));
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1261 if (enc) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1262 write_email_body(f_output, enc);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1263 fprintf(f_output, "\n");
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1264 free(enc);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1265 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1266 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1267 else {
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1268 write_email_body(f_output, body->str);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1269 }
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1270 DEBUG_RET();
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1271 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1272
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1273
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1274 void write_schedule_part_data(FILE* f_output, pst_item* item, const char* sender, const char* method)
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1275 {
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1276 fprintf(f_output, "BEGIN:VCALENDAR\n");
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1277 fprintf(f_output, "VERSION:2.0\n");
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1278 fprintf(f_output, "PRODID:LibPST v%s\n", VERSION);
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	1279 if (method) fprintf(f_output, "METHOD:%s\n", method);
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1280 fprintf(f_output, "BEGIN:VEVENT\n");
247 85d77d7b034b another patche from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	1281 if (sender) {
85d77d7b034b another patche from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	1282 if (item->email->outlook_sender_name.str) {
85d77d7b034b another patche from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	1283 fprintf(f_output, "ORGANIZER;CN=\"%s\":MAILTO:%s\n", item->email->outlook_sender_name.str, sender);
85d77d7b034b another patche from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	1284 } else {
85d77d7b034b another patche from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	1285 fprintf(f_output, "ORGANIZER;CN=\"\":MAILTO:%s\n", sender);
85d77d7b034b another patche from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	1286 }
85d77d7b034b another patche from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 246 diff changeset	1287 }
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1288 write_appointment(f_output, item);
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1289 fprintf(f_output, "END:VCALENDAR\n");
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1290 }
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1291
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1292
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1293 void write_schedule_part(FILE* f_output, pst_item* item, const char* sender, const char* boundary)
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1294 {
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1295 const char* method = "REQUEST";
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1296 const char* charset = "utf-8";
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1297 char fname[30];
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1298 if (!item->appointment) return;
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1299
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1300 // inline appointment request
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1301 fprintf(f_output, "\n--%s\n", boundary);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1302 fprintf(f_output, "Content-Type: %s; method=\"%s\"; charset=\"%s\"\n\n", "text/calendar", method, charset);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1303 write_schedule_part_data(f_output, item, sender, method);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1304 fprintf(f_output, "\n");
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1305
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1306 // attachment appointment request
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1307 snprintf(fname, sizeof(fname), "i%i.ics", rand());
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1308 fprintf(f_output, "\n--%s\n", boundary);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1309 fprintf(f_output, "Content-Type: %s; charset=\"%s\"; name=\"%s\"\n", "text/calendar", "utf-8", fname);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1310 fprintf(f_output, "Content-Disposition: attachment; filename=\"%s\"\n\n", fname);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1311 write_schedule_part_data(f_output, item, sender, method);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1312 fprintf(f_output, "\n");
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1313 }
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1314
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1315
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1316 void write_normal_email(FILE* f_output, char f_name[], pst_item* item, int mode, int mode_MH, pst_file* pst, int save_rtf, char** extra_mime_headers)
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1317 {
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1318 char boundary[60];
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1319 char altboundary[66];
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1320 char *altboundaryp = NULL;
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1321 char body_charset[30];
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1322 char buffer_charset[30];
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1323 char body_report[60];
129 fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1324 char sender[60];
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1325 int sender_known = 0;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1326 char *temp = NULL;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1327 time_t em_time;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1328 char *c_time;
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1329 char *headers = NULL;
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1330 int has_from, has_subject, has_to, has_cc, has_date, has_msgid;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1331 has_from = has_subject = has_to = has_cc = has_date = has_msgid = 0;
46 b2a7f2e0926a more fixes for 64 bit format carl parents: 45 diff changeset	1332 DEBUG_ENT("write_normal_email");
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1333
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1334 pst_convert_utf8_null(item, &item->email->header);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1335 headers = (item->email->header.str) ? item->email->header.str : *extra_mime_headers;
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1336
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1337 // setup default body character set and report type
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1338 strncpy(body_charset, pst_default_charset(item, sizeof(buffer_charset), buffer_charset), sizeof(body_charset));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1339 body_charset[sizeof(body_charset)-1] = '\0';
234 ed0cb66b23d4 better detection of dsn delivery reports Carl Byington <carl@five-ten-sg.com> parents: 233 diff changeset	1340 strncpy(body_report, "delivery-status", sizeof(body_report));
ed0cb66b23d4 better detection of dsn delivery reports Carl Byington <carl@five-ten-sg.com> parents: 233 diff changeset	1341 body_report[sizeof(body_report)-1] = '\0';
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1342
129 fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1343 // setup default sender
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1344 pst_convert_utf8(item, &item->email->sender_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1345 if (item->email->sender_address.str && strchr(item->email->sender_address.str, '@')) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1346 temp = item->email->sender_address.str;
129 fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1347 sender_known = 1;
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1348 }
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1349 else {
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1350 temp = "MAILER-DAEMON";
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1351 }
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1352 strncpy(sender, temp, sizeof(sender));
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1353 sender[sizeof(sender)-1] = '\0';
129 fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1354
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1355 // convert the sent date if it exists, or set it to a fixed date
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1356 if (item->email->sent_date) {
182 b65e8d0a088a more cleanup on external names in the shared object file Carl Byington <carl@five-ten-sg.com> parents: 172 diff changeset	1357 em_time = pst_fileTimeToUnixTime(item->email->sent_date);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1358 c_time = ctime(&em_time);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1359 if (c_time)
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1360 c_time[strlen(c_time)-1] = '\0'; //remove end \n
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1361 else
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1362 c_time = "Fri Dec 28 12:06:21 2001";
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1363 } else
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1364 c_time= "Fri Dec 28 12:06:21 2001";
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1365
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1366 // create our MIME boundaries here.
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1367 snprintf(boundary, sizeof(boundary), "--boundary-LibPST-iamunique-%i_-_-", rand());
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1368 snprintf(altboundary, sizeof(altboundary), "alt-%s", boundary);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1369
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1370 // we will always look at the headers to discover some stuff
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1371 if (headers ) {
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1372 char *t;
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1373 removeCR(headers);
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1374
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1375 temp = strstr(headers, "\n\n");
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1376 if (temp) {
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1377 // cut off our real rfc822 headers here
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1378 temp[1] = '\0';
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1379 // pointer to all the embedded MIME headers.
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1380 // we use these to find the actual rfc822 headers for embedded message/rfc822 mime parts
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1381 *extra_mime_headers = temp+2;
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1382 DEBUG_INFO(("Found extra mime headers\n%s\n", temp+2));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1383 }
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1384
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1385 // Check if the headers have all the necessary fields
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1386 header_has_field(headers, "\nFrom: ", &has_from);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1387 header_has_field(headers, "\nTo: ", &has_to);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1388 header_has_field(headers, "\nSubject: ", &has_subject);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1389 header_has_field(headers, "\nDate: ", &has_date);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1390 header_has_field(headers, "\nCC: ", &has_cc);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1391 header_has_field(headers, "\nMessage-Id: ", &has_msgid);
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1392
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1393 // look for charset and report-type in Content-Type header
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1394 t = header_get_field(headers, "\nContent-Type: ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1395 header_get_subfield(t, "charset", body_charset, sizeof(body_charset));
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1396 header_get_subfield(t, "report-type", body_report, sizeof(body_report));
100 1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	1397
129 fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1398 // derive a proper sender email address
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1399 if (!sender_known) {
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1400 t = header_get_field(headers, "\nFrom: ");
129 fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1401 if (t) {
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1402 // assume address is on the first line, rather than on a continuation line
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1403 t++;
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1404 char *n = strchr(t, '\n');
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1405 char *s = strchr(t, '<');
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1406 char *e = strchr(t, '>');
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1407 if (s && e && n && (s < e) && (e < n)) {
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1408 char save = *e;
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1409 *e = '\0';
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1410 snprintf(sender, sizeof(sender), "%s", s+1);
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1411 *e = save;
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1412 }
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1413 }
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1414 }
fc11b1d1ad34 fix initial from header in mbox format. Carl Byington <carl@five-ten-sg.com> parents: 125 diff changeset	1415
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1416 // Strip out the mime headers and some others that we don't want to emit
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1417 header_strip_field(headers, "\nMicrosoft Mail Internet Headers");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1418 header_strip_field(headers, "\nMIME-Version: ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1419 header_strip_field(headers, "\nContent-Type: ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1420 header_strip_field(headers, "\nContent-Transfer-Encoding: ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1421 header_strip_field(headers, "\nContent-class: ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1422 header_strip_field(headers, "\nX-MimeOLE: ");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1423 header_strip_field(headers, "\nBcc:");
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1424 header_strip_field(headers, "\nX-From_: ");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1425 }
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1426
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1427 DEBUG_INFO(("About to print Header\n"));
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1428
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1429 if (item && item->subject.str) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1430 pst_convert_utf8(item, &item->subject);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1431 DEBUG_INFO(("item->subject = %s\n", item->subject.str));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1432 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1433
139 1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1434 if (mode != MODE_SEPARATE) {
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1435 // most modes need this separator line.
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1436 // procmail produces this separator without the quotes around the
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1437 // sender email address, but apparently some Mac email client needs
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1438 // those quotes, and they don't seem to cause problems for anyone else.
2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1439 fprintf(f_output, "From \"%s\" %s\n", sender, c_time);
139 1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1440 }
1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1441
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1442 // print the supplied email headers
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1443 if (headers) {
230 42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	1444 int len = strlen(headers);
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	1445 if (len > 0) {
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	1446 fprintf(f_output, "%s", headers);
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	1447 // make sure the headers end with a \n
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	1448 if (headers[len-1] != '\n') fprintf(f_output, "\n");
42b38d65f7e4 patches from Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 213 diff changeset	1449 }
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1450 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1451
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1452 // create required header fields that are not already written
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1453
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1454 if (!has_from) {
246 5a82d41c883d patches from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 242 diff changeset	1455 if (item->email->outlook_sender_name.str){
5a82d41c883d patches from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 242 diff changeset	1456 fprintf(f_output, "From: \"%s\" <%s>\n", item->email->outlook_sender_name.str, sender);
5a82d41c883d patches from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 242 diff changeset	1457 } else {
5a82d41c883d patches from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 242 diff changeset	1458 fprintf(f_output, "From: <%s>\n", sender);
5a82d41c883d patches from Kenneth Berland for solaris Carl Byington <carl@five-ten-sg.com> parents: 242 diff changeset	1459 }
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1460 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1461
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1462 if (!has_subject) {
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1463 if (item->subject.str) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1464 fprintf(f_output, "Subject: %s\n", item->subject.str);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1465 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1466 fprintf(f_output, "Subject: \n");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1467 }
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1468 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1469
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1470 if (!has_to && item->email->sentto_address.str) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1471 pst_convert_utf8(item, &item->email->sentto_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1472 fprintf(f_output, "To: %s\n", item->email->sentto_address.str);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1473 }
100 1e4a7610d525 fixes from Justin Greer to add -D option to include deleted items, to add missing email headers, to fix bug in my_stristr() Carl Byington <carl@five-ten-sg.com> parents: 79 diff changeset	1474
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1475 if (!has_cc && item->email->cc_address.str) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1476 pst_convert_utf8(item, &item->email->cc_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1477 fprintf(f_output, "Cc: %s\n", item->email->cc_address.str);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1478 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1479
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1480 if (!has_date && item->email->sent_date) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1481 char c_time[C_TIME_SIZE];
200 d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	1482 struct tm stm;
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	1483 gmtime_r(&em_time, &stm);
d360f96f71f6 start changes for parallel readpst on multi-processor machines Carl Byington <carl@five-ten-sg.com> parents: 199 diff changeset	1484 strftime(c_time, C_TIME_SIZE, "%a, %d %b %Y %H:%M:%S %z", &stm);
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1485 fprintf(f_output, "Date: %s\n", c_time);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1486 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1487
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1488 if (!has_msgid && item->email->messageid.str) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1489 pst_convert_utf8(item, &item->email->messageid);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1490 fprintf(f_output, "Message-Id: %s\n", item->email->messageid.str);
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1491 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1492
139 1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1493 // add forensic headers to capture some .pst stuff that is not really
1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1494 // needed or used by mail clients
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1495 pst_convert_utf8_null(item, &item->email->sender_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1496 if (item->email->sender_address.str && !strchr(item->email->sender_address.str, '@')
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1497 && strcmp(item->email->sender_address.str, ".")
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1498 && (strlen(item->email->sender_address.str) > 0)) {
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1499 fprintf(f_output, "X-libpst-forensic-sender: %s\n", item->email->sender_address.str);
139 1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1500 }
1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1501
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1502 if (item->email->bcc_address.str) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1503 pst_convert_utf8(item, &item->email->bcc_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1504 fprintf(f_output, "X-libpst-forensic-bcc: %s\n", item->email->bcc_address.str);
139 1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1505 }
1b3922080ca8 add forensic headers to capture some other data of interest; switch back to quoted From separator line Carl Byington <carl@five-ten-sg.com> parents: 129 diff changeset	1506
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1507 // add our own mime headers
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1508 fprintf(f_output, "MIME-Version: 1.0\n");
234 ed0cb66b23d4 better detection of dsn delivery reports Carl Byington <carl@five-ten-sg.com> parents: 233 diff changeset	1509 if (item->type == PST_TYPE_REPORT) {
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1510 // multipart/report for DSN/MDN reports
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1511 fprintf(f_output, "Content-Type: multipart/report; report-type=%s;\n\tboundary=\"%s\"\n", body_report, boundary);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1512 }
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1513 else {
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1514 fprintf(f_output, "Content-Type: multipart/mixed;\n\tboundary=\"%s\"\n", boundary);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1515 }
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1516 fprintf(f_output, "\n"); // end of headers, start of body
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1517
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1518 // now dump the body parts
234 ed0cb66b23d4 better detection of dsn delivery reports Carl Byington <carl@five-ten-sg.com> parents: 233 diff changeset	1519 if ((item->type == PST_TYPE_REPORT) && (item->email->report_text.str)) {
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1520 write_body_part(f_output, &item->email->report_text, "text/plain", body_charset, boundary, pst);
142 2189a6b8134e improve character set handling - don't try to convert utf-8 to single byte for fields that were not originally unicode. Carl Byington <carl@five-ten-sg.com> parents: 141 diff changeset	1521 fprintf(f_output, "\n");
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1522 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1523
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1524 if (item->body.str && item->email->htmlbody.str) {
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1525 // start the nested alternative part
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1526 fprintf(f_output, "\n--%s\n", boundary);
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1527 fprintf(f_output, "Content-Type: multipart/alternative;\n\tboundary=\"%s\"\n", altboundary);
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1528 altboundaryp = altboundary;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1529 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1530 else {
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1531 altboundaryp = boundary;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1532 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1533
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1534 if (item->body.str) {
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1535 write_body_part(f_output, &item->body, "text/plain", body_charset, altboundaryp, pst);
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1536 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1537
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1538 if (item->email->htmlbody.str) {
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1539 find_html_charset(item->email->htmlbody.str, body_charset, sizeof(body_charset));
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1540 write_body_part(f_output, &item->email->htmlbody, "text/html", body_charset, altboundaryp, pst);
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1541 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1542
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1543 if (item->body.str && item->email->htmlbody.str) {
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1544 // end the nested alternative part
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1545 fprintf(f_output, "\n--%s--\n", altboundary);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1546 }
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1547
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	1548 if (item->email->rtf_compressed.data && save_rtf) {
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1549 pst_item_attach* attach = (pst_item_attach*)pst_malloc(sizeof(pst_item_attach));
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1550 DEBUG_INFO(("Adding RTF body as attachment\n"));
125 23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1551 memset(attach, 0, sizeof(pst_item_attach));
23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1552 attach->next = item->attach;
23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1553 item->attach = attach;
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1554 attach->data.data = pst_lzfu_decompress(item->email->rtf_compressed.data, item->email->rtf_compressed.size, &attach->data.size);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1555 attach->filename2.str = strdup(RTF_ATTACH_NAME);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1556 attach->filename2.is_utf8 = 1;
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1557 attach->mimetype.str = strdup(RTF_ATTACH_TYPE);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1558 attach->mimetype.is_utf8 = 1;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1559 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1560
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1561 if (item->email->encrypted_body.data) {
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1562 pst_item_attach* attach = (pst_item_attach*)pst_malloc(sizeof(pst_item_attach));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1563 DEBUG_INFO(("Adding encrypted text body as attachment\n"));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1564 attach = (pst_item_attach*) pst_malloc(sizeof(pst_item_attach));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1565 memset(attach, 0, sizeof(pst_item_attach));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1566 attach->next = item->attach;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1567 item->attach = attach;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1568 attach->data.data = item->email->encrypted_body.data;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1569 attach->data.size = item->email->encrypted_body.size;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1570 item->email->encrypted_body.data = NULL;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1571 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1572
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1573 if (item->email->encrypted_htmlbody.data) {
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1574 pst_item_attach* attach = (pst_item_attach*)pst_malloc(sizeof(pst_item_attach));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1575 DEBUG_INFO(("Adding encrypted HTML body as attachment\n"));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1576 attach = (pst_item_attach*) pst_malloc(sizeof(pst_item_attach));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1577 memset(attach, 0, sizeof(pst_item_attach));
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1578 attach->next = item->attach;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1579 item->attach = attach;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1580 attach->data.data = item->email->encrypted_htmlbody.data;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1581 attach->data.size = item->email->encrypted_htmlbody.size;
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1582 item->email->encrypted_htmlbody.data = NULL;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1583 }
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1584
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1585 if (item->type == PST_TYPE_SCHEDULE) {
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1586 write_schedule_part(f_output, item, sender, boundary);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1587 }
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1588
121 8399ef94c11b strip and regenerate all MIME headers to avoid duplicates. Carl Byington <carl@five-ten-sg.com> parents: 120 diff changeset	1589 // other attachments
125 23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1590 {
23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1591 pst_item_attach* attach;
191 4b498fd68464 add pst_attach_to_mem() back into the shared library interface. Carl Byington <carl@five-ten-sg.com> parents: 186 diff changeset	1592 int attach_num = 0;
125 23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1593 for (attach = item->attach; attach; attach = attach->next) {
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1594 pst_convert_utf8_null(item, &attach->filename1);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1595 pst_convert_utf8_null(item, &attach->filename2);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1596 pst_convert_utf8_null(item, &attach->mimetype);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1597 DEBUG_INFO(("Attempting Attachment encoding\n"));
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1598 if (attach->method == PST_ATTACH_EMBEDDED) {
236 093e0e9248bb cleanup rfc822 embedded message code Carl Byington <carl@five-ten-sg.com> parents: 234 diff changeset	1599 DEBUG_INFO(("have an embedded rfc822 message attachment\n"));
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1600 if (attach->mimetype.str) {
236 093e0e9248bb cleanup rfc822 embedded message code Carl Byington <carl@five-ten-sg.com> parents: 234 diff changeset	1601 DEBUG_INFO(("which already has a mime-type of %s\n", attach->mimetype.str));
233 1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1602 free(attach->mimetype.str);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1603 }
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1604 attach->mimetype.str = strdup(RFC822);
1d50ff3c5091 better rfc822 embedded message decoding Carl Byington <carl@five-ten-sg.com> parents: 231 diff changeset	1605 attach->mimetype.is_utf8 = 1;
141 fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1606 find_rfc822_headers(extra_mime_headers);
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types Carl Byington <carl@five-ten-sg.com> parents: 139 diff changeset	1607 write_embedded_message(f_output, attach, boundary, pst, extra_mime_headers);
125 23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1608 }
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	1609 else if (attach->data.data \|\| attach->i_id) {
164 ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1610 if (mode == MODE_SEPARATE && !mode_MH)
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1611 write_separate_attachment(f_name, attach, ++attach_num, pst);
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1612 else
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1613 write_inline_attachment(f_output, attach, boundary, pst);
ab384fed78c5 Compensate for iconv conversion to utf-7 that produces strings that are not null terminated. Carl Byington <carl@five-ten-sg.com> parents: 154 diff changeset	1614 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1615 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1616 }
125 23a36ac0514d recover dropped pragma pack line, use int64_t rather than off_t to avoid forcing users of the shared library to enable large file support. Carl Byington <carl@five-ten-sg.com> parents: 123 diff changeset	1617
205 5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts Carl Byington <carl@five-ten-sg.com> parents: 203 diff changeset	1618 fprintf(f_output, "\n--%s--\n\n", boundary);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1619 DEBUG_RET();
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1620 }
73e8959cd86b patches from Arne carl parents: 21 diff changeset	1621
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1622
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1623 void write_vcard(FILE* f_output, pst_item* item, pst_item_contact* contact, char comment[])
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1624 {
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1625 char* result = NULL;
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1626 size_t resultlen = 0;
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1627 char time_buffer[30];
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1628 // We can only call rfc escape once per printf, since the second call
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1629 // may free the buffer returned by the first call.
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1630 // I had tried to place those into a single printf - Carl.
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1631
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1632 DEBUG_ENT("write_vcard");
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1633
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1634 // make everything utf8
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1635 pst_convert_utf8_null(item, &contact->fullname);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1636 pst_convert_utf8_null(item, &contact->surname);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1637 pst_convert_utf8_null(item, &contact->first_name);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1638 pst_convert_utf8_null(item, &contact->middle_name);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1639 pst_convert_utf8_null(item, &contact->display_name_prefix);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1640 pst_convert_utf8_null(item, &contact->suffix);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1641 pst_convert_utf8_null(item, &contact->nickname);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1642 pst_convert_utf8_null(item, &contact->address1);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1643 pst_convert_utf8_null(item, &contact->address2);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1644 pst_convert_utf8_null(item, &contact->address3);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1645 pst_convert_utf8_null(item, &contact->home_po_box);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1646 pst_convert_utf8_null(item, &contact->home_street);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1647 pst_convert_utf8_null(item, &contact->home_city);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1648 pst_convert_utf8_null(item, &contact->home_state);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1649 pst_convert_utf8_null(item, &contact->home_postal_code);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1650 pst_convert_utf8_null(item, &contact->home_country);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1651 pst_convert_utf8_null(item, &contact->home_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1652 pst_convert_utf8_null(item, &contact->business_po_box);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1653 pst_convert_utf8_null(item, &contact->business_street);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1654 pst_convert_utf8_null(item, &contact->business_city);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1655 pst_convert_utf8_null(item, &contact->business_state);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1656 pst_convert_utf8_null(item, &contact->business_postal_code);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1657 pst_convert_utf8_null(item, &contact->business_country);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1658 pst_convert_utf8_null(item, &contact->business_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1659 pst_convert_utf8_null(item, &contact->other_po_box);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1660 pst_convert_utf8_null(item, &contact->other_street);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1661 pst_convert_utf8_null(item, &contact->other_city);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1662 pst_convert_utf8_null(item, &contact->other_state);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1663 pst_convert_utf8_null(item, &contact->other_postal_code);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1664 pst_convert_utf8_null(item, &contact->other_country);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1665 pst_convert_utf8_null(item, &contact->other_address);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1666 pst_convert_utf8_null(item, &contact->business_fax);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1667 pst_convert_utf8_null(item, &contact->business_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1668 pst_convert_utf8_null(item, &contact->business_phone2);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1669 pst_convert_utf8_null(item, &contact->car_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1670 pst_convert_utf8_null(item, &contact->home_fax);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1671 pst_convert_utf8_null(item, &contact->home_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1672 pst_convert_utf8_null(item, &contact->home_phone2);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1673 pst_convert_utf8_null(item, &contact->isdn_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1674 pst_convert_utf8_null(item, &contact->mobile_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1675 pst_convert_utf8_null(item, &contact->other_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1676 pst_convert_utf8_null(item, &contact->pager_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1677 pst_convert_utf8_null(item, &contact->primary_fax);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1678 pst_convert_utf8_null(item, &contact->primary_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1679 pst_convert_utf8_null(item, &contact->radio_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1680 pst_convert_utf8_null(item, &contact->telex);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1681 pst_convert_utf8_null(item, &contact->job_title);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1682 pst_convert_utf8_null(item, &contact->profession);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1683 pst_convert_utf8_null(item, &contact->assistant_name);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1684 pst_convert_utf8_null(item, &contact->assistant_phone);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1685 pst_convert_utf8_null(item, &contact->company_name);
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1686 pst_convert_utf8_null(item, &item->body);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1687
50 fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1688 // the specification I am following is (hopefully) RFC2426 vCard Mime Directory Profile
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1689 fprintf(f_output, "BEGIN:VCARD\n");
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1690 fprintf(f_output, "FN:%s\n", pst_rfc2426_escape(contact->fullname.str, &result, &resultlen));
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1691
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1692 //fprintf(f_output, "N:%s;%s;%s;%s;%s\n",
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1693 fprintf(f_output, "N:%s;", (!contact->surname.str) ? "" : pst_rfc2426_escape(contact->surname.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1694 fprintf(f_output, "%s;", (!contact->first_name.str) ? "" : pst_rfc2426_escape(contact->first_name.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1695 fprintf(f_output, "%s;", (!contact->middle_name.str) ? "" : pst_rfc2426_escape(contact->middle_name.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1696 fprintf(f_output, "%s;", (!contact->display_name_prefix.str) ? "" : pst_rfc2426_escape(contact->display_name_prefix.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1697 fprintf(f_output, "%s\n", (!contact->suffix.str) ? "" : pst_rfc2426_escape(contact->suffix.str, &result, &resultlen));
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1698
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1699 if (contact->nickname.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1700 fprintf(f_output, "NICKNAME:%s\n", pst_rfc2426_escape(contact->nickname.str, &result, &resultlen));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1701 if (contact->address1.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1702 fprintf(f_output, "EMAIL:%s\n", pst_rfc2426_escape(contact->address1.str, &result, &resultlen));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1703 if (contact->address2.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1704 fprintf(f_output, "EMAIL:%s\n", pst_rfc2426_escape(contact->address2.str, &result, &resultlen));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1705 if (contact->address3.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1706 fprintf(f_output, "EMAIL:%s\n", pst_rfc2426_escape(contact->address3.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1707 if (contact->birthday)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1708 fprintf(f_output, "BDAY:%s\n", pst_rfc2425_datetime_format(contact->birthday, sizeof(time_buffer), time_buffer));
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1709
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1710 if (contact->home_address.str) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1711 //fprintf(f_output, "ADR;TYPE=home:%s;%s;%s;%s;%s;%s;%s\n",
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1712 fprintf(f_output, "ADR;TYPE=home:%s;", (!contact->home_po_box.str) ? "" : pst_rfc2426_escape(contact->home_po_box.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1713 fprintf(f_output, "%s;", ""); // extended Address
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1714 fprintf(f_output, "%s;", (!contact->home_street.str) ? "" : pst_rfc2426_escape(contact->home_street.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1715 fprintf(f_output, "%s;", (!contact->home_city.str) ? "" : pst_rfc2426_escape(contact->home_city.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1716 fprintf(f_output, "%s;", (!contact->home_state.str) ? "" : pst_rfc2426_escape(contact->home_state.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1717 fprintf(f_output, "%s;", (!contact->home_postal_code.str) ? "" : pst_rfc2426_escape(contact->home_postal_code.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1718 fprintf(f_output, "%s\n", (!contact->home_country.str) ? "" : pst_rfc2426_escape(contact->home_country.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1719 fprintf(f_output, "LABEL;TYPE=home:%s\n", pst_rfc2426_escape(contact->home_address.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1720 }
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1721
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1722 if (contact->business_address.str) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1723 //fprintf(f_output, "ADR;TYPE=work:%s;%s;%s;%s;%s;%s;%s\n",
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1724 fprintf(f_output, "ADR;TYPE=work:%s;", (!contact->business_po_box.str) ? "" : pst_rfc2426_escape(contact->business_po_box.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1725 fprintf(f_output, "%s;", ""); // extended Address
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1726 fprintf(f_output, "%s;", (!contact->business_street.str) ? "" : pst_rfc2426_escape(contact->business_street.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1727 fprintf(f_output, "%s;", (!contact->business_city.str) ? "" : pst_rfc2426_escape(contact->business_city.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1728 fprintf(f_output, "%s;", (!contact->business_state.str) ? "" : pst_rfc2426_escape(contact->business_state.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1729 fprintf(f_output, "%s;", (!contact->business_postal_code.str) ? "" : pst_rfc2426_escape(contact->business_postal_code.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1730 fprintf(f_output, "%s\n", (!contact->business_country.str) ? "" : pst_rfc2426_escape(contact->business_country.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1731 fprintf(f_output, "LABEL;TYPE=work:%s\n", pst_rfc2426_escape(contact->business_address.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1732 }
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1733
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1734 if (contact->other_address.str) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1735 //fprintf(f_output, "ADR;TYPE=postal:%s;%s;%s;%s;%s;%s;%s\n",
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1736 fprintf(f_output, "ADR;TYPE=postal:%s;",(!contact->other_po_box.str) ? "" : pst_rfc2426_escape(contact->other_po_box.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1737 fprintf(f_output, "%s;", ""); // extended Address
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1738 fprintf(f_output, "%s;", (!contact->other_street.str) ? "" : pst_rfc2426_escape(contact->other_street.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1739 fprintf(f_output, "%s;", (!contact->other_city.str) ? "" : pst_rfc2426_escape(contact->other_city.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1740 fprintf(f_output, "%s;", (!contact->other_state.str) ? "" : pst_rfc2426_escape(contact->other_state.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1741 fprintf(f_output, "%s;", (!contact->other_postal_code.str) ? "" : pst_rfc2426_escape(contact->other_postal_code.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1742 fprintf(f_output, "%s\n", (!contact->other_country.str) ? "" : pst_rfc2426_escape(contact->other_country.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1743 fprintf(f_output, "LABEL;TYPE=postal:%s\n", pst_rfc2426_escape(contact->other_address.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1744 }
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1745
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1746 if (contact->business_fax.str) fprintf(f_output, "TEL;TYPE=work,fax:%s\n", pst_rfc2426_escape(contact->business_fax.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1747 if (contact->business_phone.str) fprintf(f_output, "TEL;TYPE=work,voice:%s\n", pst_rfc2426_escape(contact->business_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1748 if (contact->business_phone2.str) fprintf(f_output, "TEL;TYPE=work,voice:%s\n", pst_rfc2426_escape(contact->business_phone2.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1749 if (contact->car_phone.str) fprintf(f_output, "TEL;TYPE=car,voice:%s\n", pst_rfc2426_escape(contact->car_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1750 if (contact->home_fax.str) fprintf(f_output, "TEL;TYPE=home,fax:%s\n", pst_rfc2426_escape(contact->home_fax.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1751 if (contact->home_phone.str) fprintf(f_output, "TEL;TYPE=home,voice:%s\n", pst_rfc2426_escape(contact->home_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1752 if (contact->home_phone2.str) fprintf(f_output, "TEL;TYPE=home,voice:%s\n", pst_rfc2426_escape(contact->home_phone2.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1753 if (contact->isdn_phone.str) fprintf(f_output, "TEL;TYPE=isdn:%s\n", pst_rfc2426_escape(contact->isdn_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1754 if (contact->mobile_phone.str) fprintf(f_output, "TEL;TYPE=cell,voice:%s\n", pst_rfc2426_escape(contact->mobile_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1755 if (contact->other_phone.str) fprintf(f_output, "TEL;TYPE=msg:%s\n", pst_rfc2426_escape(contact->other_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1756 if (contact->pager_phone.str) fprintf(f_output, "TEL;TYPE=pager:%s\n", pst_rfc2426_escape(contact->pager_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1757 if (contact->primary_fax.str) fprintf(f_output, "TEL;TYPE=fax,pref:%s\n", pst_rfc2426_escape(contact->primary_fax.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1758 if (contact->primary_phone.str) fprintf(f_output, "TEL;TYPE=phone,pref:%s\n", pst_rfc2426_escape(contact->primary_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1759 if (contact->radio_phone.str) fprintf(f_output, "TEL;TYPE=pcs:%s\n", pst_rfc2426_escape(contact->radio_phone.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1760 if (contact->telex.str) fprintf(f_output, "TEL;TYPE=bbs:%s\n", pst_rfc2426_escape(contact->telex.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1761 if (contact->job_title.str) fprintf(f_output, "TITLE:%s\n", pst_rfc2426_escape(contact->job_title.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1762 if (contact->profession.str) fprintf(f_output, "ROLE:%s\n", pst_rfc2426_escape(contact->profession.str, &result, &resultlen));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1763 if (contact->assistant_name.str \|\| contact->assistant_phone.str) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1764 fprintf(f_output, "AGENT:BEGIN:VCARD\n");
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1765 if (contact->assistant_name.str) fprintf(f_output, "FN:%s\n", pst_rfc2426_escape(contact->assistant_name.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1766 if (contact->assistant_phone.str) fprintf(f_output, "TEL:%s\n", pst_rfc2426_escape(contact->assistant_phone.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1767 }
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1768 if (contact->company_name.str) fprintf(f_output, "ORG:%s\n", pst_rfc2426_escape(contact->company_name.str, &result, &resultlen));
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1769 if (comment) fprintf(f_output, "NOTE:%s\n", pst_rfc2426_escape(comment, &result, &resultlen));
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1770 if (item->body.str) fprintf(f_output, "NOTE:%s\n", pst_rfc2426_escape(item->body.str, &result, &resultlen));
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1771
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1772 write_extra_categories(f_output, item);
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1773
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1774 fprintf(f_output, "VERSION: 3.0\n");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1775 fprintf(f_output, "END:VCARD\n\n");
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1776 if (result) free(result);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1777 DEBUG_RET();
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1778 }
73e8959cd86b patches from Arne carl parents: 21 diff changeset	1779
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1780
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1781 /**
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1782 * write extra vcard or vcalendar categories from the extra keywords fields
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1783 *
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1784 * @param f_output open file pointer
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1785 * @param item pst item containing the keywords
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1786 * @return true if we write a categories line
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1787 */
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1788 int write_extra_categories(FILE* f_output, pst_item* item)
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1789 {
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1790 char* result = NULL;
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1791 size_t resultlen = 0;
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1792 pst_item_extra_field *ef = item->extra_fields;
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1793 const char *fmt = "CATEGORIES:%s";
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1794 int category_started = 0;
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1795 while (ef) {
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1796 if (strcmp(ef->field_name, "Keywords") == 0) {
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1797 fprintf(f_output, fmt, pst_rfc2426_escape(ef->value, &result, &resultlen));
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1798 fmt = ", %s";
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1799 category_started = 1;
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1800 }
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1801 ef = ef->next;
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1802 }
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1803 if (category_started) fprintf(f_output, "\n");
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1804 if (result) free(result);
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1805 return category_started;
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1806 }
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1807
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1808
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1809 void write_journal(FILE* f_output, pst_item* item)
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1810 {
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1811 char* result = NULL;
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1812 size_t resultlen = 0;
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1813 char time_buffer[30];
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1814 pst_item_journal* journal = item->journal;
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1815
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1816 // make everything utf8
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1817 pst_convert_utf8_null(item, &item->subject);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1818 pst_convert_utf8_null(item, &item->body);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1819
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1820 fprintf(f_output, "BEGIN:VJOURNAL\n");
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1821 fprintf(f_output, "DTSTAMP:%s\n", pst_rfc2445_datetime_format_now(sizeof(time_buffer), time_buffer));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1822 if (item->create_date)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1823 fprintf(f_output, "CREATED:%s\n", pst_rfc2445_datetime_format(item->create_date, sizeof(time_buffer), time_buffer));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1824 if (item->modify_date)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1825 fprintf(f_output, "LAST-MOD:%s\n", pst_rfc2445_datetime_format(item->modify_date, sizeof(time_buffer), time_buffer));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1826 if (item->subject.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1827 fprintf(f_output, "SUMMARY:%s\n", pst_rfc2426_escape(item->subject.str, &result, &resultlen));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1828 if (item->body.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1829 fprintf(f_output, "DESCRIPTION:%s\n", pst_rfc2426_escape(item->body.str, &result, &resultlen));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1830 if (journal && journal->start)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1831 fprintf(f_output, "DTSTART;VALUE=DATE-TIME:%s\n", pst_rfc2445_datetime_format(journal->start, sizeof(time_buffer), time_buffer));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1832 fprintf(f_output, "END:VJOURNAL\n");
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1833 if (result) free(result);
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1834 }
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1835
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1836
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1837 void write_appointment(FILE* f_output, pst_item* item)
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1838 {
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1839 char* result = NULL;
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1840 size_t resultlen = 0;
94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1841 char time_buffer[30];
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1842 pst_item_appointment* appointment = item->appointment;
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1843
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1844 // make everything utf8
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1845 pst_convert_utf8_null(item, &item->subject);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1846 pst_convert_utf8_null(item, &item->body);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1847 pst_convert_utf8_null(item, &appointment->location);
cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1848
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1849 fprintf(f_output, "DTSTAMP:%s\n", pst_rfc2445_datetime_format_now(sizeof(time_buffer), time_buffer));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1850 if (item->create_date)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1851 fprintf(f_output, "CREATED:%s\n", pst_rfc2445_datetime_format(item->create_date, sizeof(time_buffer), time_buffer));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1852 if (item->modify_date)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1853 fprintf(f_output, "LAST-MOD:%s\n", pst_rfc2445_datetime_format(item->modify_date, sizeof(time_buffer), time_buffer));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1854 if (item->subject.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1855 fprintf(f_output, "SUMMARY:%s\n", pst_rfc2426_escape(item->subject.str, &result, &resultlen));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1856 if (item->body.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1857 fprintf(f_output, "DESCRIPTION:%s\n", pst_rfc2426_escape(item->body.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1858 if (appointment && appointment->start)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1859 fprintf(f_output, "DTSTART;VALUE=DATE-TIME:%s\n", pst_rfc2445_datetime_format(appointment->start, sizeof(time_buffer), time_buffer));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1860 if (appointment && appointment->end)
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1861 fprintf(f_output, "DTEND;VALUE=DATE-TIME:%s\n", pst_rfc2445_datetime_format(appointment->end, sizeof(time_buffer), time_buffer));
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1862 if (appointment && appointment->location.str)
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1863 fprintf(f_output, "LOCATION:%s\n", pst_rfc2426_escape(appointment->location.str, &result, &resultlen));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1864 if (appointment) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1865 switch (appointment->showas) {
50 fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1866 case PST_FREEBUSY_TENTATIVE:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1867 fprintf(f_output, "STATUS:TENTATIVE\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1868 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1869 case PST_FREEBUSY_FREE:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1870 // mark as transparent and as confirmed
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1871 fprintf(f_output, "TRANSP:TRANSPARENT\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1872 case PST_FREEBUSY_BUSY:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1873 case PST_FREEBUSY_OUT_OF_OFFICE:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1874 fprintf(f_output, "STATUS:CONFIRMED\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1875 break;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1876 }
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1877 if (appointment->is_recurring) {
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1878 const char* rules[] = {"DAILY", "WEEKLY", "MONTHLY", "YEARLY"};
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1879 const char* days[] = {"SU", "MO", "TU", "WE", "TH", "FR", "SA"};
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1880 pst_recurrence *rdata = pst_convert_recurrence(appointment);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1881 fprintf(f_output, "RRULE:FREQ=%s", rules[rdata->type]);
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1882 if (rdata->count) fprintf(f_output, ";COUNT=%u", rdata->count);
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	1883 if ((rdata->interval != 1) &&
3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	1884 (rdata->interval)) fprintf(f_output, ";INTERVAL=%u", rdata->interval);
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1885 if (rdata->dayofmonth) fprintf(f_output, ";BYMONTHDAY=%d", rdata->dayofmonth);
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1886 if (rdata->monthofyear) fprintf(f_output, ";BYMONTH=%d", rdata->monthofyear);
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1887 if (rdata->position) fprintf(f_output, ";BYSETPOS=%d", rdata->position);
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1888 if (rdata->bydaymask) {
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1889 char byday[40];
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1890 int empty = 1;
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1891 int i=0;
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1892 memset(byday, 0, sizeof(byday));
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1893 for (i=0; i<6; i++) {
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1894 int bit = 1 << i;
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1895 if (bit & rdata->bydaymask) {
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1896 char temp[40];
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	1897 snprintf(temp, sizeof(temp), "%s%s%s", byday, (empty) ? ";BYDAY=" : ";", days[i]);
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1898 strcpy(byday, temp);
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1899 empty = 0;
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1900 }
e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1901 }
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	1902 fprintf(f_output, "%s", byday);
199 e3a46f66332b more changes in recurrence decoding Carl Byington <carl@five-ten-sg.com> parents: 198 diff changeset	1903 }
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1904 fprintf(f_output, "\n");
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1905 pst_free_recurrence(rdata);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1906 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1907 switch (appointment->label) {
50 fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1908 case PST_APP_LABEL_NONE:
242 67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards. Carl Byington <carl@five-ten-sg.com> parents: 239 diff changeset	1909 if (!write_extra_categories(f_output, item)) fprintf(f_output, "CATEGORIES:NONE\n");
50 fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1910 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1911 case PST_APP_LABEL_IMPORTANT:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1912 fprintf(f_output, "CATEGORIES:IMPORTANT\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1913 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1914 case PST_APP_LABEL_BUSINESS:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1915 fprintf(f_output, "CATEGORIES:BUSINESS\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1916 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1917 case PST_APP_LABEL_PERSONAL:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1918 fprintf(f_output, "CATEGORIES:PERSONAL\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1919 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1920 case PST_APP_LABEL_VACATION:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1921 fprintf(f_output, "CATEGORIES:VACATION\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1922 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1923 case PST_APP_LABEL_MUST_ATTEND:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1924 fprintf(f_output, "CATEGORIES:MUST-ATTEND\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1925 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1926 case PST_APP_LABEL_TRAVEL_REQ:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1927 fprintf(f_output, "CATEGORIES:TRAVEL-REQUIRED\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1928 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1929 case PST_APP_LABEL_NEEDS_PREP:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1930 fprintf(f_output, "CATEGORIES:NEEDS-PREPARATION\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1931 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1932 case PST_APP_LABEL_BIRTHDAY:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1933 fprintf(f_output, "CATEGORIES:BIRTHDAY\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1934 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1935 case PST_APP_LABEL_ANNIVERSARY:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1936 fprintf(f_output, "CATEGORIES:ANNIVERSARY\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1937 break;
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1938 case PST_APP_LABEL_PHONE_CALL:
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1939 fprintf(f_output, "CATEGORIES:PHONE-CALL\n");
fb3818370dd6 more fixes for 64 bit format carl parents: 48 diff changeset	1940 break;
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1941 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1942 }
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	1943 fprintf(f_output, "END:VEVENT\n");
211 94bde95d7e18 the shared library interface should now be thread safe Carl Byington <carl@five-ten-sg.com> parents: 205 diff changeset	1944 if (result) free(result);
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1945 }
73e8959cd86b patches from Arne carl parents: 21 diff changeset	1946
31 b88ceb81dba2 mege changes from Joe Nahmias carl parents: 28 diff changeset	1947
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1948 void create_enter_dir(struct file_ll* f, pst_item *item)
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1949 {
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1950 pst_convert_utf8(item, &item->file_as);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1951 f->type = item->type;
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	1952 f->stored_count = (item->folder) ? item->folder->item_count : 0;
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	1953
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1954 DEBUG_ENT("create_enter_dir");
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1955 if (mode == MODE_KMAIL)
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	1956 f->name = mk_kmail_dir(item->file_as.str);
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1957 else if (mode == MODE_RECURSE) {
154 581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files Carl Byington <carl@five-ten-sg.com> parents: 151 diff changeset	1958 f->name = mk_recurse_dir(item->file_as.str, f->type);
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1959 if (mode_thunder) {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1960 FILE *type_file = fopen(".type", "w");
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1961 fprintf(type_file, "%d\n", item->type);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1962 fclose(type_file);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1963 }
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	1964 } else if (mode == MODE_SEPARATE) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1965 // do similar stuff to recurse here.
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1966 mk_separate_dir(item->file_as.str);
239 aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	1967 f->name = (char*) pst_malloc(file_name_len);
aa50c23a6935 patch from Lee Ayres to add file name extensions in separate mode; allow mixed items types in a folder in separate mode Carl Byington <carl@five-ten-sg.com> parents: 238 diff changeset	1968 memset(f->name, 0, file_name_len);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1969 } else {
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1970 f->name = (char*) pst_malloc(strlen(item->file_as.str)+strlen(OUTPUT_TEMPLATE)+1);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1971 sprintf(f->name, OUTPUT_TEMPLATE, item->file_as.str);
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1972 }
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1973
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1974 f->dname = (char*) pst_malloc(strlen(item->file_as.str)+1);
151 cda7c812ec01 track character set individually for each mapi element Carl Byington <carl@five-ten-sg.com> parents: 150 diff changeset	1975 strcpy(f->dname, item->file_as.str);
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1976
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1977 if (overwrite != 1) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1978 int x = 0;
172 6954d315aaa8 move version-info into main configure.in, and set it properly. Carl Byington <carl@five-ten-sg.com> parents: 171 diff changeset	1979 char temp = (char) pst_malloc (strlen(f->name)+10); //enough room for 10 digits
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	1980
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1981 sprintf(temp, "%s", f->name);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1982 check_filename(temp);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1983 while ((f->output = fopen(temp, "r"))) {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1984 DEBUG_INFO(("need to increase filename because one already exists with that name\n"));
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1985 DEBUG_INFO(("- increasing it to %s%d\n", f->name, x));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1986 x++;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1987 sprintf(temp, "%s%08d", f->name, x);
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	1988 DEBUG_INFO(("- trying \"%s\"\n", f->name));
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1989 if (x == 99999999) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1990 DIE(("create_enter_dir: Why can I not create a folder %s? I have tried %i extensions...\n", f->name, x));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1991 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1992 fclose(f->output);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1993 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1994 if (x > 0) { //then the f->name should change
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1995 free (f->name);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1996 f->name = temp;
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1997 } else {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1998 free(temp);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	1999 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2000 }
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	2001
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2002 DEBUG_INFO(("f->name = %s\nitem->folder_name = %s\n", f->name, item->file_as.str));
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	2003 if (mode != MODE_SEPARATE) {
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2004 check_filename(f->name);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2005 if (!(f->output = fopen(f->name, "w"))) {
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2006 DIE(("create_enter_dir: Could not open file \"%s\" for write\n", f->name));
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2007 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2008 }
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2009 DEBUG_RET();
25 73e8959cd86b patches from Arne carl parents: 21 diff changeset	2010 }
73e8959cd86b patches from Arne carl parents: 21 diff changeset	2011
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	2012
2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	2013 void close_enter_dir(struct file_ll *f)
2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	2014 {
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2015 DEBUG_INFO(("processed item count for folder %s is %i, skipped %i, total %i \n",
167 40e9de445038 improve consistency checking when fetching items from the pst file. Carl Byington <carl@five-ten-sg.com> parents: 164 diff changeset	2016 f->dname, f->item_count, f->skip_count, f->stored_count));
202 2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2017 if (output_mode != OUTPUT_QUIET) {
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2018 pst_debug_lock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2019 printf("\t\"%s\" - %i items done, %i items skipped.\n", f->dname, f->item_count, f->skip_count);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2020 fflush(stdout);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2021 pst_debug_unlock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files Carl Byington <carl@five-ten-sg.com> parents: 201 diff changeset	2022 }
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2023 if (f->output) {
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2024 struct stat st;
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2025 fclose(f->output);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2026 stat(f->name, &st);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2027 if (!st.st_size) {
201 3850a3b11745 fixes for parallel readpst Carl Byington <carl@five-ten-sg.com> parents: 200 diff changeset	2028 DEBUG_WARN(("removing empty output file %s\n", f->name));
198 7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2029 remove(f->name);
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2030 }
7c60d6d1c681 decode more recurrence mapi elements Carl Byington <carl@five-ten-sg.com> parents: 197 diff changeset	2031 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2032 free(f->name);
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2033 free(f->dname);
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	2034
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2035 if (mode == MODE_KMAIL)
f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2036 close_kmail_dir();
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	2037 else if (mode == MODE_RECURSE) {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	2038 if (mode_thunder) {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	2039 FILE *type_file = fopen(".size", "w");
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	2040 fprintf(type_file, "%i %i\n", f->item_count, f->stored_count);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	2041 fclose(type_file);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	2042 }
43 f6db1f060a95 start on outlook 2003 64 bit format carl parents: 41 diff changeset	2043 close_recurse_dir();
231 fe64279df92b patches from Chris White, Roberto Polli, Justin Greer Carl Byington <carl@five-ten-sg.com> parents: 230 diff changeset	2044 } else if (mode == MODE_SEPARATE)
77 87216aefc6df spelling fixup Carl Byington <carl@five-ten-sg.com> parents: 75 diff changeset	2045 close_separate_dir();
39 2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	2046 }
2ad7ef0a3c4f more valgrind fixes carl parents: 38 diff changeset	2047

Mercurial > libpst

annotate src/readpst.c @ 253:115b871c61a1