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