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