annotate src/readpst.c @ 300:47abe56076da

embedded rfc822 messages might contain rtf encoded bodies
author Carl Byington <carl@five-ten-sg.com>
date Fri, 04 Nov 2011 14:09:50 -0700
parents 201464dd356e
children 5338d93889aa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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();
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
42 void mk_separate_file(struct file_ll *f, char *extension);
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
43 void close_separate_file(struct file_ll *f);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
44 char* my_stristr(char *haystack, char *needle);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
45 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
46 void write_separate_attachment(char f_name[], pst_item_attach* attach, int attach_num, pst_file* pst);
300
47abe56076da embedded rfc822 messages might contain rtf encoded bodies
Carl Byington <carl@five-ten-sg.com>
parents: 298
diff changeset
47 void write_embedded_message(FILE* f_output, pst_item_attach* attach, char *boundary, pst_file* pf, int save_rtf, char** extra_mime_headers);
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
48 void write_inline_attachment(FILE* f_output, pst_item_attach* attach, char *boundary, pst_file* pst);
277
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
49 int valid_headers(char *header);
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
50 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
51 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
52 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
53 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
54 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
55 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
56 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
57 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
58 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
59 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
60 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
61 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
62 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
63 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
64 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
65 void write_appointment(FILE* f_output, pst_item *item);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
66 void create_enter_dir(struct file_ll* f, pst_item *item);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
67 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
68
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
69 const char* prog_name;
34
07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents: 33
diff changeset
70 char* output_dir = ".";
07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents: 33
diff changeset
71 char* kmail_chdir = NULL;
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
72
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
73 // Normal mode just creates mbox format files in the current directory. Each file is named
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
74 // the same as the folder's name that it represents
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
75 #define MODE_NORMAL 0
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
76
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
77 // KMail mode creates a directory structure suitable for being used directly
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
78 // by the KMail application
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
79 #define MODE_KMAIL 1
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
80
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
81 // recurse mode creates a directory structure like the PST file. Each directory
254
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
82 // contains only one file which stores the emails in mboxrd format.
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
83 #define MODE_RECURSE 2
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
84
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
85 // 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
86 // 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
87 // 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
88 #define MODE_SEPARATE 3
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
89
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
90
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
91 // Output Normal just prints the standard information about what is going on
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
92 #define OUTPUT_NORMAL 0
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
93
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
94 // Output Quiet is provided so that only errors are printed
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
95 #define OUTPUT_QUIET 1
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
96
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
97 // default mime-type for attachments that have a null mime-type
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
98 #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
99 #define RFC822 "message/rfc822"
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
100
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
101 // output mode for contacts
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
102 #define CMODE_VCARD 0
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
103 #define CMODE_LIST 1
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
104
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
105 // 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
106 #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
107 #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
108
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
109 // Output type mode flags
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
110 #define OTMODE_EMAIL 1
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
111 #define OTMODE_APPOINTMENT 2
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
112 #define OTMODE_JOURNAL 4
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
113 #define OTMODE_CONTACT 8
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
114
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
115 // output settings for RTF bodies
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
116 // filename for the attachment
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
117 #define RTF_ATTACH_NAME "rtf-body.rtf"
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
118 // mime type for the attachment
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
119 #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
120
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
121 // global settings
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
122 int mode = MODE_NORMAL;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
123 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
124 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
125 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
126 int output_mode = OUTPUT_NORMAL;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
127 int contact_mode = CMODE_VCARD;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
128 int deleted_mode = DMODE_EXCLUDE;
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
129 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
130 int contact_mode_specified = 0;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
131 int overwrite = 0;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
132 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
133 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
134 pst_file pstfile;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
135 regex_t meta_charset_pattern;
298
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
136 char* default_charset = NULL;
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
137
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
138 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
139 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
140 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
141 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
142 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
143
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
144 #ifdef HAVE_SEMAPHORE_H
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
145 int shared_memory_id;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
146 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
147 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
148 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
149
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
150
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
151 int grim_reaper(int waitall)
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
152 {
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
153 int available = 0;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
154 #ifdef HAVE_FORK
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
155 #ifdef HAVE_SEMAPHORE_H
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
156 if (global_children) {
288
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
157 //sem_getvalue(global_children, &available);
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
158 //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
159 //fflush(stdout);
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
160 int i,j;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
161 for (i=0; i<active_children; i++) {
258
8ad8fd1c5451 check return codes from forked processes
Carl Byington <carl@five-ten-sg.com>
parents: 257
diff changeset
162 int status;
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
163 pid_t child = child_processes[i];
258
8ad8fd1c5451 check return codes from forked processes
Carl Byington <carl@five-ten-sg.com>
parents: 257
diff changeset
164 pid_t ch = waitpid(child, &status, ((waitall) ? 0 : WNOHANG));
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
165 if (ch == child) {
258
8ad8fd1c5451 check return codes from forked processes
Carl Byington <carl@five-ten-sg.com>
parents: 257
diff changeset
166 // check termination status
259
78e95fab9a8b add some debug checking for process exit status
Carl Byington <carl@five-ten-sg.com>
parents: 258
diff changeset
167 //if (WIFEXITED(status)) {
78e95fab9a8b add some debug checking for process exit status
Carl Byington <carl@five-ten-sg.com>
parents: 258
diff changeset
168 // int ext = WEXITSTATUS(status);
78e95fab9a8b add some debug checking for process exit status
Carl Byington <carl@five-ten-sg.com>
parents: 258
diff changeset
169 // printf("Process %d exited with status %d\n", child, ext);
78e95fab9a8b add some debug checking for process exit status
Carl Byington <carl@five-ten-sg.com>
parents: 258
diff changeset
170 // fflush(stdout);
78e95fab9a8b add some debug checking for process exit status
Carl Byington <carl@five-ten-sg.com>
parents: 258
diff changeset
171 //}
258
8ad8fd1c5451 check return codes from forked processes
Carl Byington <carl@five-ten-sg.com>
parents: 257
diff changeset
172 if (WIFSIGNALED(status)) {
8ad8fd1c5451 check return codes from forked processes
Carl Byington <carl@five-ten-sg.com>
parents: 257
diff changeset
173 int sig = WTERMSIG(status);
8ad8fd1c5451 check return codes from forked processes
Carl Byington <carl@five-ten-sg.com>
parents: 257
diff changeset
174 DEBUG_INFO(("Process %d terminated with signal %d\n", child, sig));
259
78e95fab9a8b add some debug checking for process exit status
Carl Byington <carl@five-ten-sg.com>
parents: 258
diff changeset
175 //printf("Process %d terminated with signal %d\n", child, sig);
78e95fab9a8b add some debug checking for process exit status
Carl Byington <carl@five-ten-sg.com>
parents: 258
diff changeset
176 //fflush(stdout);
258
8ad8fd1c5451 check return codes from forked processes
Carl Byington <carl@five-ten-sg.com>
parents: 257
diff changeset
177 }
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
178 // this has terminated, remove it from the list
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
179 for (j=i; j<active_children-1; j++) {
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
180 child_processes[j] = child_processes[j+1];
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
181 }
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
182 active_children--;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
183 i--;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
184 }
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
185 }
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
186 sem_getvalue(global_children, &available);
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
187 //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
188 //fflush(stdout);
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
189 }
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
190 #endif
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
191 #endif
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
192 return available;
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
193 }
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
194
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
195
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
196 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
197 {
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
198 #ifdef HAVE_FORK
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
199 #ifdef HAVE_SEMAPHORE_H
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
200 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
201 if (available) {
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
202 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
203 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
204 if (child < 0) {
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
205 // 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
206 return 0;
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
207 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
208 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
209 // 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
210 active_children = 0;
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
211 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
212 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
213 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
214 else {
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
215 // 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
216 //pid_t me = getpid();
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
217 //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
218 //fflush(stdout);
200
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
219 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
220 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
221 return child;
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
222 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
223 else {
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
224 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
225 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
226 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
227 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
228 return 0;
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
229 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
230
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
231
186
0a4f7ecd7452 more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents: 182
diff changeset
232 void process(pst_item *outeritem, pst_desc_tree *d_ptr)
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
233 {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
234 struct file_ll ff;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
235 pst_item *item = NULL;
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
236
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
237 DEBUG_ENT("process");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
238 memset(&ff, 0, sizeof(ff));
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
239 create_enter_dir(&ff, outeritem);
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
240
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
241 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
242 DEBUG_INFO(("New item record\n"));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
243 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
244 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
245 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
246 continue;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
247 }
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(("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
249
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
250 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
251 DEBUG_INFO(("About to process item\n"));
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
252
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
253 if (!item) {
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
254 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
255 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
256 continue;
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
257 }
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
258
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
259 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
260 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
261 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
262
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
263 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
264 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
265 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
266 pst_debug_lock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
267 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
268 fflush(stdout);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
269 pst_debug_unlock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
270 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
271 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
272 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
273 //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
274 pid_t parent = getpid();
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
275 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
276 if (child == 0) {
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
277 // 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
278 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
279 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
280 #ifdef HAVE_FORK
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
281 #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
282 if (me != parent) {
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
283 // 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
284 // 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
285 // 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
286 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
287 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
288 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
289 }
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
290 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
291 #endif
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
292 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
293 }
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
294
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
295 } 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
296 DEBUG_INFO(("Processing Contact\n"));
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
297 if (!(output_type_mode & OTMODE_CONTACT)) {
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
298 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
299 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
300 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
301 else {
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
302 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
303 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
304 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
305 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
306 }
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
307 else {
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
308 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
309 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
310 if (contact_mode == CMODE_VCARD) {
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
311 pst_convert_utf8_null(item, &item->comment);
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
312 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
313 }
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
314 else {
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
315 pst_convert_utf8(item, &item->contact->fullname);
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
316 pst_convert_utf8(item, &item->contact->address1);
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
317 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
318 }
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
319 if (mode == MODE_SEPARATE) close_separate_file(&ff);
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
320 }
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
321 }
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
322
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
323 } 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
324 DEBUG_INFO(("Processing Email\n"));
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
325 if (!(output_type_mode & OTMODE_EMAIL)) {
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
326 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
327 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
328 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
329 else {
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
330 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
331 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
332 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
333 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
334 }
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
335 else {
290
fec37c150982 possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 289
diff changeset
336 char *extra_mime_headers = NULL;
288
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
337 ff.item_count++;
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
338 if (mode == MODE_SEPARATE) {
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
339 // process this single email message, possibly forking
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
340 pid_t parent = getpid();
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
341 pid_t child = try_fork(item->file_as.str);
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
342 if (child == 0) {
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
343 // we are the child process, or the original parent if no children were available
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
344 pid_t me = getpid();
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
345 mk_separate_file(&ff, (mode_EX) ? ".eml" : "");
288
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
346 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body, &extra_mime_headers);
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
347 close_separate_file(&ff);
288
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
348 #ifdef HAVE_FORK
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
349 #ifdef HAVE_SEMAPHORE_H
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
350 if (me != parent) {
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
351 // we really were a child, forked for the sole purpose of processing this message
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
352 // free my child count slot before really exiting, since
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
353 // all I am doing here is waiting for my children to exit
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
354 sem_post(global_children);
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
355 grim_reaper(1); // wait for all my child processes to exit - there should not be any
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
356 exit(0); // really exit
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
357 }
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
358 #endif
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
359 #endif
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
360 }
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
361 }
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
362 else {
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
363 // process this single email message, cannot fork since not separate mode
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
364 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body, &extra_mime_headers);
fa7fc1ac6385 add gprof profiling option; allow fork for parallel processing of individual email folders in separate mode
Carl Byington <carl@five-ten-sg.com>
parents: 285
diff changeset
365 }
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
366 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
367 }
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
368
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
369 } 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
370 DEBUG_INFO(("Processing Journal Entry\n"));
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
371 if (!(output_type_mode & OTMODE_JOURNAL)) {
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
372 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
373 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
374 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
375 else {
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
376 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
377 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
378 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
379 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
380 }
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
381 else {
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
382 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
383 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
384 write_journal(ff.output, item);
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
385 fprintf(ff.output, "\n");
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
386 if (mode == MODE_SEPARATE) close_separate_file(&ff);
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
387 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
388 }
79
56fa05fd5271 Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents: 77
diff changeset
389
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
390 } 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
391 DEBUG_INFO(("Processing Appointment Entry\n"));
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
392 if (!(output_type_mode & OTMODE_APPOINTMENT)) {
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
393 ff.skip_count++;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
394 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
395 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
396 else {
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
397 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
398 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
399 ff.skip_count++;
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
400 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
401 }
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
402 else {
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
403 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
404 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
405 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
406 fprintf(ff.output, "\n");
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
407 if (mode == MODE_SEPARATE) close_separate_file(&ff);
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
408 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
409 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
410
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
411 } 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
412 // 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
413 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
414 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
415
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
416 } else {
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
417 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
418 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
419 item->type, item->ascii_type, item->file_as.str));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
420 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
421 pst_freeItem(item);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
422 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
423 close_enter_dir(&ff);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
424 DEBUG_RET();
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
425 }
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
426
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
427
34
07177825c91b fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents: 33
diff changeset
428
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
429 int main(int argc, char* const* argv) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
430 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
431 pst_desc_tree *d_ptr;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
432 char * fname = NULL;
48
f66078abed38 more fixes for 64 bit format
carl
parents: 46
diff changeset
433 char *d_log = NULL;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
434 int c,x;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
435 char *temp = NULL; //temporary char pointer
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
436 prog_name = argv[0];
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
437
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
438 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
439 srand((unsigned)now);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
440
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
441 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
442 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
443 exit(3);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
444 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
445
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
446 // command-line option handling
298
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
447 while ((c = getopt(argc, argv, "bC:c:Dd:ehj:kMo:qrSt:uVw"))!= -1) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
448 switch (c) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
449 case 'b':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
450 save_rtf_body = 0;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
451 break;
298
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
452 case 'C':
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
453 if (optarg) {
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
454 default_charset = optarg;
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
455 }
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
456 else {
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
457 usage();
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
458 exit(0);
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
459 }
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
460 break;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
461 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
462 if (optarg && optarg[0]=='v') {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
463 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
464 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
465 }
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents: 151
diff changeset
466 else if (optarg && optarg[0]=='l') {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
467 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
468 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
469 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
470 else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
471 usage();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
472 exit(0);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
473 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
474 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
475 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
476 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
477 break;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
478 case 'd':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
479 d_log = optarg;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
480 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
481 case 'h':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
482 usage();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
483 exit(0);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
484 break;
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
485 case 'j':
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
486 max_children = atoi(optarg);
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
487 max_child_specified = 1;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
488 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
489 case 'k':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
490 mode = MODE_KMAIL;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
491 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
492 case 'M':
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
493 mode = MODE_SEPARATE;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
494 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
495 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
496 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
497 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
498 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
499 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
500 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
501 file_name_len = 14;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
502 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
503 case 'o':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
504 output_dir = optarg;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
505 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
506 case 'q':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
507 output_mode = OUTPUT_QUIET;
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 case 'r':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
510 mode = MODE_RECURSE;
231
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
511 mode_thunder = 0;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
512 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
513 case 'S':
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
514 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
515 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
516 mode_EX = 0;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
517 break;
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
518 case 't':
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
519 // email, appointment, contact, other
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
520 if (!optarg) {
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
521 usage();
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
522 exit(0);
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
523 }
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
524 temp = optarg;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
525 output_type_mode = 0;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
526 while (*temp > 0) {
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
527 switch (temp[0]) {
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
528 case 'e':
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
529 output_type_mode |= OTMODE_EMAIL;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
530 break;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
531 case 'a':
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
532 output_type_mode |= OTMODE_APPOINTMENT;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
533 break;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
534 case 'j':
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
535 output_type_mode |= OTMODE_JOURNAL;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
536 break;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
537 case 'c':
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
538 output_type_mode |= OTMODE_CONTACT;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
539 break;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
540 default:
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
541 usage();
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
542 exit(0);
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
543 break;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
544 }
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
545 temp++;
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
546 }
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
547 break;
231
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
548 case 'u':
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
549 mode = MODE_RECURSE;
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
550 mode_thunder = 1;
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
551 break;
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
552 case 'V':
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
553 version();
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
554 exit(0);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
555 break;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
556 case 'w':
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
557 overwrite = 1;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
558 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
559 default:
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
560 usage();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
561 exit(1);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
562 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
563 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
564 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
565
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
566 if (argc > optind) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
567 fname = argv[optind];
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
568 } else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
569 usage();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
570 exit(2);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
571 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
572
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
573 #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
574 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
575 #endif
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
576 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
577 active_children = 0;
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
578 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
579 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
580
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
581 #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
582 if (max_children) {
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
583 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
584 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
585 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
586 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
587 if (global_children) {
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
588 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
589 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
590 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
591 }
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
592 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
593 }
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
594 }
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
595 #endif
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
596
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
597 #ifdef DEBUG_ALL
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
598 // force a log file
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
599 if (!d_log) d_log = "readpst.log";
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
600 #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
601 #ifdef HAVE_SEMAPHORE_H
8e17efed33c1 patch from Fridrich Strba to build on win32
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
602 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
603 #else
8e17efed33c1 patch from Fridrich Strba to build on win32
Carl Byington <carl@five-ten-sg.com>
parents: 211
diff changeset
604 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
605 #endif
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
606 DEBUG_ENT("main");
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
607
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
608 if (output_mode != OUTPUT_QUIET) printf("Opening PST file and indexes...\n");
298
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
609 RET_DERROR(pst_open(&pstfile, fname, default_charset), 1, ("Error opening File\n"));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
610 RET_DERROR(pst_load_index(&pstfile), 2, ("Index Error\n"));
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
611
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
612 pst_load_extended_attributes(&pstfile);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
613
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
614 if (chdir(output_dir)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
615 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
616 pst_close(&pstfile);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
617 DEBUG_RET();
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
618 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
619 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
620
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
621 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
622 item = pst_parse_item(&pstfile, d_ptr, NULL);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
623 if (!item || !item->message_store) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
624 DEBUG_RET();
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
625 DIE(("Could not get root record\n"));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
626 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
627
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
628 // 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
629 if (!item->file_as.str) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
630 if (!(temp = strrchr(fname, '/')))
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
631 if (!(temp = strrchr(fname, '\\')))
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
632 temp = fname;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
633 else
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
634 temp++; // get past the "\\"
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
635 else
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
636 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
637 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
638 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
639 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
640 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
641 }
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
642 DEBUG_INFO(("Root Folder Name: %s\n", item->file_as.str));
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
643
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
644 d_ptr = pst_getTopOfFolders(&pstfile, item);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
645 if (!d_ptr) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
646 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
647 DIE(("Top of folders record not found. Cannot continue\n"));
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
648 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
649
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
650 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
651 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
652
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
653 pst_freeItem(item);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
654 pst_close(&pstfile);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
655 DEBUG_RET();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
656
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
657 #ifdef HAVE_SEMAPHORE_H
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
658 if (global_children) {
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
659 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
660 sem_destroy(output_mutex);
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
661 shmdt(global_children);
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
662 }
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
663 #endif
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
664
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
665 regfree(&meta_charset_pattern);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
666 return 0;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
667 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
668
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
669
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
670 void write_email_body(FILE *f, char *body) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
671 char *n = body;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
672 DEBUG_ENT("write_email_body");
254
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
673 if (mode != MODE_SEPARATE) {
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
674 while (n) {
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
675 char *p = body;
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
676 while (*p == '>') p++;
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
677 if (strncmp(p, "From ", 5) == 0) fprintf(f, ">");
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
678 if ((n = strchr(body, '\n'))) {
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
679 n++;
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
680 pst_fwrite(body, n-body, 1, f); //write just a line
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
681 body = n;
fb66d428347d switch to mboxrd quoting
Carl Byington <carl@five-ten-sg.com>
parents: 247
diff changeset
682 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
683 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
684 }
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
685 pst_fwrite(body, strlen(body), 1, f);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
686 DEBUG_RET();
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
687 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
688
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
689
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
690 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
691 // converts \r\n to \n
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
692 char *a, *b;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
693 DEBUG_ENT("removeCR");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
694 a = b = c;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
695 while (*a != '\0') {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
696 *b = *a;
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
697 if (*a != '\r') b++;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
698 a++;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
699 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
700 *b = '\0';
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
701 DEBUG_RET();
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
702 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
703
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
704
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
705 void usage() {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
706 DEBUG_ENT("usage");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
707 version();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
708 printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
709 printf("OPTIONS:\n");
104
39ba19372732 many fixes in pst2ldif by Robert Harris
Carl Byington <carl@five-ten-sg.com>
parents: 100
diff changeset
710 printf("\t-V\t- Version. Display program version\n");
298
201464dd356e add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents: 297
diff changeset
711 printf("\t-C charset\t- character set for items with unspecified character set\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
712 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
713 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
714 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
715 printf("\t-b\t- Don't save RTF-Body attachments\n");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
716 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
717 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
718 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
719 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
720 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
721 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
722 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
723 printf("\t-q\t- Quiet. Only print error messages\n");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
724 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
725 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
726 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
727 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
728 printf("\n");
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
729 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
730 DEBUG_RET();
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
731 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
732
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
733
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
734 void version() {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
735 DEBUG_ENT("version");
50
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
736 printf("ReadPST / LibPST v%s\n", VERSION);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
737 #if BYTE_ORDER == BIG_ENDIAN
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
738 printf("Big Endian implementation being used.\n");
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
739 #elif BYTE_ORDER == LITTLE_ENDIAN
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
740 printf("Little Endian implementation being used.\n");
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
741 #else
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
742 # error "Byte order not supported by this library"
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
743 #endif
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
744 DEBUG_RET();
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
745 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
746
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
747
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
748 char *mk_kmail_dir(char *fname) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
749 //change to that directory
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
750 //make a directory based on OUTPUT_KMAIL_DIR_TEMPLATE
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
751 //allocate space for OUTPUT_TEMPLATE and form a char* with fname
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
752 //return that value
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
753 char *dir, *out_name, *index;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
754 int x;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
755 DEBUG_ENT("mk_kmail_dir");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
756 if (kmail_chdir && chdir(kmail_chdir)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
757 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
758 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
759 }
289
cc8ee701f190 pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents: 288
diff changeset
760 dir = pst_malloc(strlen(fname)+strlen(OUTPUT_KMAIL_DIR_TEMPLATE)+1);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
761 sprintf(dir, OUTPUT_KMAIL_DIR_TEMPLATE, fname);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
762 check_filename(dir);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
763 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
764 if (errno != EEXIST) { // not an error because it exists
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
765 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
766 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
767 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
768 }
289
cc8ee701f190 pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents: 288
diff changeset
769 kmail_chdir = pst_realloc(kmail_chdir, strlen(dir)+1);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
770 strcpy(kmail_chdir, dir);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
771 free (dir);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
772
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
773 //we should remove any existing indexes created by KMail, cause they might be different now
289
cc8ee701f190 pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents: 288
diff changeset
774 index = pst_malloc(strlen(fname)+strlen(KMAIL_INDEX)+1);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
775 sprintf(index, KMAIL_INDEX, fname);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
776 unlink(index);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
777 free(index);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
778
289
cc8ee701f190 pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents: 288
diff changeset
779 out_name = pst_malloc(strlen(fname)+strlen(OUTPUT_TEMPLATE)+1);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
780 sprintf(out_name, OUTPUT_TEMPLATE, fname);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
781 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
782 return out_name;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
783 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
784
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
785
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
786 int close_kmail_dir() {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
787 // change ..
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
788 int x;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
789 DEBUG_ENT("close_kmail_dir");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
790 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
791 free(kmail_chdir);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
792 kmail_chdir = NULL;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
793 } else {
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_kmail_dir: Cannot move 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 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
799 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
800 return 0;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
801 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
802
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
803
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
804 // 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
805 // 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
806 char *mk_recurse_dir(char *dir, int32_t folder_type) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
807 int x;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
808 char *out_name;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
809 DEBUG_ENT("mk_recurse_dir");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
810 check_filename(dir);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
811 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
812 if (errno != EEXIST) { // not an error because it exists
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
813 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
814 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
815 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
816 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
817 if (chdir (dir)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
818 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
819 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
820 }
154
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents: 151
diff changeset
821 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
822 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
823 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
824 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents: 151
diff changeset
825 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
826 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
827 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents: 151
diff changeset
828 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
829 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
830 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents: 151
diff changeset
831 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
832 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
833 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
834 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
835 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
836 default:
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents: 151
diff changeset
837 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
838 break;
581fab9f1dc7 avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents: 151
diff changeset
839 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
840 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
841 return out_name;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
842 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
843
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
844
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
845 int close_recurse_dir() {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
846 int x;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
847 DEBUG_ENT("close_recurse_dir");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
848 if (chdir("..")) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
849 x = errno;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
850 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
851 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
852 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
853 return 0;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
854 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
855
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
856
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
857 char *mk_separate_dir(char *dir) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
858 size_t dirsize = strlen(dir) + 10;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
859 char dir_name[dirsize];
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
860 int x = 0, y = 0;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
861
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
862 DEBUG_ENT("mk_separate_dir");
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
863 do {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
864 if (y == 0)
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
865 snprintf(dir_name, dirsize, "%s", dir);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
866 else
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
867 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
868
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
869 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
870 DEBUG_INFO(("about to try creating %s\n", dir_name));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
871 if (D_MKDIR(dir_name)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
872 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
873 x = errno;
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
874 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
875 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
876 } else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
877 break;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
878 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
879 y++;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
880 } while (overwrite == 0);
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
881
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
882 if (chdir(dir_name)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
883 x = errno;
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
884 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
885 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
886
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
887 if (overwrite) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
888 // we should probably delete all files from this directory
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
889 #if !defined(WIN32) && !defined(__CYGWIN__)
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
890 DIR * sdir = NULL;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
891 struct dirent *dirent = NULL;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
892 struct stat filestat;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
893 if (!(sdir = opendir("./"))) {
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
894 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
895 } else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
896 while ((dirent = readdir(sdir))) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
897 if (lstat(dirent->d_name, &filestat) != -1)
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
898 if (S_ISREG(filestat.st_mode)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
899 if (unlink(dirent->d_name)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
900 y = errno;
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
901 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
902 }
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 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
905 }
26
9eeba3f4ca4b more cleanup from Arne
carl
parents: 25
diff changeset
906 #endif
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
907 }
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
908
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
909 // 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
910 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
911 return NULL;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
912 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
913
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
914
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
915 int close_separate_dir() {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
916 int x;
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
917 DEBUG_ENT("close_separate_dir");
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
918 if (chdir("..")) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
919 x = errno;
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
920 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
921 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
922 DEBUG_RET();
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
923 return 0;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
924 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
925
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
926
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
927 void mk_separate_file(struct file_ll *f, char *extension) {
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
928 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
929 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
930 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
931 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
932 }
246
5a82d41c883d patches from Kenneth Berland for solaris
Carl Byington <carl@five-ten-sg.com>
parents: 242
diff changeset
933 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
934 check_filename(f->name);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
935 if (!(f->output = fopen(f->name, "w"))) {
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
936 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
937 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
938 DEBUG_RET();
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
939 }
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
940
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
941
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
942 void close_separate_file(struct file_ll *f) {
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
943 DEBUG_ENT("close_separate_file");
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
944 if (f->output) {
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
945 struct stat st;
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
946 fclose(f->output);
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
947 stat(f->name, &st);
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
948 if (!st.st_size) {
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
949 DEBUG_WARN(("removing empty output file %s\n", f->name));
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
950 remove(f->name);
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
951 }
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
952 f->output = NULL;
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
953 }
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
954 DEBUG_RET();
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
955 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
956
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
957
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
958 char *my_stristr(char *haystack, char *needle) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
959 // 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
960 char *x=haystack, *y=needle, *z = NULL;
52
034641c26ab9 code cleanup
carl
parents: 50
diff changeset
961 if (!haystack || !needle) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
962 return NULL;
52
034641c26ab9 code cleanup
carl
parents: 50
diff changeset
963 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
964 while (*y != '\0' && *x != '\0') {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
965 if (tolower(*y) == tolower(*x)) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
966 // move y on one
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
967 y++;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
968 if (!z) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
969 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
970 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
971 } else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
972 y = needle; // reset y to the beginning of the needle
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
973 z = NULL; // reset the haystack storage point
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
974 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
975 x++; // advance the search in the haystack
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
976 }
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
977 // 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
978 if (*y != '\0') return NULL;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
979 return z;
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
980 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
981
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
982
41
183ae993b9ad security fix for potential buffer overrun in lz decompress
carl
parents: 39
diff changeset
983 void check_filename(char *fname) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
984 char *t = fname;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
985 DEBUG_ENT("check_filename");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
986 if (!t) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
987 DEBUG_RET();
52
034641c26ab9 code cleanup
carl
parents: 50
diff changeset
988 return;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
989 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
990 while ((t = strpbrk(t, "/\\:"))) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
991 // 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
992 *t = '_'; //replace them with an underscore
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
993 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
994 DEBUG_RET();
16
c508ee15dfca switch to automake/autoconf
carl
parents:
diff changeset
995 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
996
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
997
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
998 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
999 {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1000 FILE *fp = NULL;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1001 int x = 0;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1002 char *temp = NULL;
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1003
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1004 // If there is a long filename (filename2) use that, otherwise
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1005 // 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
1006 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
1007 : attach->filename1.str;
46
b2a7f2e0926a more fixes for 64 bit format
carl
parents: 45
diff changeset
1008 DEBUG_ENT("write_separate_attachment");
266
3f323c867cb4 adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents: 264
diff changeset
1009 DEBUG_INFO(("Attachment %s Size is %#"PRIx64", data = %#"PRIxPTR", id %#"PRIx64"\n", attach_filename, (uint64_t)attach->data.size, attach->data.data, attach->i_id));
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1010
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
1011 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
1012 // 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
1013 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
1014 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
1015 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
1016 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
1017 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
1018 }
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
1019 }
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
1020
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1021 check_filename(f_name);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1022 if (!attach_filename) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1023 // 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
1024 temp = pst_malloc(strlen(f_name)+15);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1025 sprintf(temp, "%s-attach%i", f_name, attach_num);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1026 } else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1027 // 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
1028 temp = pst_malloc(strlen(f_name)+strlen(attach_filename)+15);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1029 do {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1030 if (fp) fclose(fp);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1031 if (x == 0)
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1032 sprintf(temp, "%s-%s", f_name, attach_filename);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1033 else
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1034 sprintf(temp, "%s-%s-%i", f_name, attach_filename, x);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1035 } while ((fp = fopen(temp, "r")) && ++x < 99999999);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1036 if (x > 99999999) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1037 DIE(("error finding attachment name. exhausted possibilities to %s\n", temp));
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1038 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1039 }
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
1040 DEBUG_INFO(("Saving attachment to %s\n", temp));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1041 if (!(fp = fopen(temp, "w"))) {
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
1042 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
1043 } 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
1044 (void)pst_attach_to_file(pst, attach, fp);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1045 fclose(fp);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1046 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1047 if (temp) free(temp);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1048 DEBUG_RET();
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1049 }
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1050
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1051
300
47abe56076da embedded rfc822 messages might contain rtf encoded bodies
Carl Byington <carl@five-ten-sg.com>
parents: 298
diff changeset
1052 void write_embedded_message(FILE* f_output, pst_item_attach* attach, char *boundary, pst_file* pf, int save_rtf, char** extra_mime_headers)
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1053 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1054 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
1055 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
1056 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
1057
186
0a4f7ecd7452 more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents: 182
diff changeset
1058 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
1059 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
1060 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
1061 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
1062 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
1063 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
1064 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
1065 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
1066 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
1067 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
1068 d_ptr.child_tail = NULL;
143
fdc58ad2c758 fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents: 142
diff changeset
1069
fdc58ad2c758 fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents: 142
diff changeset
1070 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
1071 // 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
1072 // 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
1073 // 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
1074 // 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
1075 // 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
1076 // 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
1077 if (!item) {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
1078 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
1079 } else {
255
ab87f9070ed2 fix to ignore embedded objects that are not email messages
Carl Byington <carl@five-ten-sg.com>
parents: 254
diff changeset
1080 if (!item->email) {
ab87f9070ed2 fix to ignore embedded objects that are not email messages
Carl Byington <carl@five-ten-sg.com>
parents: 254
diff changeset
1081 DEBUG_WARN(("write_embedded_message: pst_parse_item returned type %d, not an email message", item->type));
ab87f9070ed2 fix to ignore embedded objects that are not email messages
Carl Byington <carl@five-ten-sg.com>
parents: 254
diff changeset
1082 } else {
ab87f9070ed2 fix to ignore embedded objects that are not email messages
Carl Byington <carl@five-ten-sg.com>
parents: 254
diff changeset
1083 fprintf(f_output, "\n--%s\n", boundary);
ab87f9070ed2 fix to ignore embedded objects that are not email messages
Carl Byington <carl@five-ten-sg.com>
parents: 254
diff changeset
1084 fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str);
300
47abe56076da embedded rfc822 messages might contain rtf encoded bodies
Carl Byington <carl@five-ten-sg.com>
parents: 298
diff changeset
1085 write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, save_rtf, extra_mime_headers);
255
ab87f9070ed2 fix to ignore embedded objects that are not email messages
Carl Byington <carl@five-ten-sg.com>
parents: 254
diff changeset
1086 }
231
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
1087 pst_freeItem(item);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
1088 }
143
fdc58ad2c758 fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents: 142
diff changeset
1089
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1090 DEBUG_RET();
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1091 }
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
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1094 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
1095 {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1096 DEBUG_ENT("write_inline_attachment");
266
3f323c867cb4 adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents: 264
diff changeset
1097 DEBUG_INFO(("Attachment Size is %#"PRIx64", data = %#"PRIxPTR", id %#"PRIx64"\n", (uint64_t)attach->data.size, attach->data.data, 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
1098
320cfcba8058 add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents: 191
diff changeset
1099 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
1100 // 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
1101 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
1102 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
1103 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
1104 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
1105 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
1106 }
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
1107 }
121
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 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
1110 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
1111 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
1112 } else {
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1113 fprintf(f_output, "Content-Type: %s\n", attach->mimetype.str);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1114 }
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1115 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
1116
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1117 if (attach->filename2.str) {
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1118 // use the long filename, converted to proper encoding if needed.
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1119 // it is already utf8
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1120 pst_rfc2231(&attach->filename2);
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1121 fprintf(f_output, "Content-Disposition: attachment; \n filename*=%s\n\n", attach->filename2.str);
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1122 }
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1123 else if (attach->filename1.str) {
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1124 // short filename never needs encoding
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1125 fprintf(f_output, "Content-Disposition: attachment; filename=\"%s\"\n\n", attach->filename1.str);
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1126 }
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1127 else {
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1128 // no filename is inline
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1129 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
1130 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1131
195
320cfcba8058 add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents: 191
diff changeset
1132 (void)pst_attach_to_file_base64(pst, attach, f_output);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1133 fprintf(f_output, "\n\n");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1134 DEBUG_RET();
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1135 }
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1136
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1137
277
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1138 int valid_headers(char *header)
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1139 {
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1140 // headers are sometimes really bogus - they seem to be fragments of the
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1141 // message body, so we only use them if they seem to be real rfc822 headers.
282
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1142 // this list is composed of ones that we have seen in real pst files.
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1143 // there are surely others. the problem is - given an arbitrary character
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1144 // string, is it a valid (or even reasonable) set of rfc822 headers?
278
06e723720db0 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 277
diff changeset
1145 if (header) {
282
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1146 if ((strncasecmp(header, "X-Barracuda-URL: ", 17) == 0) ||
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1147 (strncasecmp(header, "X-ASG-Debug-ID: ", 16) == 0) ||
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1148 (strncasecmp(header, "Return-Path: ", 13) == 0) ||
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1149 (strncasecmp(header, "Received: ", 10) == 0) ||
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1150 (strncasecmp(header, "Subject: ", 9) == 0) ||
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1151 (strncasecmp(header, "Date: ", 6) == 0) ||
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1152 (strncasecmp(header, "From: ", 6) == 0) ||
57c3bcf22c4f ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 281
diff changeset
1153 (strncasecmp(header, "X-x: ", 5) == 0) ||
281
d9b1e2e0f25a ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 280
diff changeset
1154 (strncasecmp(header, "Microsoft Mail Internet Headers", 31) == 0)) {
278
06e723720db0 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 277
diff changeset
1155 return 1;
06e723720db0 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 277
diff changeset
1156 }
06e723720db0 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 277
diff changeset
1157 else {
279
8c2c7d8d7518 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 278
diff changeset
1158 if (strlen(header) > 2) {
8c2c7d8d7518 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 278
diff changeset
1159 DEBUG_INFO(("Ignore bogus headers = %s\n", header));
8c2c7d8d7518 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 278
diff changeset
1160 }
278
06e723720db0 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 277
diff changeset
1161 return 0;
06e723720db0 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 277
diff changeset
1162 }
277
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1163 }
278
06e723720db0 ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 277
diff changeset
1164 else return 0;
277
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1165 }
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1166
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1167
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1168 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
1169 {
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1170 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
1171 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
1172 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
1173 *flag = 1;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1174 }
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1175 DEBUG_RET();
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1176 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1177
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1178
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1179 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
1180 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1181 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
1182 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
1183 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
1184 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
1185 field++;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1186 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
1187 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
1188 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
1189 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
1190 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
1191 if (*s == '"') {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1192 s++;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1193 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
1194 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1195 else {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1196 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
1197 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
1198 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
1199 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1200 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
1201 save = *e;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1202 *e = '\0';
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1203 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
1204 *e = save;
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
1205 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
1206 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1207 DEBUG_RET();
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1208 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1209
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1210 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
1211 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1212 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
1213 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
1214 return t;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1215 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1216
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1217
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1218 // 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
1219 // 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
1220 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
1221 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1222 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
1223 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
1224 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
1225 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1226 return e;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1227 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1228
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1229
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1230 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
1231 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1232 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
1233 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
1234 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
1235 if (e) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1236 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
1237 while (*e != '\0') {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1238 *t = *e;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1239 t++;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1240 e++;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1241 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1242 *t = '\0';
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 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1245 // 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
1246 *t = '\0';
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1247 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1248 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1249 }
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
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1252 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
1253 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1254 int b64 = 0;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1255 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
1256 DEBUG_ENT("test_base64");
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1257 while (*b) {
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1258 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
1259 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
1260 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
1261 b64 = 1;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1262 break;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1263 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1264 b++;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1265 }
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1266 DEBUG_RET();
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1267 return b64;
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1268 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1269
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1270
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1271 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
1272 {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1273 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
1274 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
1275 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
1276 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
1277 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
1278 if (rc == 0) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1279 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
1280 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
1281 if (s != -1) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1282 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
1283 html[e] = '\0';
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1284 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
1285 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
1286 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
1287 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1288 else {
203
9fb600ef4e03 cleanup debug logging
Carl Byington <carl@five-ten-sg.com>
parents: 202
diff changeset
1289 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
1290 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
1291 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1292 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1293 else {
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
1294 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
1295 }
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1296 DEBUG_RET();
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1297 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1298
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1299
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1300 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
1301 {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1302 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
1303 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
1304 if (headers) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1305 char *temp, *t;
146
0695de3b5a98 fix for 64bit on Fedora 11
Carl Byington <carl@five-ten-sg.com>
parents: 143
diff changeset
1306 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
1307 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
1308 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
1309 if (t) {
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1310 t++;
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
1311 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
1312 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
1313 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
1314 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
1315 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
1316 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
1317 s += 2;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1318 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
1319 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
1320 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
1321 break;
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1322 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1323 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1324 }
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
1325 //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
1326 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
1327 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1328 *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
1329 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1330 DEBUG_RET();
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1331 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1332
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
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 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
1335 {
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1336 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
1337 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
1338 // 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
1339 // 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
1340 // 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
1341 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
1342 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
1343 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
1344 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
1345 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
1346 // 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
1347 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
1348 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
1349 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
1350 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1351 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
1352 // 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
1353 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
1354 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
1355 free(body->str);
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1356 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
1357 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1358 free(newer);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1359 }
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1360 removeCR(body->str);
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1361 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
1362 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
1363 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
1364 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
1365 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
1366 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
1367 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
1368 if (enc) {
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1369 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
1370 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
1371 free(enc);
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1372 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1373 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1374 else {
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1375 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
1376 }
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1377 DEBUG_RET();
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1378 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1379
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1380
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1381 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
1382 {
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1383 fprintf(f_output, "BEGIN:VCALENDAR\n");
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1384 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
1385 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
1386 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
1387 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
1388 if (sender) {
85d77d7b034b another patche from Kenneth Berland for solaris
Carl Byington <carl@five-ten-sg.com>
parents: 246
diff changeset
1389 if (item->email->outlook_sender_name.str) {
297
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
1390 fprintf(f_output, "ORGANIZER;CN=\"%s\":MAILTO:%s\n", item->email->outlook_sender_name.str, sender);
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
1391 } else {
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
1392 fprintf(f_output, "ORGANIZER;CN=\"\":MAILTO:%s\n", sender);
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
1393 }
247
85d77d7b034b another patche from Kenneth Berland for solaris
Carl Byington <carl@five-ten-sg.com>
parents: 246
diff changeset
1394 }
242
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1395 write_appointment(f_output, item);
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1396 fprintf(f_output, "END:VCALENDAR\n");
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1397 }
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1398
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1399
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1400 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
1401 {
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1402 const char* method = "REQUEST";
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1403 const char* charset = "utf-8";
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1404 char fname[30];
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1405 if (!item->appointment) return;
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1406
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1407 // inline appointment request
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1408 fprintf(f_output, "\n--%s\n", boundary);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1409 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
1410 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
1411 fprintf(f_output, "\n");
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1412
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1413 // attachment appointment request
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1414 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
1415 fprintf(f_output, "\n--%s\n", boundary);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1416 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
1417 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
1418 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
1419 fprintf(f_output, "\n");
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1420 }
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1421
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1422
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1423 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
1424 {
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1425 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
1426 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
1427 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
1428 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
1429 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
1430 char body_report[60];
129
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1431 char sender[60];
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1432 int sender_known = 0;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1433 char *temp = NULL;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1434 time_t em_time;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1435 char *c_time;
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1436 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
1437 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
1438 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
1439 DEBUG_ENT("write_normal_email");
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1440
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1441 pst_convert_utf8_null(item, &item->email->header);
277
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1442 headers = valid_headers(item->email->header.str) ? item->email->header.str :
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1443 valid_headers(*extra_mime_headers) ? *extra_mime_headers :
86078d0c2e9c ignore internet headers that don't seem to be real rfc822 headers
Carl Byington <carl@five-ten-sg.com>
parents: 276
diff changeset
1444 NULL;
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1445
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1446 // 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
1447 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
1448 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
1449 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
1450 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
1451
129
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1452 // setup default sender
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1453 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
1454 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
1455 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
1456 sender_known = 1;
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1457 }
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1458 else {
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1459 temp = "MAILER-DAEMON";
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1460 }
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1461 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
1462 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
1463
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1464 // 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
1465 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
1466 em_time = pst_fileTimeToUnixTime(item->email->sent_date);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1467 c_time = ctime(&em_time);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1468 if (c_time)
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1469 c_time[strlen(c_time)-1] = '\0'; //remove end \n
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1470 else
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1471 c_time = "Fri Dec 28 12:06:21 2001";
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1472 } else
274
ebcfb23390a4 add some debug code
Carl Byington <carl@five-ten-sg.com>
parents: 266
diff changeset
1473 c_time = "Fri Dec 28 12:06:21 2001";
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1474
205
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1475 // 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
1476 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
1477 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
1478
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1479 // 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
1480 if (headers ) {
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1481 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
1482 removeCR(headers);
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1483
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1484 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
1485 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
1486 // 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
1487 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
1488 // 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
1489 // we use these to find the actual rfc822 headers for embedded message/rfc822 mime parts
275
e02c81c39232 add some debug code
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1490 // but only for the outermost message
e02c81c39232 add some debug code
Carl Byington <carl@five-ten-sg.com>
parents: 274
diff changeset
1491 if (!*extra_mime_headers) *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
1492 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
1493 }
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1494
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1495 // 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
1496 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
1497 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
1498 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
1499 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
1500 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
1501 header_has_field(headers, "\nMessage-Id: ", &has_msgid);
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1502
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1503 // 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
1504 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
1505 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
1506 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
1507
129
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1508 // 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
1509 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
1510 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
1511 if (t) {
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1512 // 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
1513 t++;
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1514 char *n = strchr(t, '\n');
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1515 char *s = strchr(t, '<');
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1516 char *e = strchr(t, '>');
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1517 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
1518 char save = *e;
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1519 *e = '\0';
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1520 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
1521 *e = save;
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1522 }
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1523 }
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1524 }
fc11b1d1ad34 fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents: 125
diff changeset
1525
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1526 // 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
1527 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
1528 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
1529 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
1530 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
1531 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
1532 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
1533 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
1534 header_strip_field(headers, "\nX-From_: ");
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1535 }
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1536
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
1537 DEBUG_INFO(("About to print Header\n"));
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1538
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1539 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
1540 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
1541 DEBUG_INFO(("item->subject = %s\n", item->subject.str));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1542 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1543
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
1544 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
1545 // 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
1546 // 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
1547 // 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
1548 // 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
1549 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
1550 }
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
1551
141
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1552 // 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
1553 if (headers) {
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
1554 int len = strlen(headers);
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
1555 if (len > 0) {
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
1556 fprintf(f_output, "%s", headers);
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
1557 // make sure the headers end with a \n
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
1558 if (headers[len-1] != '\n') fprintf(f_output, "\n");
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1559 //char *h = headers;
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1560 //while (*h) {
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1561 // char *e = strchr(h, '\n');
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1562 // int d = 1; // normally e points to trailing \n
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1563 // if (!e) {
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1564 // e = h + strlen(h); // e points to trailing null
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1565 // d = 0;
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1566 // }
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1567 // // we could do rfc2047 encoding here if needed
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1568 // fprintf(f_output, "%.*s\n", (int)(e-h), h);
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1569 // h = e + d;
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1570 //}
230
42b38d65f7e4 patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 213
diff changeset
1571 }
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1572 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1573
292
e0e5844d91b3 patch from Leo Antunes for Status: header
Carl Byington <carl@five-ten-sg.com>
parents: 291
diff changeset
1574 // record read status
e0e5844d91b3 patch from Leo Antunes for Status: header
Carl Byington <carl@five-ten-sg.com>
parents: 291
diff changeset
1575 if ((item->flags & PST_FLAG_READ) == PST_FLAG_READ) {
e0e5844d91b3 patch from Leo Antunes for Status: header
Carl Byington <carl@five-ten-sg.com>
parents: 291
diff changeset
1576 fprintf(f_output, "Status: RO\n");
e0e5844d91b3 patch from Leo Antunes for Status: header
Carl Byington <carl@five-ten-sg.com>
parents: 291
diff changeset
1577 }
e0e5844d91b3 patch from Leo Antunes for Status: header
Carl Byington <carl@five-ten-sg.com>
parents: 291
diff changeset
1578
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1579 // 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
1580
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1581 if (!has_from) {
246
5a82d41c883d patches from Kenneth Berland for solaris
Carl Byington <carl@five-ten-sg.com>
parents: 242
diff changeset
1582 if (item->email->outlook_sender_name.str){
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1583 pst_rfc2047(item, &item->email->outlook_sender_name, 1);
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1584 fprintf(f_output, "From: %s <%s>\n", item->email->outlook_sender_name.str, sender);
246
5a82d41c883d patches from Kenneth Berland for solaris
Carl Byington <carl@five-ten-sg.com>
parents: 242
diff changeset
1585 } else {
5a82d41c883d patches from Kenneth Berland for solaris
Carl Byington <carl@five-ten-sg.com>
parents: 242
diff changeset
1586 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
1587 }
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1588 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1589
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1590 if (!has_subject) {
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1591 if (item->subject.str) {
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1592 pst_rfc2047(item, &item->subject, 0);
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1593 fprintf(f_output, "Subject: %s\n", item->subject.str);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1594 } else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1595 fprintf(f_output, "Subject: \n");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1596 }
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1597 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1598
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1599 if (!has_to && item->email->sentto_address.str) {
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1600 pst_rfc2047(item, &item->email->sentto_address, 0);
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1601 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
1602 }
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
1603
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1604 if (!has_cc && item->email->cc_address.str) {
257
c947b8812120 rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents: 255
diff changeset
1605 pst_rfc2047(item, &item->email->cc_address, 0);
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1606 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
1607 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1608
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1609 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
1610 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
1611 struct tm stm;
d360f96f71f6 start changes for parallel readpst on multi-processor machines
Carl Byington <carl@five-ten-sg.com>
parents: 199
diff changeset
1612 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
1613 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
1614 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
1615 }
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1616
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1617 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
1618 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
1619 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
1620 }
fd4297884319 improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents: 139
diff changeset
1621
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
1622 // 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
1623 // 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
1624 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
1625 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
1626 && strcmp(item->email->sender_address.str, ".")
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
1627 && (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
1628 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
1629 }
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
1630
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1631 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
1632 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
1633 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
1634 }
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
1635
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1636 // add our own mime headers
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1637 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
1638 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
1639 // 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
1640 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
1641 }
205
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1642 else {
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1643 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
1644 }
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1645 fprintf(f_output, "\n"); // end of headers, start of body
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1646
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1647 // now dump the body parts
234
ed0cb66b23d4 better detection of dsn delivery reports
Carl Byington <carl@five-ten-sg.com>
parents: 233
diff changeset
1648 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
1649 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
1650 fprintf(f_output, "\n");
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1651 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1652
205
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1653 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
1654 // 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
1655 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
1656 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
1657 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
1658 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1659 else {
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1660 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
1661 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1662
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1663 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
1664 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
1665 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1666
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1667 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
1668 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
1669 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
1670 }
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1671
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1672 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
1673 // 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
1674 fprintf(f_output, "\n--%s--\n", altboundary);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1675 }
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1676
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
1677 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
1678 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
1679 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
1680 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
1681 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
1682 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
1683 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
1684 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
1685 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
1686 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
1687 attach->mimetype.is_utf8 = 1;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1688 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1689
205
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1690 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
1691 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
1692 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
1693 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
1694 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
1695 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
1696 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
1697 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
1698 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
1699 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
1700 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1701
205
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1702 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
1703 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
1704 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
1705 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
1706 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
1707 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
1708 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
1709 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
1710 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
1711 item->email->encrypted_htmlbody.data = NULL;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1712 }
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1713
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1714 if (item->type == PST_TYPE_SCHEDULE) {
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1715 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
1716 }
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1717
121
8399ef94c11b strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents: 120
diff changeset
1718 // 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
1719 {
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
1720 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
1721 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
1722 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
1723 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
1724 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
1725 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
1726 DEBUG_INFO(("Attempting Attachment encoding\n"));
233
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
1727 if (attach->method == PST_ATTACH_EMBEDDED) {
236
093e0e9248bb cleanup rfc822 embedded message code
Carl Byington <carl@five-ten-sg.com>
parents: 234
diff changeset
1728 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
1729 if (attach->mimetype.str) {
236
093e0e9248bb cleanup rfc822 embedded message code
Carl Byington <carl@five-ten-sg.com>
parents: 234
diff changeset
1730 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
1731 free(attach->mimetype.str);
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
1732 }
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
1733 attach->mimetype.str = strdup(RFC822);
1d50ff3c5091 better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents: 231
diff changeset
1734 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
1735 find_rfc822_headers(extra_mime_headers);
300
47abe56076da embedded rfc822 messages might contain rtf encoded bodies
Carl Byington <carl@five-ten-sg.com>
parents: 298
diff changeset
1736 write_embedded_message(f_output, attach, boundary, pst, save_rtf, 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
1737 }
167
40e9de445038 improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents: 164
diff changeset
1738 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
1739 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
1740 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
1741 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
1742 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
1743 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1744 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1745 }
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
1746
205
5f3fa53cb0e1 make nested mime multipart/alternative to hold the text/html parts
Carl Byington <carl@five-ten-sg.com>
parents: 203
diff changeset
1747 fprintf(f_output, "\n--%s--\n\n", boundary);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1748 DEBUG_RET();
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1749 }
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1750
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1751
211
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1752 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
1753 {
211
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1754 char* result = NULL;
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1755 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
1756 char time_buffer[30];
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1757 // 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
1758 // may free the buffer returned by the first call.
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1759 // I had tried to place those into a single printf - Carl.
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
1760
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1761 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
1762
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1763 // make everything utf8
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1764 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
1765 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
1766 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
1767 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
1768 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
1769 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
1770 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
1771 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
1772 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
1773 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
1774 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
1775 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
1776 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
1777 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
1778 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
1779 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
1780 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
1781 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
1782 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
1783 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
1784 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
1785 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
1786 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
1787 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
1788 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
1789 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
1790 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
1791 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
1792 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
1793 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
1794 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
1795 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
1796 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
1797 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
1798 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
1799 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
1800 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
1801 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
1802 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
1803 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
1804 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
1805 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
1806 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
1807 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
1808 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
1809 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
1810 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
1811 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
1812 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
1813 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
1814 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
1815 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
1816
50
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
1817 // 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
1818 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
1819 fprintf(f_output, "FN:%s\n", pst_rfc2426_escape(contact->fullname.str, &result, &resultlen));
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
1820
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1821 //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
1822 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
1823 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
1824 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
1825 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
1826 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
1827
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1828 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
1829 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
1830 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
1831 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
1832 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
1833 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
1834 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
1835 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
1836 if (contact->birthday)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1837 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
1838
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1839 if (contact->home_address.str) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1840 //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
1841 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
1842 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
1843 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
1844 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
1845 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
1846 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
1847 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
1848 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
1849 }
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
1850
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1851 if (contact->business_address.str) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1852 //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
1853 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
1854 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
1855 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
1856 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
1857 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
1858 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
1859 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
1860 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
1861 }
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
1862
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1863 if (contact->other_address.str) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1864 //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
1865 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
1866 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
1867 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
1868 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
1869 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
1870 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
1871 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
1872 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
1873 }
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
1874
211
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1875 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
1876 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
1877 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
1878 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
1879 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
1880 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
1881 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
1882 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
1883 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
1884 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
1885 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
1886 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
1887 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
1888 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
1889 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
1890 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
1891 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
1892 if (contact->assistant_name.str || contact->assistant_phone.str) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1893 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
1894 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
1895 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
1896 }
211
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1897 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
1898 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
1899 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
1900
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1901 write_extra_categories(f_output, item);
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1902
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1903 fprintf(f_output, "VERSION: 3.0\n");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1904 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
1905 if (result) free(result);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1906 DEBUG_RET();
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1907 }
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1908
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
1909
242
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1910 /**
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1911 * 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
1912 *
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1913 * @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
1914 * @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
1915 * @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
1916 */
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1917 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
1918 {
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1919 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
1920 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
1921 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
1922 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
1923 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
1924 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
1925 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
1926 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
1927 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
1928 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
1929 }
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1930 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
1931 }
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1932 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
1933 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
1934 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
1935 }
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1936
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1937
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1938 void write_journal(FILE* f_output, pst_item* item)
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
1939 {
211
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1940 char* result = NULL;
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1941 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
1942 char time_buffer[30];
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1943 pst_item_journal* journal = item->journal;
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1944
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1945 // make everything utf8
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1946 pst_convert_utf8_null(item, &item->subject);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1947 pst_convert_utf8_null(item, &item->body);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1948
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1949 fprintf(f_output, "BEGIN:VJOURNAL\n");
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1950 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
1951 if (item->create_date)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1952 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
1953 if (item->modify_date)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1954 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
1955 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
1956 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
1957 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
1958 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
1959 if (journal && journal->start)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1960 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
1961 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
1962 if (result) free(result);
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1963 }
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1964
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1965
242
67b24d6a45d6 patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents: 239
diff changeset
1966 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
1967 {
211
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1968 char* result = NULL;
94bde95d7e18 the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents: 205
diff changeset
1969 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
1970 char time_buffer[30];
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1971 pst_item_appointment* appointment = item->appointment;
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
1972
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1973 // make everything utf8
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
1974 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
1975 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
1976 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
1977
297
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
1978 fprintf(f_output, "UID:%#"PRIx64"\n", item->block_id);
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1979 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
1980 if (item->create_date)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1981 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
1982 if (item->modify_date)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1983 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
1984 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
1985 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
1986 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
1987 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
1988 if (appointment && appointment->start)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1989 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
1990 if (appointment && appointment->end)
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
1991 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
1992 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
1993 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
1994 if (appointment) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
1995 switch (appointment->showas) {
50
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
1996 case PST_FREEBUSY_TENTATIVE:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
1997 fprintf(f_output, "STATUS:TENTATIVE\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
1998 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
1999 case PST_FREEBUSY_FREE:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2000 // mark as transparent and as confirmed
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2001 fprintf(f_output, "TRANSP:TRANSPARENT\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2002 case PST_FREEBUSY_BUSY:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2003 case PST_FREEBUSY_OUT_OF_OFFICE:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2004 fprintf(f_output, "STATUS:CONFIRMED\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2005 break;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2006 }
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2007 if (appointment->is_recurring) {
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2008 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
2009 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
2010 pst_recurrence *rdata = pst_convert_recurrence(appointment);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2011 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
2012 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
2013 if ((rdata->interval != 1) &&
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
2014 (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
2015 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
2016 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
2017 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
2018 if (rdata->bydaymask) {
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2019 char byday[40];
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2020 int empty = 1;
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2021 int i=0;
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2022 memset(byday, 0, sizeof(byday));
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2023 for (i=0; i<6; i++) {
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2024 int bit = 1 << i;
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2025 if (bit & rdata->bydaymask) {
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2026 char temp[40];
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
2027 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
2028 strcpy(byday, temp);
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2029 empty = 0;
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2030 }
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2031 }
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
2032 fprintf(f_output, "%s", byday);
199
e3a46f66332b more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents: 198
diff changeset
2033 }
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2034 fprintf(f_output, "\n");
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2035 pst_free_recurrence(rdata);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2036 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2037 switch (appointment->label) {
50
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2038 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
2039 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
2040 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2041 case PST_APP_LABEL_IMPORTANT:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2042 fprintf(f_output, "CATEGORIES:IMPORTANT\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2043 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2044 case PST_APP_LABEL_BUSINESS:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2045 fprintf(f_output, "CATEGORIES:BUSINESS\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2046 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2047 case PST_APP_LABEL_PERSONAL:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2048 fprintf(f_output, "CATEGORIES:PERSONAL\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2049 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2050 case PST_APP_LABEL_VACATION:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2051 fprintf(f_output, "CATEGORIES:VACATION\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2052 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2053 case PST_APP_LABEL_MUST_ATTEND:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2054 fprintf(f_output, "CATEGORIES:MUST-ATTEND\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2055 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2056 case PST_APP_LABEL_TRAVEL_REQ:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2057 fprintf(f_output, "CATEGORIES:TRAVEL-REQUIRED\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2058 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2059 case PST_APP_LABEL_NEEDS_PREP:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2060 fprintf(f_output, "CATEGORIES:NEEDS-PREPARATION\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2061 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2062 case PST_APP_LABEL_BIRTHDAY:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2063 fprintf(f_output, "CATEGORIES:BIRTHDAY\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2064 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2065 case PST_APP_LABEL_ANNIVERSARY:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2066 fprintf(f_output, "CATEGORIES:ANNIVERSARY\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2067 break;
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2068 case PST_APP_LABEL_PHONE_CALL:
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2069 fprintf(f_output, "CATEGORIES:PHONE-CALL\n");
fb3818370dd6 more fixes for 64 bit format
carl
parents: 48
diff changeset
2070 break;
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2071 }
297
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2072 // ignore bogus alarms
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2073 if (appointment->alarm && (appointment->alarm_minutes >= 0) && (appointment->alarm_minutes < 1440)) {
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2074 fprintf(f_output, "BEGIN:VALARM\n");
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2075 fprintf(f_output, "TRIGGER:-PT%dM\n", appointment->alarm_minutes);
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2076 fprintf(f_output, "ACTION:DISPLAY\n");
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2077 fprintf(f_output, "DESCRIPTION:Reminder\n");
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2078 fprintf(f_output, "END:VALARM\n");
8b3a827b71f4 add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents: 292
diff changeset
2079 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2080 }
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2081 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
2082 if (result) free(result);
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2083 }
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2084
31
b88ceb81dba2 mege changes from Joe Nahmias
carl
parents: 28
diff changeset
2085
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2086 void create_enter_dir(struct file_ll* f, pst_item *item)
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2087 {
151
cda7c812ec01 track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents: 150
diff changeset
2088 pst_convert_utf8(item, &item->file_as);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2089 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
2090 f->stored_count = (item->folder) ? item->folder->item_count : 0;
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2091
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2092 DEBUG_ENT("create_enter_dir");
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2093 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
2094 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
2095 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
2096 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
2097 if (mode_thunder) {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
2098 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
2099 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
2100 fclose(type_file);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
2101 }
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
2102 } else if (mode == MODE_SEPARATE) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2103 // 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
2104 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
2105 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
2106 memset(f->name, 0, file_name_len);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2107 } 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
2108 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
2109 sprintf(f->name, OUTPUT_TEMPLATE, item->file_as.str);
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2110 }
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2111
172
6954d315aaa8 move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents: 171
diff changeset
2112 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
2113 strcpy(f->dname, item->file_as.str);
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2114
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2115 if (overwrite != 1) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2116 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
2117 char *temp = (char*) pst_malloc (strlen(f->name)+10); //enough room for 10 digits
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2118
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2119 sprintf(temp, "%s", f->name);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2120 check_filename(temp);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2121 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
2122 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
2123 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
2124 x++;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2125 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
2126 DEBUG_INFO(("- trying \"%s\"\n", f->name));
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2127 if (x == 99999999) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2128 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
2129 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2130 fclose(f->output);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2131 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2132 if (x > 0) { //then the f->name should change
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2133 free (f->name);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2134 f->name = temp;
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2135 } else {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2136 free(temp);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2137 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2138 }
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2139
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
2140 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
2141 if (mode != MODE_SEPARATE) {
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2142 check_filename(f->name);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2143 if (!(f->output = fopen(f->name, "w"))) {
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2144 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
2145 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2146 }
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2147 DEBUG_RET();
25
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2148 }
73e8959cd86b patches from Arne
carl
parents: 21
diff changeset
2149
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2150
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2151 void close_enter_dir(struct file_ll *f)
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2152 {
202
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
2153 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
2154 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
2155 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
2156 pst_debug_lock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
2157 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
2158 fflush(stdout);
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
2159 pst_debug_unlock();
2f38c4ce606f remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents: 201
diff changeset
2160 }
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2161 if (f->output) {
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
2162 if (mode == MODE_SEPARATE) DEBUG_WARN(("close_enter_dir finds open separate file\n"));
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2163 struct stat st;
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2164 fclose(f->output);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2165 stat(f->name, &st);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2166 if (!st.st_size) {
201
3850a3b11745 fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents: 200
diff changeset
2167 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
2168 remove(f->name);
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2169 }
291
bc23fba0da8e possible fix for corrupted output forking for separate messages
Carl Byington <carl@five-ten-sg.com>
parents: 290
diff changeset
2170 f->output = NULL;
198
7c60d6d1c681 decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents: 197
diff changeset
2171 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2172 free(f->name);
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2173 free(f->dname);
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2174
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2175 if (mode == MODE_KMAIL)
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2176 close_kmail_dir();
231
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
2177 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
2178 if (mode_thunder) {
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
2179 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
2180 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
2181 fclose(type_file);
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
2182 }
43
f6db1f060a95 start on outlook 2003 64 bit format
carl
parents: 41
diff changeset
2183 close_recurse_dir();
231
fe64279df92b patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents: 230
diff changeset
2184 } else if (mode == MODE_SEPARATE)
77
87216aefc6df spelling fixup
Carl Byington <carl@five-ten-sg.com>
parents: 75
diff changeset
2185 close_separate_dir();
39
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2186 }
2ad7ef0a3c4f more valgrind fixes
carl
parents: 38
diff changeset
2187