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