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