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