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