Mercurial > libpst
annotate src/readpst.c @ 160:252ad66d3d6e stable-0-6-32
fix ppc64 compile error
| author | Carl Byington <carl@five-ten-sg.com> |
|---|---|
| date | Sat, 14 Mar 2009 17:45:48 -0700 |
| parents | 581fab9f1dc7 |
| children | ab384fed78c5 |
| 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; | |
| 24 int32_t email_count; | |
| 25 int32_t skip_count; | |
| 26 int32_t type; | |
| 16 | 27 }; |
| 31 | 28 |
| 43 | 29 void process(pst_item *outeritem, pst_desc_ll *d_ptr); |
| 30 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
|
31 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
|
32 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
|
33 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
|
34 char* mk_kmail_dir(char* fname); |
| 43 | 35 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
|
36 char* mk_recurse_dir(char* dir, int32_t folder_type); |
| 43 | 37 int close_recurse_dir(); |
| 77 | 38 char* mk_separate_dir(char *dir); |
| 39 int close_separate_dir(); | |
| 40 int mk_separate_file(struct file_ll *f); | |
| 43 | 41 char* my_stristr(char *haystack, char *needle); |
| 42 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
|
43 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
|
44 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
|
45 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
|
46 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
|
47 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
|
48 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
|
49 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
|
50 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
|
51 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
|
52 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
|
53 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
|
54 void write_body_part(FILE* f_output, pst_string *body, char *mime, char *charset, char *boundary, pst_file* pst); |
|
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 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
|
56 void write_vcard(FILE* f_output, pst_item *item, pst_item_contact* contact, char comment[]); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
57 void write_appointment(FILE* f_output, pst_item *item, pst_item_appointment* appointment, |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
58 FILETIME* create_date, FILETIME* modify_date); |
| 43 | 59 void create_enter_dir(struct file_ll* f, pst_item *item); |
| 60 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
|
61 |
|
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
|
62 const char* prog_name; |
|
34
07177825c91b
fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents:
33
diff
changeset
|
63 char* output_dir = "."; |
|
07177825c91b
fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents:
33
diff
changeset
|
64 char* kmail_chdir = NULL; |
| 77 | 65 |
| 16 | 66 // Normal mode just creates mbox format files in the current directory. Each file is named |
| 67 // the same as the folder's name that it represents | |
| 68 #define MODE_NORMAL 0 | |
| 77 | 69 |
| 16 | 70 // KMail mode creates a directory structure suitable for being used directly |
| 71 // by the KMail application | |
| 72 #define MODE_KMAIL 1 | |
| 77 | 73 |
| 16 | 74 // recurse mode creates a directory structure like the PST file. Each directory |
| 75 // contains only one file which stores the emails in mbox format. | |
| 76 #define MODE_RECURSE 2 | |
| 77 | 77 |
| 78 // separate mode creates the same directory structure as recurse. The emails are stored in | |
| 79 // separate files, numbering from 1 upward. Attachments belonging to the emails are | |
| 16 | 80 // saved as email_no-filename (e.g. 1-samplefile.doc or 000001-Attachment2.zip) |
| 77 | 81 #define MODE_SEPARATE 3 |
| 82 | |
| 43 | 83 // Decrypt the whole file (even the parts that aren't encrypted) and ralph it to stdout |
| 84 #define MODE_DECSPEW 4 | |
| 16 | 85 |
| 86 | |
| 87 // Output Normal just prints the standard information about what is going on | |
| 88 #define OUTPUT_NORMAL 0 | |
| 77 | 89 |
| 16 | 90 // Output Quiet is provided so that only errors are printed |
| 91 #define OUTPUT_QUIET 1 | |
| 92 | |
| 93 // default mime-type for attachments that have a null mime-type | |
| 94 #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
|
95 #define RFC822 "message/rfc822" |
| 16 | 96 |
| 97 // output mode for contacts | |
| 98 #define CMODE_VCARD 0 | |
| 43 | 99 #define CMODE_LIST 1 |
| 16 | 100 |
|
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
|
101 // 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
|
102 #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
|
103 #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
|
104 |
| 16 | 105 // output settings for RTF bodies |
| 106 // filename for the attachment | |
| 107 #define RTF_ATTACH_NAME "rtf-body.rtf" | |
| 108 // mime type for the attachment | |
| 109 #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
|
110 |
| 39 | 111 // global settings |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
112 int mode = MODE_NORMAL; |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
113 int mode_MH = 0; // a submode of MODE_SEPARATE |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
114 int output_mode = OUTPUT_NORMAL; |
| 39 | 115 int contact_mode = CMODE_VCARD; |
|
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
|
116 int deleted_mode = DMODE_EXCLUDE; |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
117 int contact_mode_specified = 0; |
| 39 | 118 int overwrite = 0; |
| 119 int save_rtf_body = 1; | |
| 120 pst_file pstfile; | |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
121 regex_t meta_charset_pattern; |
| 39 | 122 |
| 123 | |
| 124 void process(pst_item *outeritem, pst_desc_ll *d_ptr) | |
| 125 { | |
| 43 | 126 struct file_ll ff; |
| 127 pst_item *item = NULL; | |
| 39 | 128 |
| 43 | 129 DEBUG_ENT("process"); |
| 130 memset(&ff, 0, sizeof(ff)); | |
| 131 create_enter_dir(&ff, outeritem); | |
| 39 | 132 |
| 43 | 133 while (d_ptr) { |
| 134 DEBUG_MAIN(("main: New item record\n")); | |
| 135 if (!d_ptr->desc) { | |
|
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
|
136 DEBUG_WARN(("main: ERROR item's desc record is NULL\n")); |
| 43 | 137 ff.skip_count++; |
| 138 } | |
| 139 else { | |
|
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
|
140 DEBUG_MAIN(("main: Desc Email ID %#"PRIx64" [d_ptr->d_id = %#"PRIx64"]\n", d_ptr->desc->id, d_ptr->d_id)); |
| 39 | 141 |
|
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
142 item = pst_parse_item(&pstfile, d_ptr, NULL); |
| 43 | 143 DEBUG_MAIN(("main: About to process item\n")); |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
144 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
|
145 DEBUG_EMAIL(("item->subject = %s\n", item->subject.str)); |
| 43 | 146 } |
| 147 if (item) { | |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
148 if (item->folder && d_ptr->child && item->file_as.str && (deleted_mode == DMODE_INCLUDE || strcasecmp(item->file_as.str, "Deleted Items"))) { |
| 43 | 149 //if this is a non-empty folder other than deleted items, we want to recurse into it |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
150 if (output_mode != OUTPUT_QUIET) printf("Processing Folder \"%s\"\n", item->file_as.str); |
| 43 | 151 process(item, d_ptr->child); |
| 152 | |
| 153 } else if (item->contact && (item->type == PST_TYPE_CONTACT)) { | |
| 77 | 154 if (mode == MODE_SEPARATE) mk_separate_file(&ff); |
| 43 | 155 ff.email_count++; |
| 156 DEBUG_MAIN(("main: Processing Contact\n")); | |
| 157 if (ff.type != PST_TYPE_CONTACT) { | |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
158 DEBUG_MAIN(("main: I have a contact, but the folder type %"PRIi32" isn't a contacts folder. Processing anyway\n", ff.type)); |
| 43 | 159 } |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
160 if (contact_mode == CMODE_VCARD) { |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
161 pst_convert_utf8_null(item, &item->comment); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
162 write_vcard(ff.output, item, item->contact, item->comment.str); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
163 } |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
164 else { |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
165 pst_convert_utf8(item, &item->contact->fullname); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
166 pst_convert_utf8(item, &item->contact->address1); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
167 fprintf(ff.output, "%s <%s>\n", item->contact->fullname.str, item->contact->address1.str); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
168 } |
| 39 | 169 |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
170 } else if (item->email && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) { |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
171 char *extra_mime_headers = NULL; |
| 77 | 172 if (mode == MODE_SEPARATE) mk_separate_file(&ff); |
| 43 | 173 ff.email_count++; |
| 174 DEBUG_MAIN(("main: Processing Email\n")); | |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
175 if ((ff.type != PST_TYPE_NOTE) && (ff.type != 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
|
176 DEBUG_MAIN(("main: I have an email type %"PRIi32", but the folder type %"PRIi32" isn't an email folder. Processing anyway\n", item->type, ff.type)); |
| 43 | 177 } |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
178 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body, &extra_mime_headers); |
| 39 | 179 |
| 43 | 180 } else if (item->journal && (item->type == PST_TYPE_JOURNAL)) { |
| 77 | 181 if (mode == MODE_SEPARATE) mk_separate_file(&ff); |
| 43 | 182 ff.email_count++; |
| 183 DEBUG_MAIN(("main: Processing Journal Entry\n")); | |
| 184 if (ff.type != PST_TYPE_JOURNAL) { | |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
185 DEBUG_MAIN(("main: I have a journal entry, but the folder type %"PRIi32" isn't a journal folder. Processing anyway\n", ff.type)); |
| 43 | 186 } |
| 187 fprintf(ff.output, "BEGIN:VJOURNAL\n"); | |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
188 if (item->subject.str) { |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
189 pst_convert_utf8(item, &item->subject); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
190 fprintf(ff.output, "SUMMARY:%s\n", pst_rfc2426_escape(item->subject.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
191 } |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
192 if (item->body.str) { |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
193 pst_convert_utf8(item, &item->body); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
194 fprintf(ff.output, "DESCRIPTION:%s\n", pst_rfc2426_escape(item->body.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
195 } |
| 43 | 196 if (item->journal->start) |
| 197 fprintf(ff.output, "DTSTART;VALUE=DATE-TIME:%s\n", pst_rfc2445_datetime_format(item->journal->start)); | |
| 198 fprintf(ff.output, "END:VJOURNAL\n\n"); | |
| 39 | 199 |
| 43 | 200 } else if (item->appointment && (item->type == PST_TYPE_APPOINTMENT)) { |
| 77 | 201 if (mode == MODE_SEPARATE) mk_separate_file(&ff); |
| 43 | 202 ff.email_count++; |
| 203 DEBUG_MAIN(("main: Processing Appointment Entry\n")); | |
| 204 if (ff.type != PST_TYPE_APPOINTMENT) { | |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
205 DEBUG_MAIN(("main: I have an appointment, but folder type %"PRIi32" isn't an appointment folder. Processing anyway\n", ff.type)); |
| 43 | 206 } |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
207 write_appointment(ff.output, item, item->appointment, item->create_date, item->modify_date); |
| 39 | 208 |
|
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
77
diff
changeset
|
209 } else if (item->message_store) { |
|
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
77
diff
changeset
|
210 // there should only be one message_store, and we have already done it |
|
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
77
diff
changeset
|
211 DEBUG_MAIN(("item with message store content, type %i %s folder type %i, skipping it\n", item->type, item->ascii_type, ff.type)); |
|
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
77
diff
changeset
|
212 |
| 43 | 213 } else { |
|
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
|
214 // these all seem to be things that MS agrees are not included in the item count |
|
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
59
diff
changeset
|
215 //ff.skip_count++; |
|
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
59
diff
changeset
|
216 DEBUG_MAIN(("main: Unknown item type %i (%s) name (%s)\n", |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
217 item->type, item->ascii_type, item->file_as.str)); |
| 43 | 218 } |
| 46 | 219 pst_freeItem(item); |
| 43 | 220 } else { |
| 221 ff.skip_count++; | |
| 222 DEBUG_MAIN(("main: A NULL item was seen\n")); | |
| 223 } | |
| 224 d_ptr = d_ptr->next; | |
| 225 } | |
| 226 } | |
| 227 close_enter_dir(&ff); | |
| 228 DEBUG_RET(); | |
| 39 | 229 } |
| 230 | |
| 231 | |
|
34
07177825c91b
fix signed/unsigned to allow very small pst files with only leaf nodes
carl
parents:
33
diff
changeset
|
232 |
|
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
|
233 int main(int argc, char* const* argv) { |
| 43 | 234 pst_item *item = NULL; |
| 235 pst_desc_ll *d_ptr; | |
| 236 char * fname = NULL; | |
| 48 | 237 char *d_log = NULL; |
| 43 | 238 int c,x; |
| 239 char *temp = NULL; //temporary char pointer | |
| 240 prog_name = argv[0]; | |
| 16 | 241 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
242 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
|
243 srand((unsigned)now); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
244 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
245 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
|
246 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
|
247 exit(3); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
248 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
249 |
| 43 | 250 // command-line option handling |
|
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
|
251 while ((c = getopt(argc, argv, "bCc:Dd:hko:qrSMVw"))!= -1) { |
| 43 | 252 switch (c) { |
| 253 case 'b': | |
| 254 save_rtf_body = 0; | |
| 255 break; | |
| 256 case 'C': | |
| 257 mode = MODE_DECSPEW; | |
| 258 break; | |
| 259 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
|
260 if (optarg && optarg[0]=='v') { |
| 43 | 261 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
|
262 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
|
263 } |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
264 else if (optarg && optarg[0]=='l') { |
| 43 | 265 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
|
266 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
|
267 } |
| 43 | 268 else { |
| 269 usage(); | |
| 270 exit(0); | |
| 271 } | |
| 272 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
|
273 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
|
274 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
|
275 break; |
| 43 | 276 case 'd': |
| 277 d_log = optarg; | |
| 278 break; | |
| 279 case 'h': | |
| 280 usage(); | |
| 281 exit(0); | |
| 282 break; | |
| 283 case 'V': | |
| 284 version(); | |
| 285 exit(0); | |
| 286 break; | |
| 287 case 'k': | |
| 288 mode = MODE_KMAIL; | |
| 289 break; | |
| 290 case 'M': | |
| 77 | 291 mode = MODE_SEPARATE; |
| 43 | 292 mode_MH = 1; |
| 293 break; | |
| 294 case 'o': | |
| 295 output_dir = optarg; | |
| 296 break; | |
| 297 case 'q': | |
| 298 output_mode = OUTPUT_QUIET; | |
| 299 break; | |
| 300 case 'r': | |
| 301 mode = MODE_RECURSE; | |
| 302 break; | |
| 303 case 'S': | |
| 77 | 304 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
|
305 mode_MH = 0; |
| 43 | 306 break; |
| 307 case 'w': | |
| 308 overwrite = 1; | |
| 309 break; | |
| 310 default: | |
| 311 usage(); | |
| 312 exit(1); | |
| 313 break; | |
| 314 } | |
| 315 } | |
| 316 | |
| 317 if (argc > optind) { | |
| 318 fname = argv[optind]; | |
| 319 } else { | |
| 320 usage(); | |
| 321 exit(2); | |
| 322 } | |
| 323 | |
| 324 #ifdef DEBUG_ALL | |
| 325 // force a log file | |
| 326 if (!d_log) d_log = "readpst.log"; | |
| 327 #endif // defined DEBUG_ALL | |
| 328 DEBUG_INIT(d_log); | |
| 329 DEBUG_REGISTER_CLOSE(); | |
| 330 DEBUG_ENT("main"); | |
| 16 | 331 |
| 43 | 332 if (mode == MODE_DECSPEW) { |
|
70
b12f4e50e2e8
Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile.
Carl Byington <carl@five-ten-sg.com>
parents:
63
diff
changeset
|
333 FILE *fp; |
|
b12f4e50e2e8
Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile.
Carl Byington <carl@five-ten-sg.com>
parents:
63
diff
changeset
|
334 char buf[1024]; |
|
b12f4e50e2e8
Patch from Joachim Metz <joachim.metz@gmail.com> for 64 bit compile.
Carl Byington <carl@five-ten-sg.com>
parents:
63
diff
changeset
|
335 size_t l = 0; |
| 43 | 336 if (NULL == (fp = fopen(fname, "rb"))) { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
337 WARN(("Couldn't open file %s\n", fname)); |
| 52 | 338 DEBUG_RET(); |
| 43 | 339 return 1; |
| 340 } | |
| 39 | 341 |
|
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
|
342 while (0 != (l = fread(buf, 1, 1024, fp))) { |
|
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
77
diff
changeset
|
343 if (0 != pst_decrypt(0, buf, l, PST_COMP_ENCRYPT)) |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
344 WARN(("pst_decrypt() failed (I'll try to continue)\n")); |
| 16 | 345 |
|
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
|
346 if (l != pst_fwrite(buf, 1, l, stdout)) { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
347 WARN(("Couldn't output to stdout?\n")); |
| 52 | 348 DEBUG_RET(); |
| 43 | 349 return 1; |
| 350 } | |
| 351 } | |
| 52 | 352 DEBUG_RET(); |
| 43 | 353 return 0; |
| 354 } | |
| 16 | 355 |
| 43 | 356 if (output_mode != OUTPUT_QUIET) printf("Opening PST file and indexes...\n"); |
| 357 | |
|
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
52
diff
changeset
|
358 RET_DERROR(pst_open(&pstfile, fname), 1, ("Error opening File\n")); |
| 43 | 359 RET_DERROR(pst_load_index(&pstfile), 2, ("Index Error\n")); |
| 360 | |
| 361 pst_load_extended_attributes(&pstfile); | |
| 16 | 362 |
| 43 | 363 if (chdir(output_dir)) { |
| 364 x = errno; | |
| 365 pst_close(&pstfile); | |
| 366 DEBUG_RET(); | |
| 367 DIE(("main: Cannot change to output dir %s: %s\n", output_dir, strerror(x))); | |
| 368 } | |
| 369 | |
| 370 if (output_mode != OUTPUT_QUIET) printf("About to start processing first record...\n"); | |
| 371 | |
| 372 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
|
373 item = pst_parse_item(&pstfile, d_ptr, NULL); |
| 43 | 374 if (!item || !item->message_store) { |
| 375 DEBUG_RET(); | |
| 376 DIE(("main: Could not get root record\n")); | |
| 377 } | |
| 16 | 378 |
| 43 | 379 // 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
|
380 if (!item->file_as.str) { |
| 43 | 381 if (!(temp = strrchr(fname, '/'))) |
| 382 if (!(temp = strrchr(fname, '\\'))) | |
| 383 temp = fname; | |
| 384 else | |
| 385 temp++; // get past the "\\" | |
| 386 else | |
| 387 temp++; // get past the "/" | |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
388 item->file_as.str = (char*)xmalloc(strlen(temp)+1); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
389 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
|
390 item->file_as.is_utf8 = 1; |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
391 DEBUG_MAIN(("file_as was blank, so am using %s\n", item->file_as.str)); |
| 43 | 392 } |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
393 DEBUG_MAIN(("main: Root Folder Name: %s\n", item->file_as.str)); |
| 16 | 394 |
| 43 | 395 d_ptr = pst_getTopOfFolders(&pstfile, item); |
| 396 if (!d_ptr) { | |
| 397 DEBUG_RET(); | |
| 398 DIE(("Top of folders record not found. Cannot continue\n")); | |
| 399 } | |
| 16 | 400 |
|
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
|
401 process(item, d_ptr->child); // do the children of TOPF |
| 46 | 402 pst_freeItem(item); |
| 43 | 403 pst_close(&pstfile); |
| 404 DEBUG_RET(); | |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
405 regfree(&meta_charset_pattern); |
| 43 | 406 return 0; |
| 16 | 407 } |
| 31 | 408 |
| 409 | |
| 16 | 410 void write_email_body(FILE *f, char *body) { |
| 43 | 411 char *n = body; |
| 412 DEBUG_ENT("write_email_body"); | |
| 413 while (n) { | |
| 414 if (strncmp(body, "From ", 5) == 0) | |
| 415 fprintf(f, ">"); | |
| 416 if ((n = strchr(body, '\n'))) { | |
| 417 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
|
418 pst_fwrite(body, n-body, 1, f); //write just a line |
| 43 | 419 body = n; |
| 420 } | |
| 421 } | |
|
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
|
422 pst_fwrite(body, strlen(body), 1, f); |
| 43 | 423 DEBUG_RET(); |
| 16 | 424 } |
| 31 | 425 |
| 426 | |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
427 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
|
428 // converts \r\n to \n |
| 43 | 429 char *a, *b; |
| 430 DEBUG_ENT("removeCR"); | |
| 431 a = b = c; | |
| 432 while (*a != '\0') { | |
| 433 *b = *a; | |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
434 if (*a != '\r') b++; |
| 43 | 435 a++; |
| 436 } | |
| 437 *b = '\0'; | |
| 438 DEBUG_RET(); | |
| 16 | 439 } |
| 31 | 440 |
| 441 | |
|
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
|
442 void usage() { |
| 43 | 443 DEBUG_ENT("usage"); |
| 444 version(); | |
| 445 printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name); | |
| 446 printf("OPTIONS:\n"); | |
|
104
39ba19372732
many fixes in pst2ldif by Robert Harris
Carl Byington <carl@five-ten-sg.com>
parents:
100
diff
changeset
|
447 printf("\t-V\t- Version. Display program version\n"); |
|
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
77
diff
changeset
|
448 printf("\t-C\t- Decrypt (compressible encryption) the entire file and output on stdout (not typically useful)\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
|
449 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
|
450 printf("\t-M\t- MH. Write emails in the MH format\n"); |
| 77 | 451 printf("\t-S\t- Separate. Write emails in the separate format\n"); |
| 43 | 452 printf("\t-b\t- Don't save RTF-Body attachments\n"); |
| 453 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
|
454 printf("\t-d <filename> \t- Debug to file. This is a binary log. Use readpstlog to print it\n"); |
| 43 | 455 printf("\t-h\t- Help. This screen\n"); |
| 456 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
|
457 printf("\t-o <dirname>\t- Output directory to write files to. CWD is changed *after* opening pst file\n"); |
| 43 | 458 printf("\t-q\t- Quiet. Only print error messages\n"); |
| 459 printf("\t-r\t- Recursive. Output in a recursive format\n"); | |
| 460 printf("\t-w\t- Overwrite any output mbox files\n"); | |
| 461 DEBUG_RET(); | |
| 16 | 462 } |
| 31 | 463 |
| 464 | |
|
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
|
465 void version() { |
| 43 | 466 DEBUG_ENT("version"); |
| 50 | 467 printf("ReadPST / LibPST v%s\n", VERSION); |
| 16 | 468 #if BYTE_ORDER == BIG_ENDIAN |
| 43 | 469 printf("Big Endian implementation being used.\n"); |
| 16 | 470 #elif BYTE_ORDER == LITTLE_ENDIAN |
| 43 | 471 printf("Little Endian implementation being used.\n"); |
| 16 | 472 #else |
| 473 # error "Byte order not supported by this library" | |
| 474 #endif | |
| 475 #ifdef __GNUC__ | |
| 43 | 476 printf("GCC %d.%d : %s %s\n", __GNUC__, __GNUC_MINOR__, __DATE__, __TIME__); |
| 16 | 477 #endif |
| 43 | 478 DEBUG_RET(); |
| 16 | 479 } |
| 31 | 480 |
| 481 | |
| 16 | 482 char *mk_kmail_dir(char *fname) { |
| 43 | 483 //change to that directory |
| 484 //make a directory based on OUTPUT_KMAIL_DIR_TEMPLATE | |
| 485 //allocate space for OUTPUT_TEMPLATE and form a char* with fname | |
| 486 //return that value | |
| 487 char *dir, *out_name, *index; | |
| 488 int x; | |
| 489 DEBUG_ENT("mk_kmail_dir"); | |
| 490 if (kmail_chdir && chdir(kmail_chdir)) { | |
| 491 x = errno; | |
| 492 DIE(("mk_kmail_dir: Cannot change to directory %s: %s\n", kmail_chdir, strerror(x))); | |
| 493 } | |
| 494 dir = malloc(strlen(fname)+strlen(OUTPUT_KMAIL_DIR_TEMPLATE)+1); | |
| 495 sprintf(dir, OUTPUT_KMAIL_DIR_TEMPLATE, fname); | |
| 496 check_filename(dir); | |
| 497 if (D_MKDIR(dir)) { | |
| 498 //error occured | |
| 499 if (errno != EEXIST) { | |
| 500 x = errno; | |
| 501 DIE(("mk_kmail_dir: Cannot create directory %s: %s\n", dir, strerror(x))); | |
| 502 } | |
| 503 } | |
| 504 kmail_chdir = realloc(kmail_chdir, strlen(dir)+1); | |
| 505 strcpy(kmail_chdir, dir); | |
| 506 free (dir); | |
| 16 | 507 |
| 43 | 508 //we should remove any existing indexes created by KMail, cause they might be different now |
| 509 index = malloc(strlen(fname)+strlen(KMAIL_INDEX)+1); | |
| 510 sprintf(index, KMAIL_INDEX, fname); | |
| 511 unlink(index); | |
| 512 free(index); | |
| 16 | 513 |
| 43 | 514 out_name = malloc(strlen(fname)+strlen(OUTPUT_TEMPLATE)+1); |
| 515 sprintf(out_name, OUTPUT_TEMPLATE, fname); | |
| 516 DEBUG_RET(); | |
| 517 return out_name; | |
| 16 | 518 } |
| 31 | 519 |
| 520 | |
| 16 | 521 int close_kmail_dir() { |
| 43 | 522 // change .. |
| 523 int x; | |
| 524 DEBUG_ENT("close_kmail_dir"); | |
| 525 if (kmail_chdir) { //only free kmail_chdir if not NULL. do not change directory | |
| 526 free(kmail_chdir); | |
| 527 kmail_chdir = NULL; | |
| 528 } else { | |
| 529 if (chdir("..")) { | |
| 530 x = errno; | |
| 531 DIE(("close_kmail_dir: Cannot move up dir (..): %s\n", strerror(x))); | |
| 532 } | |
| 533 } | |
| 534 DEBUG_RET(); | |
| 535 return 0; | |
| 16 | 536 } |
| 31 | 537 |
| 538 | |
| 16 | 539 // this will create a directory by that name, then make an mbox file inside |
| 540 // that dir. any subsequent dirs will be created by name, and they will | |
| 541 // contain mbox files | |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
542 char *mk_recurse_dir(char *dir, int32_t folder_type) { |
| 43 | 543 int x; |
| 544 char *out_name; | |
| 545 DEBUG_ENT("mk_recurse_dir"); | |
| 546 check_filename(dir); | |
| 547 if (D_MKDIR (dir)) { | |
| 548 if (errno != EEXIST) { // not an error because it exists | |
| 549 x = errno; | |
| 550 DIE(("mk_recurse_dir: Cannot create directory %s: %s\n", dir, strerror(x))); | |
| 551 } | |
| 552 } | |
| 553 if (chdir (dir)) { | |
| 554 x = errno; | |
| 555 DIE(("mk_recurse_dir: Cannot change to directory %s: %s\n", dir, strerror(x))); | |
| 556 } | |
|
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
557 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
|
558 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
|
559 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
|
560 break; |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
561 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
|
562 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
|
563 break; |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
564 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
|
565 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
|
566 break; |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
567 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
|
568 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
|
569 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
|
570 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
|
571 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
|
572 default: |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
573 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
|
574 break; |
|
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
151
diff
changeset
|
575 } |
| 43 | 576 DEBUG_RET(); |
| 577 return out_name; | |
| 16 | 578 } |
| 31 | 579 |
| 580 | |
| 16 | 581 int close_recurse_dir() { |
| 43 | 582 int x; |
| 583 DEBUG_ENT("close_recurse_dir"); | |
| 584 if (chdir("..")) { | |
| 585 x = errno; | |
| 586 DIE(("close_recurse_dir: Cannot go up dir (..): %s\n", strerror(x))); | |
| 587 } | |
| 588 DEBUG_RET(); | |
| 589 return 0; | |
| 16 | 590 } |
| 31 | 591 |
| 592 | |
| 77 | 593 char *mk_separate_dir(char *dir) { |
| 43 | 594 size_t dirsize = strlen(dir) + 10; |
| 595 char dir_name[dirsize]; | |
| 596 int x = 0, y = 0; | |
| 16 | 597 |
| 77 | 598 DEBUG_ENT("mk_separate_dir"); |
| 43 | 599 do { |
| 600 if (y == 0) | |
| 601 snprintf(dir_name, dirsize, "%s", dir); | |
| 602 else | |
| 603 snprintf(dir_name, dirsize, "%s" SEP_MAIL_FILE_TEMPLATE, dir, y); // enough for 9 digits allocated above | |
| 16 | 604 |
| 43 | 605 check_filename(dir_name); |
| 606 DEBUG_MAIN(("about to try creating %s\n", dir_name)); | |
| 607 if (D_MKDIR(dir_name)) { | |
| 608 if (errno != EEXIST) { // if there is an error, and it doesn't already exist | |
| 609 x = errno; | |
| 77 | 610 DIE(("mk_separate_dir: Cannot create directory %s: %s\n", dir, strerror(x))); |
| 43 | 611 } |
| 612 } else { | |
| 613 break; | |
| 614 } | |
| 615 y++; | |
| 616 } while (overwrite == 0); | |
| 16 | 617 |
| 43 | 618 if (chdir(dir_name)) { |
| 619 x = errno; | |
| 77 | 620 DIE(("mk_separate_dir: Cannot change to directory %s: %s\n", dir, strerror(x))); |
| 43 | 621 } |
| 16 | 622 |
| 43 | 623 if (overwrite) { |
| 624 // we should probably delete all files from this directory | |
| 16 | 625 #if !defined(WIN32) && !defined(__CYGWIN__) |
| 43 | 626 DIR * sdir = NULL; |
| 627 struct dirent *dirent = NULL; | |
| 628 struct stat filestat; | |
| 629 if (!(sdir = opendir("./"))) { | |
| 77 | 630 WARN(("mk_separate_dir: Cannot open dir \"%s\" for deletion of old contents\n", "./")); |
| 43 | 631 } else { |
| 632 while ((dirent = readdir(sdir))) { | |
| 633 if (lstat(dirent->d_name, &filestat) != -1) | |
| 634 if (S_ISREG(filestat.st_mode)) { | |
| 635 if (unlink(dirent->d_name)) { | |
| 636 y = errno; | |
| 77 | 637 DIE(("mk_separate_dir: unlink returned error on file %s: %s\n", dirent->d_name, strerror(y))); |
| 43 | 638 } |
| 639 } | |
| 640 } | |
| 641 } | |
| 26 | 642 #endif |
| 43 | 643 } |
| 16 | 644 |
| 43 | 645 // we don't return a filename here cause it isn't necessary. |
| 646 DEBUG_RET(); | |
| 647 return NULL; | |
| 16 | 648 } |
| 31 | 649 |
| 650 | |
| 77 | 651 int close_separate_dir() { |
| 43 | 652 int x; |
| 77 | 653 DEBUG_ENT("close_separate_dir"); |
| 43 | 654 if (chdir("..")) { |
| 655 x = errno; | |
| 77 | 656 DIE(("close_separate_dir: Cannot go up dir (..): %s\n", strerror(x))); |
| 43 | 657 } |
| 658 DEBUG_RET(); | |
| 659 return 0; | |
| 16 | 660 } |
| 31 | 661 |
| 662 | |
| 77 | 663 int mk_separate_file(struct file_ll *f) { |
| 43 | 664 const int name_offset = 1; |
| 77 | 665 DEBUG_ENT("mk_separate_file"); |
| 43 | 666 DEBUG_MAIN(("opening next file to save email\n")); |
| 667 if (f->email_count > 999999999) { // bigger than nine 9's | |
| 77 | 668 DIE(("mk_separate_file: The number of emails in this folder has become too high to handle")); |
| 43 | 669 } |
| 670 sprintf(f->name, SEP_MAIL_FILE_TEMPLATE, f->email_count + name_offset); | |
| 671 if (f->output) fclose(f->output); | |
| 672 f->output = NULL; | |
| 673 check_filename(f->name); | |
| 674 if (!(f->output = fopen(f->name, "w"))) { | |
| 77 | 675 DIE(("mk_separate_file: Cannot open file to save email \"%s\"\n", f->name)); |
| 43 | 676 } |
| 677 DEBUG_RET(); | |
| 678 return 0; | |
| 16 | 679 } |
| 31 | 680 |
| 681 | |
| 16 | 682 char *my_stristr(char *haystack, char *needle) { |
| 43 | 683 // my_stristr varies from strstr in that its searches are case-insensitive |
| 684 char *x=haystack, *y=needle, *z = NULL; | |
| 52 | 685 if (!haystack || !needle) { |
| 43 | 686 return NULL; |
| 52 | 687 } |
| 43 | 688 while (*y != '\0' && *x != '\0') { |
| 689 if (tolower(*y) == tolower(*x)) { | |
| 690 // move y on one | |
| 691 y++; | |
| 692 if (!z) { | |
| 693 z = x; // store first position in haystack where a match is made | |
| 694 } | |
| 695 } else { | |
| 696 y = needle; // reset y to the beginning of the needle | |
| 697 z = NULL; // reset the haystack storage point | |
| 698 } | |
| 699 x++; // advance the search in the haystack | |
| 700 } | |
|
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
|
701 // 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
|
702 if (*y != '\0') return NULL; |
| 43 | 703 return z; |
| 16 | 704 } |
| 31 | 705 |
| 706 | |
|
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
39
diff
changeset
|
707 void check_filename(char *fname) { |
| 43 | 708 char *t = fname; |
| 709 DEBUG_ENT("check_filename"); | |
| 710 if (!t) { | |
| 711 DEBUG_RET(); | |
| 52 | 712 return; |
| 43 | 713 } |
| 714 while ((t = strpbrk(t, "/\\:"))) { | |
| 715 // while there are characters in the second string that we don't want | |
| 716 *t = '_'; //replace them with an underscore | |
| 717 } | |
| 718 DEBUG_RET(); | |
| 16 | 719 } |
| 31 | 720 |
| 721 | |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
722 void write_separate_attachment(char f_name[], pst_item_attach* attach, int attach_num, pst_file* pst) |
| 25 | 723 { |
| 43 | 724 FILE *fp = NULL; |
| 725 int x = 0; | |
| 726 char *temp = NULL; | |
| 31 | 727 |
| 43 | 728 // If there is a long filename (filename2) use that, otherwise |
| 729 // 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
|
730 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
|
731 : attach->filename1.str; |
| 46 | 732 DEBUG_ENT("write_separate_attachment"); |
| 25 | 733 |
| 43 | 734 check_filename(f_name); |
| 735 if (!attach_filename) { | |
| 736 // generate our own (dummy) filename for the attachement | |
| 737 temp = xmalloc(strlen(f_name)+15); | |
| 738 sprintf(temp, "%s-attach%i", f_name, attach_num); | |
| 739 } else { | |
| 740 // have an attachment name, make sure it's unique | |
| 741 temp = xmalloc(strlen(f_name)+strlen(attach_filename)+15); | |
| 742 do { | |
| 743 if (fp) fclose(fp); | |
| 744 if (x == 0) | |
| 745 sprintf(temp, "%s-%s", f_name, attach_filename); | |
| 746 else | |
| 747 sprintf(temp, "%s-%s-%i", f_name, attach_filename, x); | |
| 748 } while ((fp = fopen(temp, "r")) && ++x < 99999999); | |
| 749 if (x > 99999999) { | |
| 750 DIE(("error finding attachment name. exhausted possibilities to %s\n", temp)); | |
| 751 } | |
| 752 } | |
| 753 DEBUG_EMAIL(("Saving attachment to %s\n", temp)); | |
| 754 if (!(fp = fopen(temp, "w"))) { | |
| 755 WARN(("write_separate_attachment: Cannot open attachment save file \"%s\"\n", temp)); | |
| 756 } else { | |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
757 if (attach->data) |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
758 pst_fwrite(attach->data, 1, attach->size, fp); |
| 43 | 759 else { |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
760 (void)pst_attach_to_file(pst, attach, fp); |
| 43 | 761 } |
| 762 fclose(fp); | |
| 763 } | |
| 764 if (temp) free(temp); | |
| 765 DEBUG_RET(); | |
| 25 | 766 } |
| 767 | |
| 31 | 768 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
769 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
|
770 { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
771 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
|
772 DEBUG_ENT("write_embedded_message"); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
773 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
|
774 fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str); |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
775 ptr = pst_getID(pf, attach->id_val); |
|
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
776 |
|
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
777 pst_desc_ll 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
|
778 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
|
779 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
|
780 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
|
781 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
|
782 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
|
783 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
|
784 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
|
785 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
|
786 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
|
787 d_ptr.child_tail = NULL; |
|
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
788 |
|
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
789 pst_item *item = pst_parse_item(pf, &d_ptr, attach->id2_head); |
|
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
790 write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers); |
|
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
791 pst_freeItem(item); |
|
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
792 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
793 DEBUG_RET(); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
794 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
795 |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
796 |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
797 void write_inline_attachment(FILE* f_output, pst_item_attach* attach, char *boundary, pst_file* pst) |
| 25 | 798 { |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
799 char *attach_filename; |
| 46 | 800 char *enc = NULL; // base64 encoded attachment |
| 43 | 801 DEBUG_ENT("write_inline_attachment"); |
|
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
|
802 DEBUG_EMAIL(("Attachment Size is %i, pointer %p, id %d\n", attach->size, attach->data, attach->id_val)); |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
803 if (attach->data) { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
804 enc = base64_encode (attach->data, attach->size); |
| 43 | 805 if (!enc) { |
| 806 DEBUG_EMAIL(("ERROR base64_encode returned NULL. Must have failed\n")); | |
| 52 | 807 DEBUG_RET(); |
| 43 | 808 return; |
| 809 } | |
| 810 } | |
|
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
|
811 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
|
812 // make sure we can fetch data from the id |
|
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
|
813 pst_index_ll *ptr = pst_getID(pst, attach->id_val); |
|
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
|
814 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
|
815 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
|
816 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
|
817 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
|
818 } |
|
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
|
819 } |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
820 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
821 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
|
822 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
|
823 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
|
824 } else { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
825 fprintf(f_output, "Content-Type: %s\n", attach->mimetype.str); |
| 43 | 826 } |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
827 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
|
828 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
829 // 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
|
830 // 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
|
831 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
|
832 if (!attach_filename) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
833 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
|
834 } else { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
835 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
|
836 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
837 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
838 if (attach->data) { |
|
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
|
839 pst_fwrite(enc, 1, strlen(enc), f_output); |
| 43 | 840 DEBUG_EMAIL(("Attachment Size after encoding is %i\n", strlen(enc))); |
| 841 free(enc); // caught by valgrind | |
| 842 } else { | |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
843 (void)pst_attach_to_file_base64(pst, attach, f_output); |
| 43 | 844 } |
| 845 fprintf(f_output, "\n\n"); | |
| 846 DEBUG_RET(); | |
| 25 | 847 } |
| 848 | |
| 31 | 849 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
850 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
|
851 { |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
852 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
|
853 if (my_stristr(header, field) || (strncasecmp(header, field+1, strlen(field)-1) == 0)) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
854 DEBUG_EMAIL(("header block has %s header\n", field+1)); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
855 *flag = 1; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
856 } |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
857 DEBUG_RET(); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
858 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
859 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
860 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
861 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
|
862 { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
863 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
|
864 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
|
865 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
|
866 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
|
867 field++; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
868 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
|
869 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
|
870 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
|
871 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
|
872 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
|
873 if (*s == '"') { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
874 s++; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
875 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
|
876 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
877 else { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
878 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
|
879 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
|
880 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
|
881 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
882 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
|
883 save = *e; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
884 *e = '\0'; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
885 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
|
886 *e = save; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
887 DEBUG_EMAIL(("body %s %s from headers\n", subfield, body_subfield)); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
888 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
889 DEBUG_RET(); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
890 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
891 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
892 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
|
893 { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
894 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
|
895 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
|
896 return t; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
897 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
898 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
899 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
900 // 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
|
901 // 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
|
902 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
|
903 { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
904 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
|
905 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
|
906 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
|
907 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
908 return e; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
909 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
910 |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
911 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
912 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
|
913 { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
914 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
|
915 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
|
916 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
|
917 if (e) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
918 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
|
919 while (*e != '\0') { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
920 *t = *e; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
921 t++; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
922 e++; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
923 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
924 *t = '\0'; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
925 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
926 else { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
927 // 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
|
928 *t = '\0'; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
929 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
930 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
931 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
932 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
933 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
934 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
|
935 { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
936 int b64 = 0; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
937 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
|
938 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
|
939 while (*b != 0) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
940 if ((*b < 32) && (*b != 9) && (*b != 10)) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
941 DEBUG_EMAIL(("found base64 byte %d\n", (int)*b)); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
942 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
|
943 b64 = 1; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
944 break; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
945 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
946 b++; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
947 } |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
948 DEBUG_RET(); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
949 return b64; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
950 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
951 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
952 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
953 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
|
954 { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
955 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
|
956 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
|
957 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
|
958 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
|
959 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
|
960 if (rc == 0) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
961 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
|
962 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
|
963 if (s != -1) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
964 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
|
965 html[e] = '\0'; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
966 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
|
967 html[e] = save; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
968 DEBUG_EMAIL(("charset %s from html text\n", charset)); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
969 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
970 else { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
971 DEBUG_EMAIL(("matching %d %d %d %d", match[0].rm_so, match[0].rm_eo, match[1].rm_so, match[1].rm_eo)); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
972 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
|
973 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
974 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
975 else { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
976 DEBUG_EMAIL(("regexec returns %d\n", rc)); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
977 } |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
978 DEBUG_RET(); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
979 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
980 |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
981 |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
982 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
|
983 { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
984 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
|
985 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
|
986 if (headers) { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
987 char *temp, *t; |
|
146
0695de3b5a98
fix for 64bit on Fedora 11
Carl Byington <carl@five-ten-sg.com>
parents:
143
diff
changeset
|
988 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
|
989 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
|
990 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
|
991 if (t) { |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
992 t++; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
993 DEBUG_EMAIL(("found content type header\n")); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
994 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
|
995 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
|
996 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
|
997 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
|
998 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
|
999 s += 2; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1000 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
|
1001 headers = temp+2; // found rfc822 header |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1002 DEBUG_EMAIL(("found 822 headers\n%s\n", headers)); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1003 break; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1004 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1005 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1006 } |
|
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
|
1007 //DEBUG_EMAIL(("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
|
1008 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
|
1009 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1010 *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
|
1011 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1012 DEBUG_RET(); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1013 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1014 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1015 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1016 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
|
1017 { |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1018 DEBUG_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
|
1019 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
|
1020 // 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
|
1021 // 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
|
1022 // 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
|
1023 size_t rc; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1024 DEBUG_EMAIL(("Convert %s utf-8 to %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
|
1025 vbuf *newer = vballoc(2); |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1026 rc = vb_utf8to8bit(newer, body->str, strlen(body->str) + 1, charset); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1027 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
|
1028 // 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
|
1029 free(newer->b); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1030 DEBUG_EMAIL(("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
|
1031 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
|
1032 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1033 else { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1034 free(body->str); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1035 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
|
1036 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1037 free(newer); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1038 } |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1039 removeCR(body->str); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1040 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
|
1041 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
|
1042 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
|
1043 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
|
1044 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
|
1045 if (base64) { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1046 char *enc = 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
|
1047 if (enc) { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1048 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
|
1049 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
|
1050 free(enc); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1051 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1052 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1053 else { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1054 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
|
1055 } |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1056 DEBUG_RET(); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1057 } |
|
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 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1060 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 | 1061 { |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1062 char boundary[60]; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1063 char body_charset[60]; |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1064 char body_report[60]; |
|
129
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1065 char sender[60]; |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1066 int sender_known = 0; |
| 43 | 1067 char *temp = NULL; |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1068 int attach_num; |
| 43 | 1069 time_t em_time; |
| 1070 char *c_time; | |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1071 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
|
1072 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
|
1073 has_from = has_subject = has_to = has_cc = has_date = has_msgid = 0; |
| 46 | 1074 DEBUG_ENT("write_normal_email"); |
| 25 | 1075 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1076 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
|
1077 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
|
1078 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1079 // setup default body character set and report type |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1080 strncpy(body_charset, pst_default_charset(item), sizeof(body_charset)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1081 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
|
1082 body_report[0] = '\0'; |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1083 |
|
129
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1084 // setup default sender |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1085 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
|
1086 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
|
1087 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
|
1088 sender_known = 1; |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1089 } |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1090 else { |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1091 temp = "MAILER-DAEMON"; |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1092 } |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1093 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
|
1094 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
|
1095 |
| 43 | 1096 // convert the sent date if it exists, or set it to a fixed date |
| 1097 if (item->email->sent_date) { | |
| 1098 em_time = fileTimeToUnixTime(item->email->sent_date, 0); | |
| 1099 c_time = ctime(&em_time); | |
| 1100 if (c_time) | |
| 1101 c_time[strlen(c_time)-1] = '\0'; //remove end \n | |
| 1102 else | |
| 1103 c_time = "Fri Dec 28 12:06:21 2001"; | |
| 1104 } else | |
| 1105 c_time= "Fri Dec 28 12:06:21 2001"; | |
| 25 | 1106 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1107 // create our MIME boundary here. |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1108 snprintf(boundary, sizeof(boundary), "--boundary-LibPST-iamunique-%i_-_-", rand()); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1109 |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1110 // 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
|
1111 if (headers ) { |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1112 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
|
1113 removeCR(headers); |
| 25 | 1114 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1115 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
|
1116 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
|
1117 // 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
|
1118 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
|
1119 // 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
|
1120 // 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
|
1121 *extra_mime_headers = temp+2; |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1122 DEBUG_EMAIL(("Found extra mime headers\n%s\n", temp+2)); |
| 43 | 1123 } |
| 25 | 1124 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1125 // 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
|
1126 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
|
1127 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
|
1128 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
|
1129 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
|
1130 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
|
1131 header_has_field(headers, "\nMessage-Id: ", &has_msgid); |
| 31 | 1132 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1133 // 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
|
1134 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
|
1135 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
|
1136 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
|
1137 |
|
129
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1138 // 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
|
1139 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
|
1140 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
|
1141 if (t) { |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1142 // 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
|
1143 t++; |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1144 char *n = strchr(t, '\n'); |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1145 char *s = strchr(t, '<'); |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1146 char *e = strchr(t, '>'); |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1147 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
|
1148 char save = *e; |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1149 *e = '\0'; |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1150 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
|
1151 *e = save; |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1152 } |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1153 } |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1154 } |
|
fc11b1d1ad34
fix initial from header in mbox format.
Carl Byington <carl@five-ten-sg.com>
parents:
125
diff
changeset
|
1155 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1156 // 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
|
1157 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
|
1158 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
|
1159 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
|
1160 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
|
1161 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
|
1162 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
|
1163 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
|
1164 header_strip_field(headers, "\nX-From_: "); |
| 43 | 1165 } |
| 25 | 1166 |
| 43 | 1167 DEBUG_EMAIL(("About to print Header\n")); |
| 31 | 1168 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1169 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
|
1170 pst_convert_utf8(item, &item->subject); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1171 DEBUG_EMAIL(("item->subject = %s\n", item->subject.str)); |
| 43 | 1172 } |
| 31 | 1173 |
|
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
|
1174 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
|
1175 // 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
|
1176 // 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
|
1177 // 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
|
1178 // 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
|
1179 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
|
1180 } |
|
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
|
1181 |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1182 // 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
|
1183 if (headers) { |
| 43 | 1184 int len; |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1185 fprintf(f_output, "%s", headers); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1186 // make sure the headers end with a \n |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1187 len = strlen(headers); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1188 if (!len || (headers[len-1] != '\n')) fprintf(f_output, "\n"); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1189 } |
| 31 | 1190 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1191 // 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
|
1192 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1193 if (!has_from) { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1194 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
|
1195 } |
| 31 | 1196 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1197 if (!has_subject) { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1198 if (item->subject.str) { |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1199 fprintf(f_output, "Subject: %s\n", item->subject.str); |
| 43 | 1200 } else { |
| 1201 fprintf(f_output, "Subject: \n"); | |
| 1202 } | |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1203 } |
| 31 | 1204 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1205 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
|
1206 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
|
1207 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
|
1208 } |
|
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
|
1209 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1210 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
|
1211 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
|
1212 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
|
1213 } |
| 31 | 1214 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1215 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
|
1216 char c_time[C_TIME_SIZE]; |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1217 strftime(c_time, C_TIME_SIZE, "%a, %d %b %Y %H:%M:%S %z", gmtime(&em_time)); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1218 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
|
1219 } |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1220 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1221 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
|
1222 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
|
1223 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
|
1224 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1225 |
|
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
|
1226 // 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
|
1227 // 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
|
1228 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
|
1229 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
|
1230 && strcmp(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
|
1231 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
|
1232 } |
|
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
|
1233 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1234 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
|
1235 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
|
1236 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
|
1237 } |
|
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
|
1238 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1239 // add our own mime headers |
| 43 | 1240 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
|
1241 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
|
1242 // 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
|
1243 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
|
1244 } |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1245 else if (item->attach || (item->email->rtf_compressed && save_rtf) |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1246 || item->email->encrypted_body |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1247 || item->email->encrypted_htmlbody) { |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1248 // use multipart/mixed if we have attachments |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1249 fprintf(f_output, "Content-Type: multipart/mixed;\n\tboundary=\"%s\"\n", boundary); |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1250 } else { |
|
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1251 // else use multipart/alternative |
|
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, "Content-Type: multipart/alternative;\n\tboundary=\"%s\"\n", boundary); |
| 43 | 1253 } |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1254 fprintf(f_output, "\n"); // end of headers, start of body |
| 25 | 1255 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1256 // 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
|
1257 if (item->body.str) { |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1258 write_body_part(f_output, &item->body, "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
|
1259 } |
|
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
|
1260 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1261 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
|
1262 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
|
1263 fprintf(f_output, "\n"); |
| 43 | 1264 } |
| 31 | 1265 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1266 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
|
1267 find_html_charset(item->email->htmlbody.str, body_charset, sizeof(body_charset)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1268 write_body_part(f_output, &item->email->htmlbody, "text/html", body_charset, boundary, pst); |
| 43 | 1269 } |
| 25 | 1270 |
| 43 | 1271 if (item->email->rtf_compressed && save_rtf) { |
|
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
|
1272 pst_item_attach* attach = (pst_item_attach*)xmalloc(sizeof(pst_item_attach)); |
| 43 | 1273 DEBUG_EMAIL(("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
|
1274 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
|
1275 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
|
1276 item->attach = 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
|
1277 attach->data = lzfu_decompress(item->email->rtf_compressed, item->email->rtf_compressed_size, &attach->size); |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1278 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
|
1279 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
|
1280 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
|
1281 attach->mimetype.is_utf8 = 1; |
| 43 | 1282 } |
| 31 | 1283 |
| 43 | 1284 if (item->email->encrypted_body || item->email->encrypted_htmlbody) { |
| 1285 // if either the body or htmlbody is encrypted, add them as attachments | |
| 1286 if (item->email->encrypted_body) { | |
|
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
|
1287 pst_item_attach* attach = (pst_item_attach*)xmalloc(sizeof(pst_item_attach)); |
| 43 | 1288 DEBUG_EMAIL(("Adding Encrypted 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
|
1289 attach = (pst_item_attach*) xmalloc(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
|
1290 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
|
1291 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
|
1292 item->attach = 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
|
1293 attach->data = item->email->encrypted_body; |
|
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
|
1294 attach->size = item->email->encrypted_body_size; |
| 43 | 1295 item->email->encrypted_body = NULL; |
| 1296 } | |
| 31 | 1297 |
| 43 | 1298 if (item->email->encrypted_htmlbody) { |
|
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
|
1299 pst_item_attach* attach = (pst_item_attach*)xmalloc(sizeof(pst_item_attach)); |
| 43 | 1300 DEBUG_EMAIL(("Adding encrypted HTML 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
|
1301 attach = (pst_item_attach*) xmalloc(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
|
1302 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
|
1303 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
|
1304 item->attach = 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
|
1305 attach->data = item->email->encrypted_htmlbody; |
|
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
|
1306 attach->size = item->email->encrypted_htmlbody_size; |
| 43 | 1307 item->email->encrypted_htmlbody = NULL; |
| 1308 } | |
| 1309 write_email_body(f_output, "The body of this email is encrypted. This isn't supported yet, but the body is now an attachment\n"); | |
| 1310 } | |
| 31 | 1311 |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1312 // 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
|
1313 { |
|
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
|
1314 pst_item_attach* 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
|
1315 attach_num = 0; |
|
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
|
1316 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
|
1317 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
|
1318 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
|
1319 pst_convert_utf8_null(item, &attach->mimetype); |
|
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
|
1320 DEBUG_EMAIL(("Attempting Attachment encoding\n")); |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1321 if (!attach->data && attach->mimetype.str && !strcmp(attach->mimetype.str, RFC822)) { |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1322 DEBUG_EMAIL(("seem to have special embedded message attachment\n")); |
|
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1323 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
|
1324 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
|
1325 } |
|
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
139
diff
changeset
|
1326 else if (mode == MODE_SEPARATE && !mode_MH) |
|
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
|
1327 write_separate_attachment(f_name, attach, ++attach_num, pst); |
|
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
|
1328 else |
|
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
|
1329 write_inline_attachment(f_output, attach, boundary, pst); |
| 43 | 1330 } |
| 1331 } | |
|
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
|
1332 |
|
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
|
1333 // end of this mail message |
| 77 | 1334 if (mode != MODE_SEPARATE) { /* do not add a boundary after the last attachment for mode_MH */ |
| 43 | 1335 DEBUG_EMAIL(("Writing buffer between emails\n")); |
|
121
8399ef94c11b
strip and regenerate all MIME headers to avoid duplicates.
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
1336 fprintf(f_output, "\n--%s--\n", boundary); |
| 43 | 1337 fprintf(f_output, "\n\n"); |
| 1338 } | |
| 1339 DEBUG_RET(); | |
| 25 | 1340 } |
| 1341 | |
| 31 | 1342 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1343 void write_vcard(FILE* f_output, pst_item *item, pst_item_contact* contact, char comment[]) |
| 25 | 1344 { |
| 43 | 1345 // We can only call rfc escape once per printf, since the second call |
| 1346 // may free the buffer returned by the first call. | |
| 1347 // I had tried to place those into a single printf - Carl. | |
| 39 | 1348 |
| 43 | 1349 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
|
1350 |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1351 // make everything utf8 |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1352 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
|
1353 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
|
1354 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
|
1355 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
|
1356 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
|
1357 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
|
1358 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
|
1359 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
|
1360 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
|
1361 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
|
1362 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
|
1363 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
|
1364 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
|
1365 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
|
1366 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
|
1367 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
|
1368 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
|
1369 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
|
1370 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
|
1371 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
|
1372 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
|
1373 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
|
1374 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
|
1375 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
|
1376 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
|
1377 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
|
1378 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
|
1379 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
|
1380 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
|
1381 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
|
1382 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
|
1383 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
|
1384 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
|
1385 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
|
1386 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
|
1387 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
|
1388 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
|
1389 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
|
1390 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
|
1391 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
|
1392 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
|
1393 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
|
1394 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
|
1395 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
|
1396 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
|
1397 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
|
1398 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
|
1399 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
|
1400 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
|
1401 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
|
1402 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
|
1403 |
| 50 | 1404 // the specification I am following is (hopefully) RFC2426 vCard Mime Directory Profile |
| 43 | 1405 fprintf(f_output, "BEGIN:VCARD\n"); |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1406 fprintf(f_output, "FN:%s\n", pst_rfc2426_escape(contact->fullname.str)); |
| 39 | 1407 |
| 43 | 1408 //fprintf(f_output, "N:%s;%s;%s;%s;%s\n", |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1409 fprintf(f_output, "N:%s;", (!contact->surname.str) ? "" : pst_rfc2426_escape(contact->surname.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1410 fprintf(f_output, "%s;", (!contact->first_name.str) ? "" : pst_rfc2426_escape(contact->first_name.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1411 fprintf(f_output, "%s;", (!contact->middle_name.str) ? "" : pst_rfc2426_escape(contact->middle_name.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1412 fprintf(f_output, "%s;", (!contact->display_name_prefix.str) ? "" : pst_rfc2426_escape(contact->display_name_prefix.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1413 fprintf(f_output, "%s\n", (!contact->suffix.str) ? "" : pst_rfc2426_escape(contact->suffix.str)); |
| 39 | 1414 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1415 if (contact->nickname.str) |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1416 fprintf(f_output, "NICKNAME:%s\n", pst_rfc2426_escape(contact->nickname.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1417 if (contact->address1.str) |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1418 fprintf(f_output, "EMAIL:%s\n", pst_rfc2426_escape(contact->address1.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1419 if (contact->address2.str) |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1420 fprintf(f_output, "EMAIL:%s\n", pst_rfc2426_escape(contact->address2.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1421 if (contact->address3.str) |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1422 fprintf(f_output, "EMAIL:%s\n", pst_rfc2426_escape(contact->address3.str)); |
| 43 | 1423 if (contact->birthday) |
| 1424 fprintf(f_output, "BDAY:%s\n", pst_rfc2425_datetime_format(contact->birthday)); | |
| 39 | 1425 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1426 if (contact->home_address.str) { |
| 43 | 1427 //fprintf(f_output, "ADR;TYPE=home:%s;%s;%s;%s;%s;%s;%s\n", |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1428 fprintf(f_output, "ADR;TYPE=home:%s;", (!contact->home_po_box.str) ? "" : pst_rfc2426_escape(contact->home_po_box.str)); |
| 43 | 1429 fprintf(f_output, "%s;", ""); // extended Address |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1430 fprintf(f_output, "%s;", (!contact->home_street.str) ? "" : pst_rfc2426_escape(contact->home_street.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1431 fprintf(f_output, "%s;", (!contact->home_city.str) ? "" : pst_rfc2426_escape(contact->home_city.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1432 fprintf(f_output, "%s;", (!contact->home_state.str) ? "" : pst_rfc2426_escape(contact->home_state.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1433 fprintf(f_output, "%s;", (!contact->home_postal_code.str) ? "" : pst_rfc2426_escape(contact->home_postal_code.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1434 fprintf(f_output, "%s\n", (!contact->home_country.str) ? "" : pst_rfc2426_escape(contact->home_country.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1435 fprintf(f_output, "LABEL;TYPE=home:%s\n", pst_rfc2426_escape(contact->home_address.str)); |
| 43 | 1436 } |
| 39 | 1437 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1438 if (contact->business_address.str) { |
| 43 | 1439 //fprintf(f_output, "ADR;TYPE=work:%s;%s;%s;%s;%s;%s;%s\n", |
|
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, "ADR;TYPE=work:%s;", (!contact->business_po_box.str) ? "" : pst_rfc2426_escape(contact->business_po_box.str)); |
| 43 | 1441 fprintf(f_output, "%s;", ""); // extended Address |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1442 fprintf(f_output, "%s;", (!contact->business_street.str) ? "" : pst_rfc2426_escape(contact->business_street.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1443 fprintf(f_output, "%s;", (!contact->business_city.str) ? "" : pst_rfc2426_escape(contact->business_city.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1444 fprintf(f_output, "%s;", (!contact->business_state.str) ? "" : pst_rfc2426_escape(contact->business_state.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, "%s;", (!contact->business_postal_code.str) ? "" : pst_rfc2426_escape(contact->business_postal_code.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1446 fprintf(f_output, "%s\n", (!contact->business_country.str) ? "" : pst_rfc2426_escape(contact->business_country.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1447 fprintf(f_output, "LABEL;TYPE=work:%s\n", pst_rfc2426_escape(contact->business_address.str)); |
| 43 | 1448 } |
| 39 | 1449 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1450 if (contact->other_address.str) { |
| 43 | 1451 //fprintf(f_output, "ADR;TYPE=postal:%s;%s;%s;%s;%s;%s;%s\n", |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1452 fprintf(f_output, "ADR;TYPE=postal:%s;",(!contact->other_po_box.str) ? "" : pst_rfc2426_escape(contact->other_po_box.str)); |
| 43 | 1453 fprintf(f_output, "%s;", ""); // extended Address |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1454 fprintf(f_output, "%s;", (!contact->other_street.str) ? "" : pst_rfc2426_escape(contact->other_street.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1455 fprintf(f_output, "%s;", (!contact->other_city.str) ? "" : pst_rfc2426_escape(contact->other_city.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1456 fprintf(f_output, "%s;", (!contact->other_state.str) ? "" : pst_rfc2426_escape(contact->other_state.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1457 fprintf(f_output, "%s;", (!contact->other_postal_code.str) ? "" : pst_rfc2426_escape(contact->other_postal_code.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1458 fprintf(f_output, "%s\n", (!contact->other_country.str) ? "" : pst_rfc2426_escape(contact->other_country.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1459 fprintf(f_output, "LABEL;TYPE=postal:%s\n", pst_rfc2426_escape(contact->other_address.str)); |
| 43 | 1460 } |
| 39 | 1461 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1462 if (contact->business_fax.str) fprintf(f_output, "TEL;TYPE=work,fax:%s\n", pst_rfc2426_escape(contact->business_fax.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1463 if (contact->business_phone.str) fprintf(f_output, "TEL;TYPE=work,voice:%s\n", pst_rfc2426_escape(contact->business_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1464 if (contact->business_phone2.str) fprintf(f_output, "TEL;TYPE=work,voice:%s\n", pst_rfc2426_escape(contact->business_phone2.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1465 if (contact->car_phone.str) fprintf(f_output, "TEL;TYPE=car,voice:%s\n", pst_rfc2426_escape(contact->car_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1466 if (contact->home_fax.str) fprintf(f_output, "TEL;TYPE=home,fax:%s\n", pst_rfc2426_escape(contact->home_fax.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1467 if (contact->home_phone.str) fprintf(f_output, "TEL;TYPE=home,voice:%s\n", pst_rfc2426_escape(contact->home_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1468 if (contact->home_phone2.str) fprintf(f_output, "TEL;TYPE=home,voice:%s\n", pst_rfc2426_escape(contact->home_phone2.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1469 if (contact->isdn_phone.str) fprintf(f_output, "TEL;TYPE=isdn:%s\n", pst_rfc2426_escape(contact->isdn_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1470 if (contact->mobile_phone.str) fprintf(f_output, "TEL;TYPE=cell,voice:%s\n", pst_rfc2426_escape(contact->mobile_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1471 if (contact->other_phone.str) fprintf(f_output, "TEL;TYPE=msg:%s\n", pst_rfc2426_escape(contact->other_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1472 if (contact->pager_phone.str) fprintf(f_output, "TEL;TYPE=pager:%s\n", pst_rfc2426_escape(contact->pager_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1473 if (contact->primary_fax.str) fprintf(f_output, "TEL;TYPE=fax,pref:%s\n", pst_rfc2426_escape(contact->primary_fax.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1474 if (contact->primary_phone.str) fprintf(f_output, "TEL;TYPE=phone,pref:%s\n", pst_rfc2426_escape(contact->primary_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1475 if (contact->radio_phone.str) fprintf(f_output, "TEL;TYPE=pcs:%s\n", pst_rfc2426_escape(contact->radio_phone.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1476 if (contact->telex.str) fprintf(f_output, "TEL;TYPE=bbs:%s\n", pst_rfc2426_escape(contact->telex.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1477 if (contact->job_title.str) fprintf(f_output, "TITLE:%s\n", pst_rfc2426_escape(contact->job_title.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1478 if (contact->profession.str) fprintf(f_output, "ROLE:%s\n", pst_rfc2426_escape(contact->profession.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1479 if (contact->assistant_name.str || contact->assistant_phone.str) { |
| 43 | 1480 fprintf(f_output, "AGENT:BEGIN:VCARD\n"); |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1481 if (contact->assistant_name.str) fprintf(f_output, "FN:%s\n", pst_rfc2426_escape(contact->assistant_name.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1482 if (contact->assistant_phone.str) fprintf(f_output, "TEL:%s\n", pst_rfc2426_escape(contact->assistant_phone.str)); |
| 43 | 1483 } |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1484 if (contact->company_name.str) fprintf(f_output, "ORG:%s\n", pst_rfc2426_escape(contact->company_name.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1485 if (comment) fprintf(f_output, "NOTE:%s\n", pst_rfc2426_escape(comment)); |
| 25 | 1486 |
| 43 | 1487 fprintf(f_output, "VERSION: 3.0\n"); |
| 1488 fprintf(f_output, "END:VCARD\n\n"); | |
| 1489 DEBUG_RET(); | |
| 25 | 1490 } |
| 1491 | |
| 31 | 1492 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1493 void write_appointment(FILE* f_output, pst_item *item, pst_item_appointment* appointment, |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1494 FILETIME* create_date, FILETIME* modify_date) |
| 25 | 1495 { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1496 // make everything utf8 |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1497 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
|
1498 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
|
1499 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
|
1500 |
| 43 | 1501 fprintf(f_output, "BEGIN:VEVENT\n"); |
| 1502 if (create_date) | |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1503 fprintf(f_output, "CREATED:%s\n", pst_rfc2445_datetime_format(create_date)); |
| 43 | 1504 if (modify_date) |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1505 fprintf(f_output, "LAST-MOD:%s\n", pst_rfc2445_datetime_format(modify_date)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1506 if (item->subject.str) |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1507 fprintf(f_output, "SUMMARY:%s\n", pst_rfc2426_escape(item->subject.str)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1508 if (item->body.str) |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1509 fprintf(f_output, "DESCRIPTION:%s\n", pst_rfc2426_escape(item->body.str)); |
| 43 | 1510 if (appointment && appointment->start) |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1511 fprintf(f_output, "DTSTART;VALUE=DATE-TIME:%s\n", pst_rfc2445_datetime_format(appointment->start)); |
| 43 | 1512 if (appointment && appointment->end) |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1513 fprintf(f_output, "DTEND;VALUE=DATE-TIME:%s\n", pst_rfc2445_datetime_format(appointment->end)); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1514 if (appointment && appointment->location.str) |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1515 fprintf(f_output, "LOCATION:%s\n", pst_rfc2426_escape(appointment->location.str)); |
| 43 | 1516 if (appointment) { |
| 1517 switch (appointment->showas) { | |
| 50 | 1518 case PST_FREEBUSY_TENTATIVE: |
| 1519 fprintf(f_output, "STATUS:TENTATIVE\n"); | |
| 1520 break; | |
| 1521 case PST_FREEBUSY_FREE: | |
| 1522 // mark as transparent and as confirmed | |
| 1523 fprintf(f_output, "TRANSP:TRANSPARENT\n"); | |
| 1524 case PST_FREEBUSY_BUSY: | |
| 1525 case PST_FREEBUSY_OUT_OF_OFFICE: | |
| 1526 fprintf(f_output, "STATUS:CONFIRMED\n"); | |
| 1527 break; | |
| 43 | 1528 } |
| 1529 switch (appointment->label) { | |
| 50 | 1530 case PST_APP_LABEL_NONE: |
| 1531 fprintf(f_output, "CATEGORIES:NONE\n"); | |
| 1532 break; | |
| 1533 case PST_APP_LABEL_IMPORTANT: | |
| 1534 fprintf(f_output, "CATEGORIES:IMPORTANT\n"); | |
| 1535 break; | |
| 1536 case PST_APP_LABEL_BUSINESS: | |
| 1537 fprintf(f_output, "CATEGORIES:BUSINESS\n"); | |
| 1538 break; | |
| 1539 case PST_APP_LABEL_PERSONAL: | |
| 1540 fprintf(f_output, "CATEGORIES:PERSONAL\n"); | |
| 1541 break; | |
| 1542 case PST_APP_LABEL_VACATION: | |
| 1543 fprintf(f_output, "CATEGORIES:VACATION\n"); | |
| 1544 break; | |
| 1545 case PST_APP_LABEL_MUST_ATTEND: | |
| 1546 fprintf(f_output, "CATEGORIES:MUST-ATTEND\n"); | |
| 1547 break; | |
| 1548 case PST_APP_LABEL_TRAVEL_REQ: | |
| 1549 fprintf(f_output, "CATEGORIES:TRAVEL-REQUIRED\n"); | |
| 1550 break; | |
| 1551 case PST_APP_LABEL_NEEDS_PREP: | |
| 1552 fprintf(f_output, "CATEGORIES:NEEDS-PREPARATION\n"); | |
| 1553 break; | |
| 1554 case PST_APP_LABEL_BIRTHDAY: | |
| 1555 fprintf(f_output, "CATEGORIES:BIRTHDAY\n"); | |
| 1556 break; | |
| 1557 case PST_APP_LABEL_ANNIVERSARY: | |
| 1558 fprintf(f_output, "CATEGORIES:ANNIVERSARY\n"); | |
| 1559 break; | |
| 1560 case PST_APP_LABEL_PHONE_CALL: | |
| 1561 fprintf(f_output, "CATEGORIES:PHONE-CALL\n"); | |
| 1562 break; | |
| 43 | 1563 } |
| 1564 } | |
| 1565 fprintf(f_output, "END:VEVENT\n\n"); | |
| 25 | 1566 } |
| 1567 | |
| 31 | 1568 |
| 39 | 1569 void create_enter_dir(struct file_ll* f, pst_item *item) |
| 25 | 1570 { |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1571 pst_convert_utf8(item, &item->file_as); |
| 43 | 1572 f->email_count = 0; |
| 1573 f->skip_count = 0; | |
| 1574 f->type = item->type; | |
| 1575 f->stored_count = (item->folder) ? item->folder->email_count : 0; | |
| 39 | 1576 |
| 43 | 1577 DEBUG_ENT("create_enter_dir"); |
| 1578 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
|
1579 f->name = mk_kmail_dir(item->file_as.str); |
| 43 | 1580 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
|
1581 f->name = mk_recurse_dir(item->file_as.str, f->type); |
| 77 | 1582 else if (mode == MODE_SEPARATE) { |
| 43 | 1583 // 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
|
1584 mk_separate_dir(item->file_as.str); |
| 43 | 1585 f->name = (char*) xmalloc(10); |
| 1586 memset(f->name, 0, 10); | |
| 1587 // sprintf(f->name, SEP_MAIL_FILE_TEMPLATE, f->email_count); | |
| 1588 } else { | |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1589 f->name = (char*) xmalloc(strlen(item->file_as.str)+strlen(OUTPUT_TEMPLATE)+1); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1590 sprintf(f->name, OUTPUT_TEMPLATE, item->file_as.str); |
| 43 | 1591 } |
| 25 | 1592 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1593 f->dname = (char*) xmalloc(strlen(item->file_as.str)+1); |
|
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1594 strcpy(f->dname, item->file_as.str); |
| 25 | 1595 |
| 43 | 1596 if (overwrite != 1) { |
| 1597 int x = 0; | |
| 1598 char *temp = (char*) xmalloc (strlen(f->name)+10); //enough room for 10 digits | |
| 25 | 1599 |
| 43 | 1600 sprintf(temp, "%s", f->name); |
| 1601 check_filename(temp); | |
| 1602 while ((f->output = fopen(temp, "r"))) { | |
| 1603 DEBUG_MAIN(("need to increase filename because one already exists with that name\n")); | |
| 1604 DEBUG_MAIN(("- increasing it to %s%d\n", f->name, x)); | |
| 1605 x++; | |
| 1606 sprintf(temp, "%s%08d", f->name, x); | |
| 1607 DEBUG_MAIN(("- trying \"%s\"\n", f->name)); | |
| 1608 if (x == 99999999) { | |
| 1609 DIE(("create_enter_dir: Why can I not create a folder %s? I have tried %i extensions...\n", f->name, x)); | |
| 1610 } | |
| 1611 fclose(f->output); | |
| 1612 } | |
| 1613 if (x > 0) { //then the f->name should change | |
| 1614 free (f->name); | |
| 1615 f->name = temp; | |
| 1616 } else { | |
| 1617 free(temp); | |
| 1618 } | |
| 1619 } | |
| 25 | 1620 |
|
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1621 DEBUG_MAIN(("f->name = %s\nitem->folder_name = %s\n", f->name, item->file_as.str)); |
| 77 | 1622 if (mode != MODE_SEPARATE) { |
| 43 | 1623 check_filename(f->name); |
| 1624 if (!(f->output = fopen(f->name, "w"))) { | |
| 1625 DIE(("create_enter_dir: Could not open file \"%s\" for write\n", f->name)); | |
| 1626 } | |
| 1627 } | |
| 1628 DEBUG_RET(); | |
| 25 | 1629 } |
| 1630 | |
| 39 | 1631 |
| 1632 void close_enter_dir(struct file_ll *f) | |
| 1633 { | |
| 43 | 1634 DEBUG_MAIN(("main: Email Count for folder %s is %i\n", f->dname, f->email_count)); |
| 1635 if (output_mode != OUTPUT_QUIET) | |
| 1636 printf("\t\"%s\" - %i items done, skipped %i, should have been %i\n", | |
| 1637 f->dname, f->email_count, f->skip_count, f->stored_count); | |
| 1638 if (f->output) fclose(f->output); | |
| 1639 free(f->name); | |
| 1640 free(f->dname); | |
| 39 | 1641 |
| 43 | 1642 if (mode == MODE_KMAIL) |
| 1643 close_kmail_dir(); | |
| 1644 else if (mode == MODE_RECURSE) | |
| 1645 close_recurse_dir(); | |
| 77 | 1646 else if (mode == MODE_SEPARATE) |
| 1647 close_separate_dir(); | |
| 39 | 1648 } |
| 1649 |