Mercurial > libpst
annotate src/libpst.c @ 359:a3e674fade6c
From Jeffrey Morlan:
pst_parse_block misreads Table Contexts (aka "type 2") with a
multi-block Row Matrix ("ind2"). Rows are never split between blocks -
every block except the last has padding at the end which should be
ignored. I've only seen this affect the recipients table, but
presumably it could affect attachments too. This was causing
out-of-bounds memory ranges to be returned from pst_getBlockOffset and
later access; patch fixes both the table reading issue and adds a
missing bounds check to pst_getBlockOffset (so as not to risk a
segfault if the PST is corrupted).
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Wed, 06 Jul 2016 10:20:12 -0700 |
parents | fec7f4fca713 |
children | 26c48ea9d896 |
rev | line source |
---|---|
16 | 1 /*** |
2 * libpst.c | |
3 * Part of the LibPST project | |
4 * Written by David Smith | |
43 | 5 * dave.s@earthcorp.com |
16 | 6 */ |
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
|
7 |
122
bdb38b434c0a
more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents:
120
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:
120
diff
changeset
|
9 |
130
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
10 |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
11 // switch to maximal packing for our own internal structures |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
12 // use the same code as in libpst.h |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
13 #ifdef _MSC_VER |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
14 #pragma pack(push, 1) |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
15 #endif |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
16 #if defined(__GNUC__) || defined (__SUNPRO_C) || defined(__SUNPRO_CC) |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
17 #pragma pack(1) |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
18 #endif |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
19 |
43 | 20 #define ASSERT(x) { if(!(x)) raise( SIGSEGV ); } |
16 | 21 |
43 | 22 #define INDEX_TYPE32 0x0E |
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
|
23 #define INDEX_TYPE32A 0x0F // unknown, but assumed to be similar for now |
43 | 24 #define INDEX_TYPE64 0x17 |
122
bdb38b434c0a
more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
25 #define INDEX_TYPE64A 0x15 // http://sourceforge.net/projects/libpff/ |
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
|
26 #define INDEX_TYPE_OFFSET (int64_t)0x0A |
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
|
27 |
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
|
28 #define FILE_SIZE_POINTER32 (int64_t)0xA8 |
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
|
29 #define INDEX_POINTER32 (int64_t)0xC4 |
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
|
30 #define INDEX_BACK32 (int64_t)0xC0 |
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
|
31 #define SECOND_POINTER32 (int64_t)0xBC |
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
|
32 #define SECOND_BACK32 (int64_t)0xB8 |
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
|
33 #define ENC_TYPE32 (int64_t)0x1CD |
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
|
34 |
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
|
35 #define FILE_SIZE_POINTER64 (int64_t)0xB8 |
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
|
36 #define INDEX_POINTER64 (int64_t)0xF0 |
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
|
37 #define INDEX_BACK64 (int64_t)0xE8 |
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
|
38 #define SECOND_POINTER64 (int64_t)0xE0 |
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
|
39 #define SECOND_BACK64 (int64_t)0xD8 |
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
|
40 #define ENC_TYPE64 (int64_t)0x201 |
46 | 41 |
42 #define FILE_SIZE_POINTER ((pf->do_read64) ? FILE_SIZE_POINTER64 : FILE_SIZE_POINTER32) | |
43 #define INDEX_POINTER ((pf->do_read64) ? INDEX_POINTER64 : INDEX_POINTER32) | |
44 #define INDEX_BACK ((pf->do_read64) ? INDEX_BACK64 : INDEX_BACK32) | |
45 #define SECOND_POINTER ((pf->do_read64) ? SECOND_POINTER64 : SECOND_POINTER32) | |
46 #define SECOND_BACK ((pf->do_read64) ? SECOND_BACK64 : SECOND_BACK32) | |
52 | 47 #define ENC_TYPE ((pf->do_read64) ? ENC_TYPE64 : ENC_TYPE32) |
16 | 48 |
49 #define PST_SIGNATURE 0x4E444221 | |
50 | |
46 | 51 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
52 typedef struct pst_block_offset { |
289
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
53 uint16_t from; |
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
54 uint16_t to; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
55 } pst_block_offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
56 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
57 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
58 typedef struct pst_block_offset_pointer { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
59 char *from; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
60 char *to; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
61 int needfree; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
62 } pst_block_offset_pointer; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
63 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
64 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
65 typedef struct pst_holder { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
66 char **buf; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
67 FILE *fp; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
68 int base64; // bool, are we encoding into base64 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
69 int base64_line_count; // base64 bytes emitted on the current line |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
70 size_t base64_extra; // count of bytes held in base64_extra_chars |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
71 char base64_extra_chars[2]; // up to two pending unencoded bytes |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
72 } pst_holder; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
73 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
74 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
75 typedef struct pst_subblock { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
76 char *buf; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
77 size_t read_size; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
78 size_t i_offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
79 } pst_subblock; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
80 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
81 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
82 typedef struct pst_subblocks { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
83 size_t subblock_count; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
84 pst_subblock *subs; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
85 } pst_subblocks; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
86 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
87 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
88 typedef struct pst_mapi_element { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
89 uint32_t mapi_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
90 char *data; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
91 uint32_t type; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
92 size_t size; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
93 char *extra; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
94 } pst_mapi_element; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
95 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
96 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
97 typedef struct pst_mapi_object { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
98 int32_t count_elements; // count of active elements |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
99 int32_t orig_count; // originally allocated elements |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
100 int32_t count_objects; // number of mapi objects in the list |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
101 struct pst_mapi_element **elements; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
102 struct pst_mapi_object *next; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
103 } pst_mapi_object; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
104 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
105 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
106 typedef struct pst_desc32 { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
107 uint32_t d_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
108 uint32_t desc_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
109 uint32_t tree_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
110 uint32_t parent_d_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
111 } pst_desc32; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
112 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
113 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
114 typedef struct pst_index32 { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
115 uint32_t id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
116 uint32_t offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
117 uint16_t size; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
118 int16_t u1; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
119 } pst_index32; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
120 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
121 |
46 | 122 struct pst_table_ptr_struct32{ |
123 uint32_t start; | |
124 uint32_t u1; | |
125 uint32_t offset; | |
43 | 126 }; |
50 | 127 |
128 | |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
129 typedef struct pst_desc { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
130 uint64_t d_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
131 uint64_t desc_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
132 uint64_t tree_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
133 uint32_t parent_d_id; // not 64 bit |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
134 uint32_t u1; // padding |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
135 } pst_desc; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
136 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
137 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
138 typedef struct pst_index { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
139 uint64_t id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
140 uint64_t offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
141 uint16_t size; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
142 int16_t u0; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
143 int32_t u1; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
144 } pst_index; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
145 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
146 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
147 struct pst_table_ptr_struct{ |
46 | 148 uint64_t start; |
149 uint64_t u1; | |
150 uint64_t offset; | |
16 | 151 }; |
152 | |
50 | 153 |
46 | 154 typedef struct pst_block_header { |
155 uint16_t type; | |
156 uint16_t count; | |
16 | 157 } pst_block_header; |
158 | |
50 | 159 |
46 | 160 typedef struct pst_id2_assoc32 { |
43 | 161 uint32_t id2; |
162 uint32_t id; | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
163 uint32_t child_id; |
46 | 164 } pst_id2_assoc32; |
165 | |
50 | 166 |
46 | 167 typedef struct pst_id2_assoc { |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
168 uint32_t id2; // only 32 bit here |
48 | 169 uint16_t unknown1; |
170 uint16_t unknown2; | |
46 | 171 uint64_t id; |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
172 uint64_t child_id; |
16 | 173 } pst_id2_assoc; |
174 | |
50 | 175 |
48 | 176 typedef struct pst_table3_rec32 { |
177 uint32_t id; | |
178 } pst_table3_rec32; //for type 3 (0x0101) blocks | |
179 | |
50 | 180 |
48 | 181 typedef struct pst_table3_rec { |
182 uint64_t id; | |
183 } pst_table3_rec; //for type 3 (0x0101) blocks | |
184 | |
185 | |
50 | 186 typedef struct pst_block_hdr { |
187 uint16_t index_offset; | |
188 uint16_t type; | |
189 uint32_t offset; | |
190 } pst_block_hdr; | |
191 | |
192 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
193 /** for "compressible" encryption, just a simple substitution cipher, |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
194 * plaintext = comp_enc[ciphertext]; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
195 * for "strong" encryption, this is the first rotor of an Enigma 3 rotor cipher. |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
196 */ |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
197 static unsigned char comp_enc [] = { |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
198 0x47, 0xf1, 0xb4, 0xe6, 0x0b, 0x6a, 0x72, 0x48, 0x85, 0x4e, 0x9e, 0xeb, 0xe2, 0xf8, 0x94, 0x53, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
199 0xe0, 0xbb, 0xa0, 0x02, 0xe8, 0x5a, 0x09, 0xab, 0xdb, 0xe3, 0xba, 0xc6, 0x7c, 0xc3, 0x10, 0xdd, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
200 0x39, 0x05, 0x96, 0x30, 0xf5, 0x37, 0x60, 0x82, 0x8c, 0xc9, 0x13, 0x4a, 0x6b, 0x1d, 0xf3, 0xfb, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
201 0x8f, 0x26, 0x97, 0xca, 0x91, 0x17, 0x01, 0xc4, 0x32, 0x2d, 0x6e, 0x31, 0x95, 0xff, 0xd9, 0x23, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
202 0xd1, 0x00, 0x5e, 0x79, 0xdc, 0x44, 0x3b, 0x1a, 0x28, 0xc5, 0x61, 0x57, 0x20, 0x90, 0x3d, 0x83, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
203 0xb9, 0x43, 0xbe, 0x67, 0xd2, 0x46, 0x42, 0x76, 0xc0, 0x6d, 0x5b, 0x7e, 0xb2, 0x0f, 0x16, 0x29, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
204 0x3c, 0xa9, 0x03, 0x54, 0x0d, 0xda, 0x5d, 0xdf, 0xf6, 0xb7, 0xc7, 0x62, 0xcd, 0x8d, 0x06, 0xd3, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
205 0x69, 0x5c, 0x86, 0xd6, 0x14, 0xf7, 0xa5, 0x66, 0x75, 0xac, 0xb1, 0xe9, 0x45, 0x21, 0x70, 0x0c, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
206 0x87, 0x9f, 0x74, 0xa4, 0x22, 0x4c, 0x6f, 0xbf, 0x1f, 0x56, 0xaa, 0x2e, 0xb3, 0x78, 0x33, 0x50, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
207 0xb0, 0xa3, 0x92, 0xbc, 0xcf, 0x19, 0x1c, 0xa7, 0x63, 0xcb, 0x1e, 0x4d, 0x3e, 0x4b, 0x1b, 0x9b, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
208 0x4f, 0xe7, 0xf0, 0xee, 0xad, 0x3a, 0xb5, 0x59, 0x04, 0xea, 0x40, 0x55, 0x25, 0x51, 0xe5, 0x7a, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
209 0x89, 0x38, 0x68, 0x52, 0x7b, 0xfc, 0x27, 0xae, 0xd7, 0xbd, 0xfa, 0x07, 0xf4, 0xcc, 0x8e, 0x5f, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
210 0xef, 0x35, 0x9c, 0x84, 0x2b, 0x15, 0xd5, 0x77, 0x34, 0x49, 0xb6, 0x12, 0x0a, 0x7f, 0x71, 0x88, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
211 0xfd, 0x9d, 0x18, 0x41, 0x7d, 0x93, 0xd8, 0x58, 0x2c, 0xce, 0xfe, 0x24, 0xaf, 0xde, 0xb8, 0x36, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
212 0xc8, 0xa1, 0x80, 0xa6, 0x99, 0x98, 0xa8, 0x2f, 0x0e, 0x81, 0x65, 0x73, 0xe4, 0xc2, 0xa2, 0x8a, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
213 0xd4, 0xe1, 0x11, 0xd0, 0x08, 0x8b, 0x2a, 0xf2, 0xed, 0x9a, 0x64, 0x3f, 0xc1, 0x6c, 0xf9, 0xec |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
214 }; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
215 |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
216 /** for "strong" encryption, this is the second rotor of an Enigma 3 rotor cipher. |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
217 */ |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
218 static unsigned char comp_high1 [] = { |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
219 0x41, 0x36, 0x13, 0x62, 0xa8, 0x21, 0x6e, 0xbb, 0xf4, 0x16, 0xcc, 0x04, 0x7f, 0x64, 0xe8, 0x5d, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
220 0x1e, 0xf2, 0xcb, 0x2a, 0x74, 0xc5, 0x5e, 0x35, 0xd2, 0x95, 0x47, 0x9e, 0x96, 0x2d, 0x9a, 0x88, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
221 0x4c, 0x7d, 0x84, 0x3f, 0xdb, 0xac, 0x31, 0xb6, 0x48, 0x5f, 0xf6, 0xc4, 0xd8, 0x39, 0x8b, 0xe7, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
222 0x23, 0x3b, 0x38, 0x8e, 0xc8, 0xc1, 0xdf, 0x25, 0xb1, 0x20, 0xa5, 0x46, 0x60, 0x4e, 0x9c, 0xfb, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
223 0xaa, 0xd3, 0x56, 0x51, 0x45, 0x7c, 0x55, 0x00, 0x07, 0xc9, 0x2b, 0x9d, 0x85, 0x9b, 0x09, 0xa0, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
224 0x8f, 0xad, 0xb3, 0x0f, 0x63, 0xab, 0x89, 0x4b, 0xd7, 0xa7, 0x15, 0x5a, 0x71, 0x66, 0x42, 0xbf, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
225 0x26, 0x4a, 0x6b, 0x98, 0xfa, 0xea, 0x77, 0x53, 0xb2, 0x70, 0x05, 0x2c, 0xfd, 0x59, 0x3a, 0x86, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
226 0x7e, 0xce, 0x06, 0xeb, 0x82, 0x78, 0x57, 0xc7, 0x8d, 0x43, 0xaf, 0xb4, 0x1c, 0xd4, 0x5b, 0xcd, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
227 0xe2, 0xe9, 0x27, 0x4f, 0xc3, 0x08, 0x72, 0x80, 0xcf, 0xb0, 0xef, 0xf5, 0x28, 0x6d, 0xbe, 0x30, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
228 0x4d, 0x34, 0x92, 0xd5, 0x0e, 0x3c, 0x22, 0x32, 0xe5, 0xe4, 0xf9, 0x9f, 0xc2, 0xd1, 0x0a, 0x81, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
229 0x12, 0xe1, 0xee, 0x91, 0x83, 0x76, 0xe3, 0x97, 0xe6, 0x61, 0x8a, 0x17, 0x79, 0xa4, 0xb7, 0xdc, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
230 0x90, 0x7a, 0x5c, 0x8c, 0x02, 0xa6, 0xca, 0x69, 0xde, 0x50, 0x1a, 0x11, 0x93, 0xb9, 0x52, 0x87, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
231 0x58, 0xfc, 0xed, 0x1d, 0x37, 0x49, 0x1b, 0x6a, 0xe0, 0x29, 0x33, 0x99, 0xbd, 0x6c, 0xd9, 0x94, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
232 0xf3, 0x40, 0x54, 0x6f, 0xf0, 0xc6, 0x73, 0xb8, 0xd6, 0x3e, 0x65, 0x18, 0x44, 0x1f, 0xdd, 0x67, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
233 0x10, 0xf1, 0x0c, 0x19, 0xec, 0xae, 0x03, 0xa1, 0x14, 0x7b, 0xa9, 0x0b, 0xff, 0xf8, 0xa3, 0xc0, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
234 0xa2, 0x01, 0xf7, 0x2e, 0xbc, 0x24, 0x68, 0x75, 0x0d, 0xfe, 0xba, 0x2f, 0xb5, 0xd0, 0xda, 0x3d |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
235 }; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
236 |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
237 /** for "strong" encryption, this is the third rotor of an Enigma 3 rotor cipher. |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
238 */ |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
239 static unsigned char comp_high2 [] = { |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
240 0x14, 0x53, 0x0f, 0x56, 0xb3, 0xc8, 0x7a, 0x9c, 0xeb, 0x65, 0x48, 0x17, 0x16, 0x15, 0x9f, 0x02, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
241 0xcc, 0x54, 0x7c, 0x83, 0x00, 0x0d, 0x0c, 0x0b, 0xa2, 0x62, 0xa8, 0x76, 0xdb, 0xd9, 0xed, 0xc7, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
242 0xc5, 0xa4, 0xdc, 0xac, 0x85, 0x74, 0xd6, 0xd0, 0xa7, 0x9b, 0xae, 0x9a, 0x96, 0x71, 0x66, 0xc3, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
243 0x63, 0x99, 0xb8, 0xdd, 0x73, 0x92, 0x8e, 0x84, 0x7d, 0xa5, 0x5e, 0xd1, 0x5d, 0x93, 0xb1, 0x57, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
244 0x51, 0x50, 0x80, 0x89, 0x52, 0x94, 0x4f, 0x4e, 0x0a, 0x6b, 0xbc, 0x8d, 0x7f, 0x6e, 0x47, 0x46, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
245 0x41, 0x40, 0x44, 0x01, 0x11, 0xcb, 0x03, 0x3f, 0xf7, 0xf4, 0xe1, 0xa9, 0x8f, 0x3c, 0x3a, 0xf9, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
246 0xfb, 0xf0, 0x19, 0x30, 0x82, 0x09, 0x2e, 0xc9, 0x9d, 0xa0, 0x86, 0x49, 0xee, 0x6f, 0x4d, 0x6d, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
247 0xc4, 0x2d, 0x81, 0x34, 0x25, 0x87, 0x1b, 0x88, 0xaa, 0xfc, 0x06, 0xa1, 0x12, 0x38, 0xfd, 0x4c, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
248 0x42, 0x72, 0x64, 0x13, 0x37, 0x24, 0x6a, 0x75, 0x77, 0x43, 0xff, 0xe6, 0xb4, 0x4b, 0x36, 0x5c, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
249 0xe4, 0xd8, 0x35, 0x3d, 0x45, 0xb9, 0x2c, 0xec, 0xb7, 0x31, 0x2b, 0x29, 0x07, 0x68, 0xa3, 0x0e, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
250 0x69, 0x7b, 0x18, 0x9e, 0x21, 0x39, 0xbe, 0x28, 0x1a, 0x5b, 0x78, 0xf5, 0x23, 0xca, 0x2a, 0xb0, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
251 0xaf, 0x3e, 0xfe, 0x04, 0x8c, 0xe7, 0xe5, 0x98, 0x32, 0x95, 0xd3, 0xf6, 0x4a, 0xe8, 0xa6, 0xea, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
252 0xe9, 0xf3, 0xd5, 0x2f, 0x70, 0x20, 0xf2, 0x1f, 0x05, 0x67, 0xad, 0x55, 0x10, 0xce, 0xcd, 0xe3, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
253 0x27, 0x3b, 0xda, 0xba, 0xd7, 0xc2, 0x26, 0xd4, 0x91, 0x1d, 0xd2, 0x1c, 0x22, 0x33, 0xf8, 0xfa, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
254 0xf1, 0x5a, 0xef, 0xcf, 0x90, 0xb6, 0x8b, 0xb5, 0xbd, 0xc0, 0xbf, 0x08, 0x97, 0x1e, 0x6c, 0xe2, |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
255 0x61, 0xe0, 0xc6, 0xc1, 0x59, 0xab, 0xbb, 0x58, 0xde, 0x5f, 0xdf, 0x60, 0x79, 0x7e, 0xb2, 0x8a |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
256 }; |
43 | 257 |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
258 static size_t pst_append_holder(pst_holder *h, size_t size, char **buf, size_t z); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
259 static int pst_build_desc_ptr(pst_file *pf, int64_t offset, int32_t depth, uint64_t linku1, uint64_t start_val, uint64_t end_val); |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
260 static pst_id2_tree* pst_build_id2(pst_file *pf, pst_index_ll* list); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
261 static int pst_build_id_ptr(pst_file *pf, int64_t offset, int32_t depth, uint64_t linku1, uint64_t start_val, uint64_t end_val); |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
262 static int pst_chr_count(char *str, char x); |
188 | 263 static size_t pst_ff_compile_ID(pst_file *pf, uint64_t i_id, pst_holder *h, size_t size); |
204
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
264 static size_t pst_ff_getIDblock(pst_file *pf, uint64_t i_id, char** buf); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
265 static size_t pst_ff_getID2block(pst_file *pf, uint64_t id2, pst_id2_tree *id2_head, char** buf); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
266 static size_t pst_ff_getID2data(pst_file *pf, pst_index_ll *ptr, pst_holder *h); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
267 static size_t pst_finish_cleanup_holder(pst_holder *h, size_t size); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
268 static void pst_free_attach(pst_item_attach *attach); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
269 static void pst_free_desc (pst_desc_tree *head); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
270 static void pst_free_id2(pst_id2_tree * head); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
271 static void pst_free_id (pst_index_ll *head); |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
272 static void pst_free_list(pst_mapi_object *list); |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
273 static void pst_free_xattrib(pst_x_attrib_ll *x); |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
274 static size_t pst_getAtPos(pst_file *pf, int64_t pos, void* buf, size_t size); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
275 static int pst_getBlockOffsetPointer(pst_file *pf, pst_id2_tree *i2_head, pst_subblocks *subblocks, uint32_t offset, pst_block_offset_pointer *p); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
276 static int pst_getBlockOffset(char *buf, size_t read_size, uint32_t i_offset, uint32_t offset, pst_block_offset *p); |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
277 static pst_id2_tree* pst_getID2(pst_id2_tree * ptr, uint64_t id); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
278 static pst_desc_tree* pst_getDptr(pst_file *pf, uint64_t d_id); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
279 static uint64_t pst_getIntAt(pst_file *pf, char *buf); |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
280 static uint64_t pst_getIntAtPos(pst_file *pf, int64_t pos); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
281 static pst_mapi_object* pst_parse_block(pst_file *pf, uint64_t block_id, pst_id2_tree *i2_head); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
282 static void pst_printDptr(pst_file *pf, pst_desc_tree *ptr); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
283 static void pst_printID2ptr(pst_id2_tree *ptr); |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
284 static int pst_process(uint64_t block_id, pst_mapi_object *list, pst_item *item, pst_item_attach *attach); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
285 static size_t pst_read_block_size(pst_file *pf, int64_t offset, size_t size, char **buf); |
204
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
286 static int pst_decrypt(uint64_t i_id, char *buf, size_t size, unsigned char type); |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
287 static int pst_strincmp(char *a, char *b, size_t x); |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
288 static char* pst_wide_to_single(char *wt, size_t size); |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
289 |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
290 |
325 | 291 static char *pst_getcwd(void) { |
292 char *cwd; | |
293 #ifdef HAVE_GET_CURRENT_DIR_NAME | |
294 cwd = get_current_dir_name(); | |
295 #else | |
296 cwd = pst_malloc(PATH_MAX+1); | |
297 getcwd(cwd, PATH_MAX+1); | |
298 #endif | |
299 return cwd; | |
300 } | |
301 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
302 |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
303 int pst_open(pst_file *pf, const char *name, const char *charset) { |
46 | 304 int32_t sig; |
43 | 305 |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
306 pst_unicode_init(); |
45 | 307 |
43 | 308 DEBUG_ENT("pst_open"); |
309 | |
310 if (!pf) { | |
311 WARN (("cannot be passed a NULL pst_file\n")); | |
312 DEBUG_RET(); | |
313 return -1; | |
314 } | |
46 | 315 memset(pf, 0, sizeof(*pf)); |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
316 pf->charset = charset; |
16 | 317 |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
318 if ((pf->fp = fopen(name, "rb")) == NULL) { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
319 perror("Error opening PST file"); |
43 | 320 DEBUG_RET(); |
321 return -1; | |
322 } | |
323 | |
324 // Check pst file magic | |
52 | 325 if (pst_getAtPos(pf, 0, &sig, sizeof(sig)) != sizeof(sig)) { |
46 | 326 (void)fclose(pf->fp); |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
327 DEBUG_WARN(("cannot read signature from PST file. Closing with error\n")); |
43 | 328 DEBUG_RET(); |
329 return -1; | |
330 } | |
331 LE32_CPU(sig); | |
332 DEBUG_INFO(("sig = %X\n", sig)); | |
46 | 333 if (sig != (int32_t)PST_SIGNATURE) { |
334 (void)fclose(pf->fp); | |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
335 DEBUG_WARN(("not a PST file that I know. Closing with error\n")); |
43 | 336 DEBUG_RET(); |
337 return -1; | |
338 } | |
339 | |
340 // read index type | |
52 | 341 (void)pst_getAtPos(pf, INDEX_TYPE_OFFSET, &(pf->ind_type), sizeof(pf->ind_type)); |
43 | 342 DEBUG_INFO(("index_type = %i\n", pf->ind_type)); |
48 | 343 switch (pf->ind_type) { |
344 case INDEX_TYPE32 : | |
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
|
345 case INDEX_TYPE32A : |
48 | 346 pf->do_read64 = 0; |
347 break; | |
348 case INDEX_TYPE64 : | |
122
bdb38b434c0a
more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
349 case INDEX_TYPE64A : |
48 | 350 pf->do_read64 = 1; |
351 break; | |
352 default: | |
85
582e927756d3
Patch from Robert Simpson for file handle leak in error case.
Carl Byington <carl@five-ten-sg.com>
parents:
79
diff
changeset
|
353 (void)fclose(pf->fp); |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
354 DEBUG_WARN(("unknown .pst format, possibly newer than Outlook 2003 PST file?\n")); |
43 | 355 DEBUG_RET(); |
356 return -1; | |
357 } | |
358 | |
359 // read encryption setting | |
52 | 360 (void)pst_getAtPos(pf, ENC_TYPE, &(pf->encryption), sizeof(pf->encryption)); |
43 | 361 DEBUG_INFO(("encrypt = %i\n", pf->encryption)); |
362 | |
46 | 363 pf->index2_back = pst_getIntAtPos(pf, SECOND_BACK); |
364 pf->index2 = pst_getIntAtPos(pf, SECOND_POINTER); | |
365 pf->size = pst_getIntAtPos(pf, FILE_SIZE_POINTER); | |
87
3ec5ad97e926
Use inttypes.h for portable printing of 64 bit items.
Carl Byington <carl@five-ten-sg.com>
parents:
85
diff
changeset
|
366 DEBUG_INFO(("Pointer2 is %#"PRIx64", back pointer2 is %#"PRIx64"\n", pf->index2, pf->index2_back)); |
46 | 367 |
368 pf->index1_back = pst_getIntAtPos(pf, INDEX_BACK); | |
369 pf->index1 = pst_getIntAtPos(pf, INDEX_POINTER); | |
87
3ec5ad97e926
Use inttypes.h for portable printing of 64 bit items.
Carl Byington <carl@five-ten-sg.com>
parents:
85
diff
changeset
|
370 DEBUG_INFO(("Pointer1 is %#"PRIx64", back pointer2 is %#"PRIx64"\n", pf->index1, pf->index1_back)); |
43 | 371 |
372 DEBUG_RET(); | |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
373 |
325 | 374 pf->cwd = pst_getcwd(); |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
375 pf->fname = strdup(name); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
376 return 0; |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
377 } |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
378 |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
379 |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
380 int pst_reopen(pst_file *pf) { |
325 | 381 char *cwd; |
382 cwd = pst_getcwd(); | |
383 if (cwd == NULL) return -1; | |
384 if (chdir(pf->cwd)) goto err; | |
385 if (!freopen(pf->fname, "rb", pf->fp)) goto err; | |
386 if (chdir(cwd)) goto err; | |
387 free(cwd); | |
43 | 388 return 0; |
325 | 389 err: |
390 free(cwd); | |
391 return -1; | |
16 | 392 } |
393 | |
394 | |
46 | 395 int pst_close(pst_file *pf) { |
43 | 396 DEBUG_ENT("pst_close"); |
397 if (!pf->fp) { | |
398 DEBUG_RET(); | |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
399 return 0; |
43 | 400 } |
401 if (fclose(pf->fp)) { | |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
402 DEBUG_WARN(("fclose returned non-zero value\n")); |
43 | 403 } |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
404 // free the paths |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
405 free(pf->cwd); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
406 free(pf->fname); |
43 | 407 // we must free the id linklist and the desc tree |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
408 pst_free_id(pf->i_head); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
409 pst_free_desc(pf->d_head); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
410 pst_free_xattrib(pf->x_head); |
43 | 411 DEBUG_RET(); |
412 return 0; | |
16 | 413 } |
414 | |
415 | |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
416 /** |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
417 * add a pst descriptor node to a linked list of such nodes. |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
418 * |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
419 * @param node pointer to the node to be added to the list |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
420 * @param head pointer to the list head pointer |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
421 * @param tail pointer to the list tail pointer |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
422 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
423 static void add_descriptor_to_list(pst_desc_tree *node, pst_desc_tree **head, pst_desc_tree **tail); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
424 static void add_descriptor_to_list(pst_desc_tree *node, pst_desc_tree **head, pst_desc_tree **tail) |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
425 { |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
426 DEBUG_ENT("add_descriptor_to_list"); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
427 //DEBUG_INFO(("Added node %#"PRIx64" parent %#"PRIx64" real parent %#"PRIx64" prev %#"PRIx64" next %#"PRIx64"\n", |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
428 // node->id, node->parent_d_id, |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
429 // (node->parent ? node->parent->id : (uint64_t)0), |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
430 // (node->prev ? node->prev->id : (uint64_t)0), |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
431 // (node->next ? node->next->id : (uint64_t)0))); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
432 if (*tail) (*tail)->next = node; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
433 if (!(*head)) *head = node; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
434 node->prev = *tail; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
435 node->next = NULL; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
436 *tail = node; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
437 DEBUG_RET(); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
438 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
439 |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
440 |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
441 /** |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
442 * add a pst descriptor node into the global tree. |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
443 * |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
444 * @param pf global pst file pointer |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
445 * @param node pointer to the new node to be added to the tree |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
446 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
447 static void record_descriptor(pst_file *pf, pst_desc_tree *node); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
448 static void record_descriptor(pst_file *pf, pst_desc_tree *node) |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
449 { |
104
39ba19372732
many fixes in pst2ldif by Robert Harris
Carl Byington <carl@five-ten-sg.com>
parents:
103
diff
changeset
|
450 DEBUG_ENT("record_descriptor"); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
451 // finish node initialization |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
452 node->parent = NULL; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
453 node->child = NULL; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
454 node->child_tail = NULL; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
455 node->no_child = 0; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
456 |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
457 // find any orphan children of this node, and collect them |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
458 pst_desc_tree *n = pf->d_head; |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
459 while (n) { |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
460 if (n->parent_d_id == node->d_id) { |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
461 // found a child of this node |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
462 DEBUG_INFO(("Found orphan child %#"PRIx64" of parent %#"PRIx64"\n", n->d_id, node->d_id)); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
463 pst_desc_tree *nn = n->next; |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
464 pst_desc_tree *pp = n->prev; |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
465 node->no_child++; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
466 n->parent = node; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
467 add_descriptor_to_list(n, &node->child, &node->child_tail); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
468 if (pp) pp->next = nn; else pf->d_head = nn; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
469 if (nn) nn->prev = pp; else pf->d_tail = pp; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
470 n = nn; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
471 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
472 else { |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
473 n = n->next; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
474 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
475 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
476 |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
477 // now hook this node into the global tree |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
478 if (node->parent_d_id == 0) { |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
479 // add top level node to the descriptor tree |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
480 //DEBUG_INFO(("Null parent\n")); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
481 add_descriptor_to_list(node, &pf->d_head, &pf->d_tail); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
482 } |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
483 else if (node->parent_d_id == node->d_id) { |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
484 // add top level node to the descriptor tree |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
485 DEBUG_INFO(("%#"PRIx64" is its own parent. What is this world coming to?\n", node->d_id)); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
486 add_descriptor_to_list(node, &pf->d_head, &pf->d_tail); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
487 } else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
488 //DEBUG_INFO(("Searching for parent %#"PRIx64" of %#"PRIx64"\n", node->parent_d_id, node->d_id)); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
489 pst_desc_tree *parent = pst_getDptr(pf, node->parent_d_id); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
490 if (parent) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
491 //DEBUG_INFO(("Found parent %#"PRIx64"\n", node->parent_d_id)); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
492 parent->no_child++; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
493 node->parent = parent; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
494 add_descriptor_to_list(node, &parent->child, &parent->child_tail); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
495 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
496 else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
497 DEBUG_INFO(("No parent %#"PRIx64", have an orphan child %#"PRIx64"\n", node->parent_d_id, node->d_id)); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
498 add_descriptor_to_list(node, &pf->d_head, &pf->d_tail); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
499 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
500 } |
104
39ba19372732
many fixes in pst2ldif by Robert Harris
Carl Byington <carl@five-ten-sg.com>
parents:
103
diff
changeset
|
501 DEBUG_RET(); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
502 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
503 |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
504 |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
505 /** |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
506 * make a deep copy of part of the id2 mapping tree, for use |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
507 * by an attachment containing an embedded rfc822 message. |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
508 * |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
509 * @param head pointer to the subtree to be copied |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
510 * @return pointer to the new copy of the subtree |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
511 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
512 static pst_id2_tree* deep_copy(pst_id2_tree *head); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
513 static pst_id2_tree* deep_copy(pst_id2_tree *head) |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
514 { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
515 if (!head) return NULL; |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
516 pst_id2_tree* me = (pst_id2_tree*) pst_malloc(sizeof(pst_id2_tree)); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
517 me->id2 = head->id2; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
518 me->id = head->id; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
519 me->child = deep_copy(head->child); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
520 me->next = deep_copy(head->next); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
521 return me; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
522 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
523 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
524 |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
525 pst_desc_tree* pst_getTopOfFolders(pst_file *pf, const pst_item *root) { |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
526 pst_desc_tree *topnode; |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
527 uint32_t topid; |
43 | 528 DEBUG_ENT("pst_getTopOfFolders"); |
529 if (!root || !root->message_store) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
530 DEBUG_INFO(("There isn't a top of folder record here.\n")); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
531 DEBUG_RET(); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
532 return NULL; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
533 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
534 if (!root->message_store->top_of_personal_folder) { |
43 | 535 // this is the OST way |
536 // ASSUMPTION: Top Of Folders record in PST files is *always* descid 0x2142 | |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
537 topid = 0x2142; |
43 | 538 } else { |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
539 topid = root->message_store->top_of_personal_folder->id; |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
540 } |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
541 DEBUG_INFO(("looking for top of folder descriptor %#"PRIx32"\n", topid)); |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
542 topnode = pst_getDptr(pf, (uint64_t)topid); |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
543 if (!topnode) { |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
544 // add dummy top record to pickup orphan children |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
545 topnode = (pst_desc_tree*) pst_malloc(sizeof(pst_desc_tree)); |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
546 topnode->d_id = topid; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
547 topnode->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:
149
diff
changeset
|
548 topnode->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:
149
diff
changeset
|
549 topnode->desc = NULL; |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
550 record_descriptor(pf, topnode); // add to the global tree |
43 | 551 } |
552 DEBUG_RET(); | |
103
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
553 return topnode; |
16 | 554 } |
555 | |
556 | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
557 pst_binary pst_attach_to_mem(pst_file *pf, 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:
190
diff
changeset
|
558 pst_index_ll *ptr; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
559 pst_binary rc; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
560 pst_holder h = {&rc.data, NULL, 0, 0, 0}; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
561 rc.size = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
562 rc.data = NULL; |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
563 DEBUG_ENT("pst_attach_to_mem"); |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
564 if ((!attach->data.data) && (attach->i_id != (uint64_t)-1)) { |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
565 ptr = pst_getID(pf, attach->i_id); |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
566 if (ptr) { |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
567 rc.size = pst_ff_getID2data(pf, ptr, &h); |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
568 } else { |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
569 DEBUG_WARN(("Couldn't find ID pointer. Cannot handle attachment\n")); |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
570 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
571 } else { |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
572 rc = attach->data; |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
573 attach->data.data = NULL; // prevent pst_free_item() from trying to free this |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
574 attach->data.size = 0; // since we have given that buffer to the caller |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
575 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
576 DEBUG_RET(); |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
577 return rc; |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
578 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
579 |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
580 |
46 | 581 size_t pst_attach_to_file(pst_file *pf, pst_item_attach *attach, FILE* fp) { |
43 | 582 pst_index_ll *ptr; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
583 pst_holder h = {NULL, fp, 0, 0, 0}; |
93 | 584 size_t size = 0; |
43 | 585 DEBUG_ENT("pst_attach_to_file"); |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
586 if ((!attach->data.data) && (attach->i_id != (uint64_t)-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:
163
diff
changeset
|
587 ptr = pst_getID(pf, attach->i_id); |
43 | 588 if (ptr) { |
46 | 589 size = pst_ff_getID2data(pf, ptr, &h); |
43 | 590 } else { |
591 DEBUG_WARN(("Couldn't find ID pointer. Cannot save attachment to file\n")); | |
592 } | |
593 } else { | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
594 size = attach->data.size; |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
595 if (attach->data.data && size) { |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
596 // save the attachment to the file |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
597 (void)pst_fwrite(attach->data.data, (size_t)1, size, fp); |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
598 } |
43 | 599 } |
600 DEBUG_RET(); | |
46 | 601 return size; |
16 | 602 } |
603 | |
604 | |
46 | 605 size_t pst_attach_to_file_base64(pst_file *pf, pst_item_attach *attach, FILE* fp) { |
43 | 606 pst_index_ll *ptr; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
607 pst_holder h = {NULL, fp, 1, 0, 0}; |
93 | 608 size_t size = 0; |
43 | 609 DEBUG_ENT("pst_attach_to_file_base64"); |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
610 if ((!attach->data.data) && (attach->i_id != (uint64_t)-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:
163
diff
changeset
|
611 ptr = pst_getID(pf, attach->i_id); |
43 | 612 if (ptr) { |
46 | 613 size = pst_ff_getID2data(pf, ptr, &h); |
43 | 614 } else { |
93 | 615 DEBUG_WARN(("Couldn't find ID pointer. Cannot save attachment to Base64\n")); |
43 | 616 } |
617 } else { | |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
618 size = attach->data.size; |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
619 if (attach->data.data && size) { |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
620 // encode the attachment to the file |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
621 char *c = pst_base64_encode(attach->data.data, size); |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
622 if (c) { |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
623 (void)pst_fwrite(c, (size_t)1, strlen(c), fp); |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
624 free(c); // caught by valgrind |
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
625 } |
43 | 626 } |
627 } | |
628 DEBUG_RET(); | |
46 | 629 return size; |
16 | 630 } |
631 | |
632 | |
46 | 633 int pst_load_index (pst_file *pf) { |
634 int x; | |
43 | 635 DEBUG_ENT("pst_load_index"); |
636 if (!pf) { | |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
637 DEBUG_WARN(("Cannot load index for a NULL pst_file\n")); |
43 | 638 DEBUG_RET(); |
639 return -1; | |
640 } | |
641 | |
46 | 642 x = pst_build_id_ptr(pf, pf->index1, 0, pf->index1_back, 0, UINT64_MAX); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
643 DEBUG_INFO(("build id ptr returns %i\n", x)); |
43 | 644 |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
645 x = pst_build_desc_ptr(pf, pf->index2, 0, pf->index2_back, (uint64_t)0x21, UINT64_MAX); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
646 DEBUG_INFO(("build desc ptr returns %i\n", x)); |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
647 |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
648 pst_printDptr(pf, pf->d_head); |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
649 |
43 | 650 DEBUG_RET(); |
651 return 0; | |
16 | 652 } |
653 | |
654 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
655 pst_desc_tree* pst_getNextDptr(pst_desc_tree* d) { |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
656 pst_desc_tree* r = NULL; |
43 | 657 DEBUG_ENT("pst_getNextDptr"); |
658 if (d) { | |
659 if ((r = d->child) == NULL) { | |
660 while (!d->next && d->parent) d = d->parent; | |
661 r = d->next; | |
662 } | |
663 } | |
664 DEBUG_RET(); | |
665 return r; | |
16 | 666 } |
667 | |
668 | |
46 | 669 typedef struct pst_x_attrib { |
114
e213bfcf9aa7
patch from Chris Eagle to build on cygwin
Carl Byington <carl@five-ten-sg.com>
parents:
110
diff
changeset
|
670 uint32_t extended; |
43 | 671 uint16_t type; |
672 uint16_t map; | |
16 | 673 } pst_x_attrib; |
674 | |
675 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
676 /** Try to load the extended attributes from the pst file. |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
677 @return true(1) or false(0) to indicate whether the extended attributes have been loaded |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
678 */ |
46 | 679 int pst_load_extended_attributes(pst_file *pf) { |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
680 // for PST files this will load up d_id 0x61 and check it's "assoc_tree" attribute. |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
681 pst_desc_tree *p; |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
682 pst_mapi_object *list; |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
683 pst_id2_tree *id2_head = NULL; |
52 | 684 char *buffer=NULL, *headerbuffer=NULL; |
46 | 685 size_t bsize=0, hsize=0, bptr=0; |
43 | 686 pst_x_attrib xattrib; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
687 int32_t tint, x; |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
688 pst_x_attrib_ll *ptr, *p_head=NULL; |
43 | 689 |
690 DEBUG_ENT("pst_loadExtendedAttributes"); | |
52 | 691 p = pst_getDptr(pf, (uint64_t)0x61); |
692 if (!p) { | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
693 DEBUG_WARN(("Cannot find d_id 0x61 for loading the Extended Attributes\n")); |
43 | 694 DEBUG_RET(); |
695 return 0; | |
696 } | |
697 | |
698 if (!p->desc) { | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
699 DEBUG_WARN(("descriptor is NULL for d_id 0x61. Cannot load Extended Attributes\n")); |
43 | 700 DEBUG_RET(); |
701 return 0; | |
702 } | |
703 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
704 if (p->assoc_tree) { |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
705 id2_head = pst_build_id2(pf, p->assoc_tree); |
51 | 706 pst_printID2ptr(id2_head); |
43 | 707 } else { |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
708 DEBUG_WARN(("Have not been able to fetch any id2 values for d_id 0x61. Brace yourself!\n")); |
43 | 709 } |
710 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
711 list = pst_parse_block(pf, p->desc->i_id, id2_head); |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
712 if (!list) { |
43 | 713 DEBUG_WARN(("Cannot process desc block for item 0x61. Not loading extended Attributes\n")); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
714 pst_free_id2(id2_head); |
43 | 715 DEBUG_RET(); |
716 return 0; | |
717 } | |
718 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
719 DEBUG_INFO(("look thru d_id 0x61 list of mapi objects\n")); |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
720 for (x=0; x < list->count_elements; x++) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
721 DEBUG_INFO(("#%d - mapi-id: %#x type: %#x length: %#x\n", x, list->elements[x]->mapi_id, list->elements[x]->type, list->elements[x]->size)); |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
722 if (list->elements[x]->data) { |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
723 DEBUG_HEXDUMPC(list->elements[x]->data, list->elements[x]->size, 0x10); |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
724 } |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
725 if (list->elements[x]->mapi_id == (uint32_t)0x0003) { |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
726 buffer = list->elements[x]->data; |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
727 bsize = list->elements[x]->size; |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
728 } else if (list->elements[x]->mapi_id == (uint32_t)0x0004) { |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
729 headerbuffer = list->elements[x]->data; |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
730 hsize = list->elements[x]->size; |
46 | 731 } else { |
732 // leave them null | |
43 | 733 } |
734 } | |
735 | |
736 if (!buffer) { | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
737 pst_free_list(list); |
43 | 738 DEBUG_WARN(("No extended attributes buffer found. Not processing\n")); |
739 DEBUG_RET(); | |
740 return 0; | |
741 } | |
742 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
743 while (bptr < bsize) { |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
744 int err = 0; |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
745 xattrib.extended= PST_LE_GET_UINT32(buffer+bptr), bptr += 4; |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
746 xattrib.type = PST_LE_GET_UINT16(buffer+bptr), bptr += 2; |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
747 xattrib.map = PST_LE_GET_UINT16(buffer+bptr), bptr += 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
|
748 ptr = (pst_x_attrib_ll*) pst_malloc(sizeof(*ptr)); |
46 | 749 memset(ptr, 0, sizeof(*ptr)); |
750 ptr->map = xattrib.map+0x8000; | |
43 | 751 ptr->next = NULL; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
752 DEBUG_INFO(("xattrib: ext = %#"PRIx32", type = %#"PRIx16", map = %#"PRIx16"\n", |
114
e213bfcf9aa7
patch from Chris Eagle to build on cygwin
Carl Byington <carl@five-ten-sg.com>
parents:
110
diff
changeset
|
753 xattrib.extended, xattrib.type, xattrib.map)); |
43 | 754 if (xattrib.type & 0x0001) { // if the Bit 1 is set |
755 // pointer to Unicode field in buffer | |
756 if (xattrib.extended < hsize) { | |
757 char *wt; | |
758 // copy the size of the header. It is 32 bit int | |
759 memcpy(&tint, &(headerbuffer[xattrib.extended]), sizeof(tint)); | |
760 LE32_CPU(tint); | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
761 wt = (char*) pst_malloc((size_t)(tint+2)); // plus 2 for a uni-code zero |
46 | 762 memset(wt, 0, (size_t)(tint+2)); |
763 memcpy(wt, &(headerbuffer[xattrib.extended+sizeof(tint)]), (size_t)tint); | |
47 | 764 ptr->data = pst_wide_to_single(wt, (size_t)tint); |
43 | 765 free(wt); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
766 DEBUG_INFO(("Mapped attribute %#"PRIx32" to %s\n", ptr->map, ptr->data)); |
43 | 767 } else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
768 DEBUG_INFO(("Cannot read outside of buffer [%i !< %i]\n", xattrib.extended, hsize)); |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
769 err = 1; |
43 | 770 } |
771 ptr->mytype = PST_MAP_HEADER; | |
772 } else { | |
773 // contains the attribute code to map to. | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
774 ptr->data = (uint32_t*)pst_malloc(sizeof(uint32_t)); |
46 | 775 memset(ptr->data, 0, sizeof(uint32_t)); |
776 *((uint32_t*)ptr->data) = xattrib.extended; | |
43 | 777 ptr->mytype = PST_MAP_ATTRIB; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
778 DEBUG_INFO(("Mapped attribute %#"PRIx32" to %#"PRIx32"\n", ptr->map, *((uint32_t*)ptr->data))); |
43 | 779 } |
780 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
781 if (!err) { |
43 | 782 // add it to the list |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
783 pst_x_attrib_ll *p_sh = p_head; |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
784 pst_x_attrib_ll *p_sh2 = NULL; |
171
6c1e75bc4cac
properly add trailing mime boundary in all modes
Carl Byington <carl@five-ten-sg.com>
parents:
170
diff
changeset
|
785 while (p_sh && (ptr->map > p_sh->map)) { |
43 | 786 p_sh2 = p_sh; |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
787 p_sh = p_sh->next; |
43 | 788 } |
789 if (!p_sh2) { | |
790 // needs to go before first item | |
791 ptr->next = p_head; | |
792 p_head = ptr; | |
793 } else { | |
794 // it will go after p_sh2 | |
795 ptr->next = p_sh2->next; | |
796 p_sh2->next = ptr; | |
797 } | |
798 } else { | |
799 free(ptr); | |
800 } | |
801 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
802 pst_free_id2(id2_head); |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
803 pst_free_list(list); |
43 | 804 pf->x_head = p_head; |
805 DEBUG_RET(); | |
806 return 1; | |
16 | 807 } |
808 | |
52 | 809 |
44 | 810 #define ITEM_COUNT_OFFSET32 0x1f0 // count byte |
811 #define LEVEL_INDICATOR_OFFSET32 0x1f3 // node or leaf | |
812 #define BACKLINK_OFFSET32 0x1f8 // backlink u1 value | |
813 #define ITEM_SIZE32 12 | |
814 #define DESC_SIZE32 16 | |
815 #define INDEX_COUNT_MAX32 41 // max active items | |
816 #define DESC_COUNT_MAX32 31 // max active items | |
817 | |
818 #define ITEM_COUNT_OFFSET64 0x1e8 // count byte | |
819 #define LEVEL_INDICATOR_OFFSET64 0x1eb // node or leaf | |
820 #define BACKLINK_OFFSET64 0x1f8 // backlink u1 value | |
821 #define ITEM_SIZE64 24 | |
822 #define DESC_SIZE64 32 | |
823 #define INDEX_COUNT_MAX64 20 // max active items | |
824 #define DESC_COUNT_MAX64 15 // max active items | |
825 | |
52 | 826 #define BLOCK_SIZE 512 // index blocks |
827 #define DESC_BLOCK_SIZE 512 // descriptor blocks | |
46 | 828 #define ITEM_COUNT_OFFSET (size_t)((pf->do_read64) ? ITEM_COUNT_OFFSET64 : ITEM_COUNT_OFFSET32) |
829 #define LEVEL_INDICATOR_OFFSET (size_t)((pf->do_read64) ? LEVEL_INDICATOR_OFFSET64 : LEVEL_INDICATOR_OFFSET32) | |
830 #define BACKLINK_OFFSET (size_t)((pf->do_read64) ? BACKLINK_OFFSET64 : BACKLINK_OFFSET32) | |
831 #define ITEM_SIZE (size_t)((pf->do_read64) ? ITEM_SIZE64 : ITEM_SIZE32) | |
832 #define DESC_SIZE (size_t)((pf->do_read64) ? DESC_SIZE64 : DESC_SIZE32) | |
833 #define INDEX_COUNT_MAX (int32_t)((pf->do_read64) ? INDEX_COUNT_MAX64 : INDEX_COUNT_MAX32) | |
834 #define DESC_COUNT_MAX (int32_t)((pf->do_read64) ? DESC_COUNT_MAX64 : DESC_COUNT_MAX32) | |
835 | |
836 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
837 static size_t pst_decode_desc(pst_file *pf, pst_desc *desc, char *buf); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
838 static size_t pst_decode_desc(pst_file *pf, pst_desc *desc, char *buf) { |
46 | 839 size_t r; |
840 if (pf->do_read64) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
841 DEBUG_INFO(("Decoding desc64\n")); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
842 DEBUG_HEXDUMPC(buf, sizeof(pst_desc), 0x10); |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
843 memcpy(desc, buf, sizeof(pst_desc)); |
43 | 844 LE64_CPU(desc->d_id); |
845 LE64_CPU(desc->desc_id); | |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
846 LE64_CPU(desc->tree_id); |
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
847 LE32_CPU(desc->parent_d_id); |
43 | 848 LE32_CPU(desc->u1); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
849 r = sizeof(pst_desc); |
43 | 850 } |
851 else { | |
852 pst_desc32 d32; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
853 DEBUG_INFO(("Decoding desc32\n")); |
43 | 854 DEBUG_HEXDUMPC(buf, sizeof(pst_desc32), 0x10); |
855 memcpy(&d32, buf, sizeof(pst_desc32)); | |
856 LE32_CPU(d32.d_id); | |
857 LE32_CPU(d32.desc_id); | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
858 LE32_CPU(d32.tree_id); |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
859 LE32_CPU(d32.parent_d_id); |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
860 desc->d_id = d32.d_id; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
861 desc->desc_id = d32.desc_id; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
862 desc->tree_id = d32.tree_id; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
863 desc->parent_d_id = d32.parent_d_id; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
864 desc->u1 = 0; |
43 | 865 r = sizeof(pst_desc32); |
866 } | |
867 return r; | |
868 } | |
869 | |
870 | |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
871 static size_t pst_decode_table(pst_file *pf, struct pst_table_ptr_struct *table, char *buf); |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
872 static size_t pst_decode_table(pst_file *pf, struct pst_table_ptr_struct *table, char *buf) { |
46 | 873 size_t r; |
874 if (pf->do_read64) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
875 DEBUG_INFO(("Decoding table64\n")); |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
876 DEBUG_HEXDUMPC(buf, sizeof(struct pst_table_ptr_struct), 0x10); |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
877 memcpy(table, buf, sizeof(struct pst_table_ptr_struct)); |
43 | 878 LE64_CPU(table->start); |
879 LE64_CPU(table->u1); | |
880 LE64_CPU(table->offset); | |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
881 r =sizeof(struct pst_table_ptr_struct); |
43 | 882 } |
883 else { | |
46 | 884 struct pst_table_ptr_struct32 t32; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
885 DEBUG_INFO(("Decoding table32\n")); |
46 | 886 DEBUG_HEXDUMPC(buf, sizeof( struct pst_table_ptr_struct32), 0x10); |
887 memcpy(&t32, buf, sizeof(struct pst_table_ptr_struct32)); | |
43 | 888 LE32_CPU(t32.start); |
889 LE32_CPU(t32.u1); | |
890 LE32_CPU(t32.offset); | |
891 table->start = t32.start; | |
892 table->u1 = t32.u1; | |
893 table->offset = t32.offset; | |
46 | 894 r = sizeof(struct pst_table_ptr_struct32); |
43 | 895 } |
896 return r; | |
897 } | |
898 | |
899 | |
46 | 900 static size_t pst_decode_index(pst_file *pf, pst_index *index, char *buf); |
901 static size_t pst_decode_index(pst_file *pf, pst_index *index, char *buf) { | |
902 size_t r; | |
903 if (pf->do_read64) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
904 DEBUG_INFO(("Decoding index64\n")); |
43 | 905 DEBUG_HEXDUMPC(buf, sizeof(pst_index), 0x10); |
906 memcpy(index, buf, sizeof(pst_index)); | |
907 LE64_CPU(index->id); | |
908 LE64_CPU(index->offset); | |
909 LE16_CPU(index->size); | |
910 LE16_CPU(index->u0); | |
149
f9773b6368e0
improve documentation of .pst format.
Carl Byington <carl@five-ten-sg.com>
parents:
148
diff
changeset
|
911 LE32_CPU(index->u1); |
43 | 912 r = sizeof(pst_index); |
913 } else { | |
914 pst_index32 index32; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
915 DEBUG_INFO(("Decoding index32\n")); |
43 | 916 DEBUG_HEXDUMPC(buf, sizeof(pst_index32), 0x10); |
917 memcpy(&index32, buf, sizeof(pst_index32)); | |
46 | 918 LE32_CPU(index32.id); |
919 LE32_CPU(index32.offset); | |
920 LE16_CPU(index32.size); | |
921 LE16_CPU(index32.u1); | |
43 | 922 index->id = index32.id; |
923 index->offset = index32.offset; | |
924 index->size = index32.size; | |
149
f9773b6368e0
improve documentation of .pst format.
Carl Byington <carl@five-ten-sg.com>
parents:
148
diff
changeset
|
925 index->u0 = 0; |
43 | 926 index->u1 = index32.u1; |
927 r = sizeof(pst_index32); | |
928 } | |
929 return r; | |
930 } | |
931 | |
932 | |
46 | 933 static size_t pst_decode_assoc(pst_file *pf, pst_id2_assoc *assoc, char *buf); |
934 static size_t pst_decode_assoc(pst_file *pf, pst_id2_assoc *assoc, char *buf) { | |
935 size_t r; | |
936 if (pf->do_read64) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
937 DEBUG_INFO(("Decoding assoc64\n")); |
46 | 938 DEBUG_HEXDUMPC(buf, sizeof(pst_id2_assoc), 0x10); |
939 memcpy(assoc, buf, sizeof(pst_id2_assoc)); | |
48 | 940 LE32_CPU(assoc->id2); |
46 | 941 LE64_CPU(assoc->id); |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
942 LE64_CPU(assoc->child_id); |
46 | 943 r = sizeof(pst_id2_assoc); |
944 } else { | |
945 pst_id2_assoc32 assoc32; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
946 DEBUG_INFO(("Decoding assoc32\n")); |
46 | 947 DEBUG_HEXDUMPC(buf, sizeof(pst_id2_assoc32), 0x10); |
948 memcpy(&assoc32, buf, sizeof(pst_id2_assoc32)); | |
949 LE32_CPU(assoc32.id2); | |
950 LE32_CPU(assoc32.id); | |
160
252ad66d3d6e
fix ppc64 compile error
Carl Byington <carl@five-ten-sg.com>
parents:
154
diff
changeset
|
951 LE32_CPU(assoc32.child_id); |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
952 assoc->id2 = assoc32.id2; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
953 assoc->id = assoc32.id; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
954 assoc->child_id = assoc32.child_id; |
46 | 955 r = sizeof(pst_id2_assoc32); |
956 } | |
957 return r; | |
958 } | |
959 | |
960 | |
48 | 961 static size_t pst_decode_type3(pst_file *pf, pst_table3_rec *table3_rec, char *buf); |
962 static size_t pst_decode_type3(pst_file *pf, pst_table3_rec *table3_rec, char *buf) { | |
963 size_t r; | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
964 DEBUG_ENT("pst_decode_type3"); |
48 | 965 if (pf->do_read64) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
966 DEBUG_INFO(("Decoding table3 64\n")); |
48 | 967 DEBUG_HEXDUMPC(buf, sizeof(pst_table3_rec), 0x10); |
968 memcpy(table3_rec, buf, sizeof(pst_table3_rec)); | |
969 LE64_CPU(table3_rec->id); | |
970 r = sizeof(pst_table3_rec); | |
971 } else { | |
972 pst_table3_rec32 table3_rec32; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
973 DEBUG_INFO(("Decoding table3 32\n")); |
48 | 974 DEBUG_HEXDUMPC(buf, sizeof(pst_table3_rec32), 0x10); |
975 memcpy(&table3_rec32, buf, sizeof(pst_table3_rec32)); | |
976 LE32_CPU(table3_rec32.id); | |
977 table3_rec->id = table3_rec32.id; | |
978 r = sizeof(pst_table3_rec32); | |
979 } | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
980 DEBUG_RET(); |
48 | 981 return r; |
982 } | |
983 | |
984 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
985 /** Process the index1 b-tree from the pst file and create the |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
986 * pf->i_head linked list from it. This tree holds the location |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
987 * (offset and size) of lower level objects (0xbcec descriptor |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
988 * blocks, etc) in the pst file. |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
989 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
990 static int pst_build_id_ptr(pst_file *pf, int64_t offset, int32_t depth, uint64_t linku1, uint64_t start_val, uint64_t end_val) { |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
991 struct pst_table_ptr_struct table, table2; |
43 | 992 pst_index_ll *i_ptr=NULL; |
993 pst_index index; | |
994 int32_t x, item_count; | |
995 uint64_t old = start_val; | |
996 char *buf = NULL, *bptr; | |
997 | |
46 | 998 DEBUG_ENT("pst_build_id_ptr"); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
999 DEBUG_INFO(("offset %#"PRIx64" depth %i linku1 %#"PRIx64" start %#"PRIx64" end %#"PRIx64"\n", offset, depth, linku1, start_val, end_val)); |
43 | 1000 if (end_val <= start_val) { |
87
3ec5ad97e926
Use inttypes.h for portable printing of 64 bit items.
Carl Byington <carl@five-ten-sg.com>
parents:
85
diff
changeset
|
1001 DEBUG_WARN(("The end value is BEFORE the start value. This function will quit. Soz. [start:%#"PRIx64", end:%#"PRIx64"]\n", start_val, end_val)); |
43 | 1002 DEBUG_RET(); |
1003 return -1; | |
1004 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1005 DEBUG_INFO(("Reading index block\n")); |
51 | 1006 if (pst_read_block_size(pf, offset, BLOCK_SIZE, &buf) < BLOCK_SIZE) { |
43 | 1007 DEBUG_WARN(("Failed to read %i bytes\n", BLOCK_SIZE)); |
1008 if (buf) free(buf); | |
1009 DEBUG_RET(); | |
1010 return -1; | |
1011 } | |
1012 bptr = buf; | |
44 | 1013 DEBUG_HEXDUMPC(buf, BLOCK_SIZE, ITEM_SIZE32); |
46 | 1014 item_count = (int32_t)(unsigned)(buf[ITEM_COUNT_OFFSET]); |
43 | 1015 if (item_count > INDEX_COUNT_MAX) { |
1016 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, INDEX_COUNT_MAX)); | |
1017 if (buf) free(buf); | |
1018 DEBUG_RET(); | |
1019 return -1; | |
1020 } | |
46 | 1021 index.id = pst_getIntAt(pf, buf+BACKLINK_OFFSET); |
43 | 1022 if (index.id != linku1) { |
87
3ec5ad97e926
Use inttypes.h for portable printing of 64 bit items.
Carl Byington <carl@five-ten-sg.com>
parents:
85
diff
changeset
|
1023 DEBUG_WARN(("Backlink %#"PRIx64" in this node does not match required %#"PRIx64"\n", index.id, linku1)); |
43 | 1024 if (buf) free(buf); |
1025 DEBUG_RET(); | |
1026 return -1; | |
1027 } | |
1028 | |
1029 if (buf[LEVEL_INDICATOR_OFFSET] == '\0') { | |
1030 // this node contains leaf pointers | |
1031 x = 0; | |
1032 while (x < item_count) { | |
46 | 1033 bptr += pst_decode_index(pf, &index, bptr); |
43 | 1034 x++; |
1035 if (index.id == 0) break; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1036 DEBUG_INFO(("[%i]%i Item [id = %#"PRIx64", offset = %#"PRIx64", u1 = %#x, size = %i(%#x)]\n", |
43 | 1037 depth, x, index.id, index.offset, index.u1, index.size, index.size)); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1038 // if (index.id & 0x02) DEBUG_INFO(("two-bit set!!\n")); |
43 | 1039 if ((index.id >= end_val) || (index.id < old)) { |
1040 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); | |
1041 if (buf) free(buf); | |
1042 DEBUG_RET(); | |
1043 return -1; | |
1044 } | |
1045 old = index.id; | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1046 i_ptr = (pst_index_ll*) pst_malloc(sizeof(pst_index_ll)); |
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:
163
diff
changeset
|
1047 i_ptr->i_id = index.id; |
43 | 1048 i_ptr->offset = index.offset; |
1049 i_ptr->u1 = index.u1; | |
1050 i_ptr->size = index.size; | |
1051 i_ptr->next = NULL; | |
1052 if (pf->i_tail) pf->i_tail->next = i_ptr; | |
1053 if (!pf->i_head) pf->i_head = i_ptr; | |
1054 pf->i_tail = i_ptr; | |
1055 } | |
1056 } else { | |
1057 // this node contains node pointers | |
1058 x = 0; | |
1059 while (x < item_count) { | |
46 | 1060 bptr += pst_decode_table(pf, &table, bptr); |
43 | 1061 x++; |
1062 if (table.start == 0) break; | |
1063 if (x < item_count) { | |
46 | 1064 (void)pst_decode_table(pf, &table2, bptr); |
43 | 1065 } |
1066 else { | |
1067 table2.start = end_val; | |
1068 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1069 DEBUG_INFO(("[%i] %i Index Table [start id = %#"PRIx64", u1 = %#"PRIx64", offset = %#"PRIx64", end id = %#"PRIx64"]\n", |
43 | 1070 depth, x, table.start, table.u1, table.offset, table2.start)); |
1071 if ((table.start >= end_val) || (table.start < old)) { | |
1072 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); | |
1073 if (buf) free(buf); | |
1074 DEBUG_RET(); | |
1075 return -1; | |
1076 } | |
1077 old = table.start; | |
46 | 1078 (void)pst_build_id_ptr(pf, table.offset, depth+1, table.u1, table.start, table2.start); |
43 | 1079 } |
1080 } | |
1081 if (buf) free (buf); | |
1082 DEBUG_RET(); | |
1083 return 0; | |
16 | 1084 } |
1085 | |
1086 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1087 /** Process the index2 b-tree from the pst file and create the |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1088 * pf->d_head tree from it. This tree holds descriptions of the |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1089 * higher level objects (email, contact, etc) in the pst file. |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1090 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
1091 static int pst_build_desc_ptr (pst_file *pf, int64_t offset, int32_t depth, uint64_t linku1, uint64_t start_val, uint64_t end_val) { |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
1092 struct pst_table_ptr_struct table, table2; |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1093 pst_desc desc_rec; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1094 int32_t item_count; |
48 | 1095 uint64_t old = start_val; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1096 int x; |
43 | 1097 char *buf = NULL, *bptr; |
1098 | |
46 | 1099 DEBUG_ENT("pst_build_desc_ptr"); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1100 DEBUG_INFO(("offset %#"PRIx64" depth %i linku1 %#"PRIx64" start %#"PRIx64" end %#"PRIx64"\n", offset, depth, linku1, start_val, end_val)); |
43 | 1101 if (end_val <= start_val) { |
87
3ec5ad97e926
Use inttypes.h for portable printing of 64 bit items.
Carl Byington <carl@five-ten-sg.com>
parents:
85
diff
changeset
|
1102 DEBUG_WARN(("The end value is BEFORE the start value. This function will quit. Soz. [start:%#"PRIx64", end:%#"PRIx64"]\n", start_val, end_val)); |
43 | 1103 DEBUG_RET(); |
1104 return -1; | |
1105 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1106 DEBUG_INFO(("Reading desc block\n")); |
51 | 1107 if (pst_read_block_size(pf, offset, DESC_BLOCK_SIZE, &buf) < DESC_BLOCK_SIZE) { |
43 | 1108 DEBUG_WARN(("Failed to read %i bytes\n", DESC_BLOCK_SIZE)); |
1109 if (buf) free(buf); | |
1110 DEBUG_RET(); | |
1111 return -1; | |
1112 } | |
1113 bptr = buf; | |
46 | 1114 item_count = (int32_t)(unsigned)(buf[ITEM_COUNT_OFFSET]); |
1115 | |
1116 desc_rec.d_id = pst_getIntAt(pf, buf+BACKLINK_OFFSET); | |
43 | 1117 if (desc_rec.d_id != linku1) { |
87
3ec5ad97e926
Use inttypes.h for portable printing of 64 bit items.
Carl Byington <carl@five-ten-sg.com>
parents:
85
diff
changeset
|
1118 DEBUG_WARN(("Backlink %#"PRIx64" in this node does not match required %#"PRIx64"\n", desc_rec.d_id, linku1)); |
43 | 1119 if (buf) free(buf); |
1120 DEBUG_RET(); | |
1121 return -1; | |
1122 } | |
1123 if (buf[LEVEL_INDICATOR_OFFSET] == '\0') { | |
1124 // this node contains leaf pointers | |
44 | 1125 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, DESC_SIZE32); |
43 | 1126 if (item_count > DESC_COUNT_MAX) { |
1127 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, DESC_COUNT_MAX)); | |
1128 if (buf) free(buf); | |
1129 DEBUG_RET(); | |
1130 return -1; | |
1131 } | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1132 for (x=0; x<item_count; x++) { |
46 | 1133 bptr += pst_decode_desc(pf, &desc_rec, bptr); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1134 DEBUG_INFO(("[%i] Item(%#x) = [d_id = %#"PRIx64", desc_id = %#"PRIx64", tree_id = %#"PRIx64", parent_d_id = %#x]\n", |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1135 depth, x, desc_rec.d_id, desc_rec.desc_id, desc_rec.tree_id, desc_rec.parent_d_id)); |
43 | 1136 if ((desc_rec.d_id >= end_val) || (desc_rec.d_id < old)) { |
1137 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); | |
1138 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, 16); | |
1139 if (buf) free(buf); | |
1140 DEBUG_RET(); | |
1141 return -1; | |
1142 } | |
1143 old = desc_rec.d_id; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1144 DEBUG_INFO(("New Record %#"PRIx64" with parent %#x\n", desc_rec.d_id, desc_rec.parent_d_id)); |
105
4703d622e95b
cleanup fedora9 compile warnings
Carl Byington <carl@five-ten-sg.com>
parents:
104
diff
changeset
|
1145 { |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1146 pst_desc_tree *d_ptr = (pst_desc_tree*) pst_malloc(sizeof(pst_desc_tree)); |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1147 d_ptr->d_id = desc_rec.d_id; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1148 d_ptr->parent_d_id = desc_rec.parent_d_id; |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1149 d_ptr->assoc_tree = pst_getID(pf, desc_rec.tree_id); |
105
4703d622e95b
cleanup fedora9 compile warnings
Carl Byington <carl@five-ten-sg.com>
parents:
104
diff
changeset
|
1150 d_ptr->desc = pst_getID(pf, desc_rec.desc_id); |
4703d622e95b
cleanup fedora9 compile warnings
Carl Byington <carl@five-ten-sg.com>
parents:
104
diff
changeset
|
1151 record_descriptor(pf, d_ptr); // add to the global tree |
4703d622e95b
cleanup fedora9 compile warnings
Carl Byington <carl@five-ten-sg.com>
parents:
104
diff
changeset
|
1152 } |
43 | 1153 } |
1154 } else { | |
1155 // this node contains node pointers | |
44 | 1156 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, ITEM_SIZE32); |
43 | 1157 if (item_count > INDEX_COUNT_MAX) { |
1158 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, INDEX_COUNT_MAX)); | |
1159 if (buf) free(buf); | |
1160 DEBUG_RET(); | |
1161 return -1; | |
1162 } | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1163 for (x=0; x<item_count; x++) { |
46 | 1164 bptr += pst_decode_table(pf, &table, bptr); |
43 | 1165 if (table.start == 0) break; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1166 if (x < (item_count-1)) { |
46 | 1167 (void)pst_decode_table(pf, &table2, bptr); |
43 | 1168 } |
1169 else { | |
1170 table2.start = end_val; | |
1171 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1172 DEBUG_INFO(("[%i] %i Descriptor Table [start id = %#"PRIx64", u1 = %#"PRIx64", offset = %#"PRIx64", end id = %#"PRIx64"]\n", |
43 | 1173 depth, x, table.start, table.u1, table.offset, table2.start)); |
1174 if ((table.start >= end_val) || (table.start < old)) { | |
1175 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); | |
1176 if (buf) free(buf); | |
1177 DEBUG_RET(); | |
1178 return -1; | |
1179 } | |
1180 old = table.start; | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1181 (void)pst_build_desc_ptr(pf, table.offset, depth+1, table.u1, table.start, table2.start); |
43 | 1182 } |
1183 } | |
1184 if (buf) free(buf); | |
1185 DEBUG_RET(); | |
1186 return 0; | |
16 | 1187 } |
1188 | |
1189 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1190 /** Process a high level object from the pst file. |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1191 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1192 pst_item* pst_parse_item(pst_file *pf, pst_desc_tree *d_ptr, pst_id2_tree *m_head) { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1193 pst_mapi_object * list; |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1194 pst_id2_tree *id2_head = m_head; |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1195 pst_id2_tree *id2_ptr = NULL; |
43 | 1196 pst_item *item = NULL; |
1197 pst_item_attach *attach = NULL; | |
46 | 1198 int32_t x; |
1199 DEBUG_ENT("pst_parse_item"); | |
43 | 1200 if (!d_ptr) { |
1201 DEBUG_WARN(("you cannot pass me a NULL! I don't want it!\n")); | |
1202 DEBUG_RET(); | |
1203 return NULL; | |
1204 } | |
1205 | |
1206 if (!d_ptr->desc) { | |
1207 DEBUG_WARN(("why is d_ptr->desc == NULL? I don't want to do anything else with this record\n")); | |
1208 DEBUG_RET(); | |
1209 return NULL; | |
1210 } | |
1211 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1212 if (d_ptr->assoc_tree) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1213 if (m_head) { |
203 | 1214 DEBUG_WARN(("supplied master head, but have a list that is building a new id2_head\n")); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1215 m_head = NULL; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1216 } |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1217 id2_head = pst_build_id2(pf, d_ptr->assoc_tree); |
43 | 1218 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1219 pst_printID2ptr(id2_head); |
43 | 1220 |
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:
163
diff
changeset
|
1221 list = pst_parse_block(pf, d_ptr->desc->i_id, id2_head); |
43 | 1222 if (!list) { |
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:
163
diff
changeset
|
1223 DEBUG_WARN(("pst_parse_block() returned an error for d_ptr->desc->i_id [%#"PRIx64"]\n", d_ptr->desc->i_id)); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1224 if (!m_head) pst_free_id2(id2_head); |
43 | 1225 DEBUG_RET(); |
1226 return NULL; | |
1227 } | |
1228 | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1229 item = (pst_item*) pst_malloc(sizeof(pst_item)); |
43 | 1230 memset(item, 0, sizeof(pst_item)); |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
1231 item->pf = pf; |
43 | 1232 |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1233 if (pst_process(d_ptr->desc->i_id, list, item, NULL)) { |
46 | 1234 DEBUG_WARN(("pst_process() returned non-zero value. That is an error\n")); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1235 pst_freeItem(item); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1236 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1237 if (!m_head) pst_free_id2(id2_head); |
43 | 1238 DEBUG_RET(); |
1239 return NULL; | |
1240 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1241 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1242 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1243 if ((id2_ptr = pst_getID2(id2_head, (uint64_t)0x692))) { |
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
|
1244 // DSN/MDN reports? |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1245 DEBUG_INFO(("DSN/MDN processing\n")); |
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:
163
diff
changeset
|
1246 list = pst_parse_block(pf, id2_ptr->id->i_id, id2_head); |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1247 if (list) { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1248 for (x=0; x < list->count_objects; x++) { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1249 attach = (pst_item_attach*) pst_malloc(sizeof(pst_item_attach)); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1250 memset(attach, 0, sizeof(pst_item_attach)); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1251 attach->next = item->attach; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1252 item->attach = attach; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1253 } |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1254 if (pst_process(id2_ptr->id->i_id, list, item, item->attach)) { |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1255 DEBUG_WARN(("ERROR pst_process() failed with DSN/MDN attachments\n")); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1256 pst_freeItem(item); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1257 pst_free_list(list); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1258 if (!m_head) pst_free_id2(id2_head); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1259 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1260 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1261 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1262 pst_free_list(list); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1263 } else { |
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
|
1264 DEBUG_WARN(("ERROR error processing main DSN/MDN record\n")); |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1265 // if (!m_head) pst_free_id2(id2_head); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1266 // DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1267 // return item; |
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
|
1268 } |
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
|
1269 } |
46 | 1270 |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1271 if ((id2_ptr = pst_getID2(id2_head, (uint64_t)0x671))) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1272 DEBUG_INFO(("ATTACHMENT processing attachment\n")); |
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:
163
diff
changeset
|
1273 list = pst_parse_block(pf, id2_ptr->id->i_id, id2_head); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1274 if (!list) { |
345
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1275 if (item->flags & PST_FLAG_HAS_ATTACHMENT) { |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1276 // Only report an error if we expected to see an attachment table and didn't. |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1277 DEBUG_WARN(("ERROR error processing main attachment record\n")); |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1278 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1279 if (!m_head) pst_free_id2(id2_head); |
43 | 1280 DEBUG_RET(); |
60
97b7706bdda2
Work around bogus 7c.b5 blocks in some messages that have been read.
Carl Byington <carl@five-ten-sg.com>
parents:
59
diff
changeset
|
1281 return item; |
43 | 1282 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1283 for (x=0; x < list->count_objects; x++) { |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1284 attach = (pst_item_attach*) pst_malloc(sizeof(pst_item_attach)); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1285 memset(attach, 0, sizeof(pst_item_attach)); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1286 attach->next = item->attach; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1287 item->attach = attach; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1288 } |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1289 if (pst_process(id2_ptr->id->i_id, list, item, item->attach)) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1290 DEBUG_WARN(("ERROR pst_process() failed with attachments\n")); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1291 pst_freeItem(item); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1292 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1293 if (!m_head) pst_free_id2(id2_head); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1294 DEBUG_RET(); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1295 return NULL; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1296 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1297 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1298 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1299 // now we will have initial information of each attachment stored in item->attach... |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
1300 // we must now read the secondary record for each based on the id2_val associated with |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1301 // each attachment |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
1302 for (attach = item->attach; attach; attach = attach->next) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1303 DEBUG_WARN(("initial attachment id2 %#"PRIx64"\n", attach->id2_val)); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1304 if ((id2_ptr = pst_getID2(id2_head, attach->id2_val))) { |
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:
163
diff
changeset
|
1305 DEBUG_WARN(("initial attachment id2 found id %#"PRIx64"\n", id2_ptr->id->i_id)); |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
1306 // id2_ptr is a record describing the attachment |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1307 // we pass NULL instead of id2_head cause we don't want it to |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1308 // load all the extra stuff here. |
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:
163
diff
changeset
|
1309 list = pst_parse_block(pf, id2_ptr->id->i_id, NULL); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1310 if (!list) { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1311 DEBUG_WARN(("ERROR error processing an attachment record\n")); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1312 continue; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1313 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1314 if (list->count_objects > 1) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1315 DEBUG_WARN(("ERROR probably fatal, list count array will overrun attach structure.\n")); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1316 } |
269
5ca87faa020b
attachment might have a secondary list of mapi elements included a size element which overwrote the real size from the primary list of mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
268
diff
changeset
|
1317 // reprocess the same attachment list against new data |
5ca87faa020b
attachment might have a secondary list of mapi elements included a size element which overwrote the real size from the primary list of mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
268
diff
changeset
|
1318 // this might update attach->id2_val |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1319 if (pst_process(id2_ptr->id->i_id, list, item, attach)) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1320 DEBUG_WARN(("ERROR pst_process() failed with an attachment\n")); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1321 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1322 continue; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1323 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1324 pst_free_list(list); |
345
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1325 // As per 2.4.6.2 in the spec, the attachment data is stored as a child of the |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1326 // attachment object, so we pass in id2_ptr as the head to search from. |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1327 id2_ptr = pst_getID2(id2_ptr, attach->id2_val); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1328 if (id2_ptr) { |
260
156cf548c764
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
257
diff
changeset
|
1329 DEBUG_WARN(("second pass attachment updating id2 %#"PRIx64" found i_id %#"PRIx64"\n", attach->id2_val, id2_ptr->id->i_id)); |
156cf548c764
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
257
diff
changeset
|
1330 // i_id has been updated to the datablock containing the attachment 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:
163
diff
changeset
|
1331 attach->i_id = id2_ptr->id->i_id; |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1332 attach->id2_head = deep_copy(id2_ptr->child); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1333 } else { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1334 DEBUG_WARN(("have not located the correct value for the attachment [%#"PRIx64"]\n", attach->id2_val)); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1335 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1336 } else { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1337 DEBUG_WARN(("ERROR cannot locate id2 value %#"PRIx64"\n", attach->id2_val)); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1338 attach->id2_val = 0; // suppress this missing attachment |
43 | 1339 } |
1340 } | |
1341 } | |
1342 | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1343 if (!m_head) pst_free_id2(id2_head); |
43 | 1344 DEBUG_RET(); |
1345 return item; | |
16 | 1346 } |
1347 | |
1348 | |
49 | 1349 static void freeall(pst_subblocks *subs, pst_block_offset_pointer *p1, |
1350 pst_block_offset_pointer *p2, | |
1351 pst_block_offset_pointer *p3, | |
1352 pst_block_offset_pointer *p4, | |
1353 pst_block_offset_pointer *p5, | |
1354 pst_block_offset_pointer *p6, | |
1355 pst_block_offset_pointer *p7); | |
1356 static void freeall(pst_subblocks *subs, pst_block_offset_pointer *p1, | |
1357 pst_block_offset_pointer *p2, | |
1358 pst_block_offset_pointer *p3, | |
1359 pst_block_offset_pointer *p4, | |
1360 pst_block_offset_pointer *p5, | |
1361 pst_block_offset_pointer *p6, | |
1362 pst_block_offset_pointer *p7) { | |
1363 size_t i; | |
1364 for (i=0; i<subs->subblock_count; i++) { | |
1365 if (subs->subs[i].buf) free(subs->subs[i].buf); | |
1366 } | |
1367 free(subs->subs); | |
43 | 1368 if (p1->needfree) free(p1->from); |
1369 if (p2->needfree) free(p2->from); | |
1370 if (p3->needfree) free(p3->from); | |
1371 if (p4->needfree) free(p4->from); | |
1372 if (p5->needfree) free(p5->from); | |
1373 if (p6->needfree) free(p6->from); | |
1374 if (p7->needfree) free(p7->from); | |
35 | 1375 } |
1376 | |
1377 | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1378 /** Process a low level descriptor block (0x0101, 0xbcec, 0x7cec) into a |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1379 * list of MAPI objects, each of which contains a list of MAPI elements. |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1380 * |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1381 * @return list of MAPI objects |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
1382 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1383 static pst_mapi_object* pst_parse_block(pst_file *pf, uint64_t block_id, pst_id2_tree *i2_head) { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1384 pst_mapi_object *mo_head = NULL; |
52 | 1385 char *buf = NULL; |
1386 size_t read_size = 0; | |
49 | 1387 pst_subblocks subblocks; |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1388 pst_mapi_object *mo_ptr = NULL; |
43 | 1389 pst_block_offset_pointer block_offset1; |
1390 pst_block_offset_pointer block_offset2; | |
1391 pst_block_offset_pointer block_offset3; | |
1392 pst_block_offset_pointer block_offset4; | |
1393 pst_block_offset_pointer block_offset5; | |
1394 pst_block_offset_pointer block_offset6; | |
1395 pst_block_offset_pointer block_offset7; | |
46 | 1396 int32_t x; |
203 | 1397 int32_t num_mapi_objects; |
1398 int32_t count_mapi_objects; | |
1399 int32_t num_mapi_elements; | |
1400 int32_t count_mapi_elements; | |
47 | 1401 int block_type; |
43 | 1402 uint32_t rec_size = 0; |
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:
69
diff
changeset
|
1403 char* list_start; |
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:
69
diff
changeset
|
1404 char* fr_ptr; |
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:
69
diff
changeset
|
1405 char* to_ptr; |
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:
69
diff
changeset
|
1406 char* ind2_end = NULL; |
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:
69
diff
changeset
|
1407 char* ind2_ptr = NULL; |
359 | 1408 char* ind2_block_start = NULL; |
1409 size_t ind2_max_block_size = pf->do_read64 ? 0x1FF0 : 0x1FF4; | |
43 | 1410 pst_x_attrib_ll *mapptr; |
50 | 1411 pst_block_hdr block_hdr; |
1412 pst_table3_rec table3_rec; //for type 3 (0x0101) blocks | |
48 | 1413 |
43 | 1414 struct { |
1415 unsigned char seven_c; | |
1416 unsigned char item_count; | |
1417 uint16_t u1; | |
1418 uint16_t u2; | |
1419 uint16_t u3; | |
1420 uint16_t rec_size; | |
1421 uint32_t b_five_offset; | |
1422 uint32_t ind2_offset; | |
1423 uint16_t u7; | |
1424 uint16_t u8; | |
1425 } seven_c_blk; | |
48 | 1426 |
43 | 1427 struct _type_d_rec { |
1428 uint32_t id; | |
1429 uint32_t u1; | |
1430 } * type_d_rec; | |
1431 | |
48 | 1432 struct { |
1433 uint16_t type; | |
1434 uint16_t ref_type; | |
1435 uint32_t value; | |
1436 } table_rec; //for type 1 (0xBCEC) blocks | |
1437 | |
1438 struct { | |
1439 uint16_t ref_type; | |
1440 uint16_t type; | |
1441 uint16_t ind2_off; | |
1442 uint8_t size; | |
1443 uint8_t slot; | |
1444 } table2_rec; //for type 2 (0x7CEC) blocks | |
1445 | |
46 | 1446 DEBUG_ENT("pst_parse_block"); |
1447 if ((read_size = pst_ff_getIDblock_dec(pf, block_id, &buf)) == 0) { | |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1448 DEBUG_WARN(("Error reading block id %#"PRIx64"\n", block_id)); |
43 | 1449 if (buf) free (buf); |
1450 DEBUG_RET(); | |
1451 return NULL; | |
1452 } | |
1453 | |
1454 block_offset1.needfree = 0; | |
1455 block_offset2.needfree = 0; | |
1456 block_offset3.needfree = 0; | |
1457 block_offset4.needfree = 0; | |
1458 block_offset5.needfree = 0; | |
1459 block_offset6.needfree = 0; | |
1460 block_offset7.needfree = 0; | |
1461 | |
1462 memcpy(&block_hdr, buf, sizeof(block_hdr)); | |
1463 LE16_CPU(block_hdr.index_offset); | |
1464 LE16_CPU(block_hdr.type); | |
1465 LE32_CPU(block_hdr.offset); | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1466 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#hx)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
43 | 1467 |
49 | 1468 if (block_hdr.index_offset == (uint16_t)0x0101) { //type 3 |
50 | 1469 size_t i; |
1470 char *b_ptr = buf + 8; | |
49 | 1471 subblocks.subblock_count = block_hdr.type; |
1472 subblocks.subs = malloc(sizeof(pst_subblock) * subblocks.subblock_count); | |
1473 for (i=0; i<subblocks.subblock_count; i++) { | |
1474 b_ptr += pst_decode_type3(pf, &table3_rec, b_ptr); | |
1475 subblocks.subs[i].buf = NULL; | |
1476 subblocks.subs[i].read_size = pst_ff_getIDblock_dec(pf, table3_rec.id, &subblocks.subs[i].buf); | |
1477 if (subblocks.subs[i].buf) { | |
1478 memcpy(&block_hdr, subblocks.subs[i].buf, sizeof(block_hdr)); | |
1479 LE16_CPU(block_hdr.index_offset); | |
1480 subblocks.subs[i].i_offset = block_hdr.index_offset; | |
1481 } | |
1482 else { | |
1483 subblocks.subs[i].read_size = 0; | |
1484 subblocks.subs[i].i_offset = 0; | |
1485 } | |
1486 } | |
1487 free(buf); | |
1488 memcpy(&block_hdr, subblocks.subs[0].buf, sizeof(block_hdr)); | |
1489 LE16_CPU(block_hdr.index_offset); | |
1490 LE16_CPU(block_hdr.type); | |
1491 LE32_CPU(block_hdr.offset); | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1492 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#hx)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
49 | 1493 } |
1494 else { | |
1495 // setup the subblock descriptors, but we only have one block | |
50 | 1496 subblocks.subblock_count = (size_t)1; |
49 | 1497 subblocks.subs = malloc(sizeof(pst_subblock)); |
1498 subblocks.subs[0].buf = buf; | |
1499 subblocks.subs[0].read_size = read_size; | |
1500 subblocks.subs[0].i_offset = block_hdr.index_offset; | |
1501 } | |
43 | 1502 |
46 | 1503 if (block_hdr.type == (uint16_t)0xBCEC) { //type 1 |
43 | 1504 block_type = 1; |
1505 | |
49 | 1506 if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, block_hdr.offset, &block_offset1)) { |
148
b47d04257b43
64 bit cleanup in debug messages
Carl Byington <carl@five-ten-sg.com>
parents:
143
diff
changeset
|
1507 DEBUG_WARN(("internal error (bc.b5 offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id)); |
49 | 1508 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1509 DEBUG_RET(); |
1510 return NULL; | |
1511 } | |
1512 memcpy(&table_rec, block_offset1.from, sizeof(table_rec)); | |
1513 LE16_CPU(table_rec.type); | |
1514 LE16_CPU(table_rec.ref_type); | |
1515 LE32_CPU(table_rec.value); | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1516 DEBUG_INFO(("table_rec (type=%#hx, ref_type=%#hx, value=%#x)\n", table_rec.type, table_rec.ref_type, table_rec.value)); |
43 | 1517 |
75
987aa872294e
Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents:
73
diff
changeset
|
1518 if ((table_rec.type != (uint16_t)0x02B5) || (table_rec.ref_type != 6)) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1519 DEBUG_WARN(("Unknown second block constant - %#hx %#hx for id %#"PRIx64"\n", table_rec.type, table_rec.ref_type, block_id)); |
49 | 1520 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1521 DEBUG_RET(); |
1522 return NULL; | |
1523 } | |
1524 | |
49 | 1525 if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, table_rec.value, &block_offset2)) { |
148
b47d04257b43
64 bit cleanup in debug messages
Carl Byington <carl@five-ten-sg.com>
parents:
143
diff
changeset
|
1526 DEBUG_WARN(("internal error (bc.b5.desc offset #x) in reading block id %#"PRIx64"\n", table_rec.value, block_id)); |
49 | 1527 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1528 DEBUG_RET(); |
1529 return NULL; | |
1530 } | |
1531 list_start = block_offset2.from; | |
1532 to_ptr = block_offset2.to; | |
203 | 1533 num_mapi_elements = (to_ptr - list_start)/sizeof(table_rec); |
1534 num_mapi_objects = 1; // only going to be one object in these blocks | |
43 | 1535 } |
46 | 1536 else if (block_hdr.type == (uint16_t)0x7CEC) { //type 2 |
43 | 1537 block_type = 2; |
1538 | |
49 | 1539 if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, block_hdr.offset, &block_offset3)) { |
148
b47d04257b43
64 bit cleanup in debug messages
Carl Byington <carl@five-ten-sg.com>
parents:
143
diff
changeset
|
1540 DEBUG_WARN(("internal error (7c.7c offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id)); |
49 | 1541 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1542 DEBUG_RET(); |
1543 return NULL; | |
1544 } | |
1545 fr_ptr = block_offset3.from; //now got pointer to "7C block" | |
1546 memset(&seven_c_blk, 0, sizeof(seven_c_blk)); | |
1547 memcpy(&seven_c_blk, fr_ptr, sizeof(seven_c_blk)); | |
1548 LE16_CPU(seven_c_blk.u1); | |
1549 LE16_CPU(seven_c_blk.u2); | |
1550 LE16_CPU(seven_c_blk.u3); | |
1551 LE16_CPU(seven_c_blk.rec_size); | |
1552 LE32_CPU(seven_c_blk.b_five_offset); | |
1553 LE32_CPU(seven_c_blk.ind2_offset); | |
1554 LE16_CPU(seven_c_blk.u7); | |
1555 LE16_CPU(seven_c_blk.u8); | |
1556 | |
1557 list_start = fr_ptr + sizeof(seven_c_blk); // the list of item numbers start after this record | |
1558 | |
1559 if (seven_c_blk.seven_c != 0x7C) { // this would mean it isn't a 7C block! | |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1560 DEBUG_WARN(("Error. There isn't a 7C where I want to see 7C!\n")); |
49 | 1561 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1562 DEBUG_RET(); |
1563 return NULL; | |
1564 } | |
1565 | |
1566 rec_size = seven_c_blk.rec_size; | |
203 | 1567 num_mapi_elements = (int32_t)(unsigned)seven_c_blk.item_count; |
43 | 1568 |
49 | 1569 if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, seven_c_blk.b_five_offset, &block_offset4)) { |
148
b47d04257b43
64 bit cleanup in debug messages
Carl Byington <carl@five-ten-sg.com>
parents:
143
diff
changeset
|
1570 DEBUG_WARN(("internal error (7c.b5 offset %#x) in reading block id %#"PRIx64"\n", seven_c_blk.b_five_offset, block_id)); |
49 | 1571 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1572 DEBUG_RET(); |
1573 return NULL; | |
1574 } | |
1575 memcpy(&table_rec, block_offset4.from, sizeof(table_rec)); | |
1576 LE16_CPU(table_rec.type); | |
1577 LE16_CPU(table_rec.ref_type); | |
1578 LE32_CPU(table_rec.value); | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1579 DEBUG_INFO(("table_rec (type=%#hx, ref_type=%#hx, value=%#x)\n", table_rec.type, table_rec.ref_type, table_rec.value)); |
43 | 1580 |
46 | 1581 if (table_rec.type != (uint16_t)0x04B5) { // different constant than a type 1 record |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1582 DEBUG_WARN(("Unknown second block constant - %#hx for id %#"PRIx64"\n", table_rec.type, block_id)); |
49 | 1583 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1584 DEBUG_RET(); |
1585 return NULL; | |
1586 } | |
1587 | |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1588 if (table_rec.value > 0) { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1589 if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, table_rec.value, &block_offset5)) { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1590 DEBUG_WARN(("internal error (7c.b5.desc offset %#x) in reading block id %#"PRIx64"\n", table_rec.value, block_id)); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1591 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1592 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1593 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1594 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1595 |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1596 // this will give the number of records in this block |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1597 num_mapi_objects = (block_offset5.to - block_offset5.from) / (4 + table_rec.ref_type); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1598 |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1599 if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, seven_c_blk.ind2_offset, &block_offset6)) { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1600 DEBUG_WARN(("internal error (7c.ind2 offset %#x) in reading block id %#"PRIx64"\n", seven_c_blk.ind2_offset, block_id)); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1601 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1602 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1603 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1604 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1605 ind2_ptr = block_offset6.from; |
359 | 1606 ind2_block_start = ind2_ptr; |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1607 ind2_end = block_offset6.to; |
43 | 1608 } |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1609 else { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1610 num_mapi_objects = 0; |
43 | 1611 } |
203 | 1612 DEBUG_INFO(("7cec block index2 pointer %#x and end %#x\n", ind2_ptr, ind2_end)); |
43 | 1613 } |
49 | 1614 else { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1615 DEBUG_WARN(("ERROR: Unknown block constant - %#hx for id %#"PRIx64"\n", block_hdr.type, block_id)); |
49 | 1616 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1617 DEBUG_RET(); |
1618 return NULL; | |
1619 } | |
1620 | |
203 | 1621 DEBUG_INFO(("found %i mapi objects each with %i mapi elements\n", num_mapi_objects, num_mapi_elements)); |
1622 for (count_mapi_objects=0; count_mapi_objects<num_mapi_objects; count_mapi_objects++) { | |
1623 // put another mapi object on the linked list | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1624 mo_ptr = (pst_mapi_object*) pst_malloc(sizeof(pst_mapi_object)); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1625 memset(mo_ptr, 0, sizeof(pst_mapi_object)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1626 mo_ptr->next = mo_head; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1627 mo_head = mo_ptr; |
203 | 1628 // allocate the array of mapi elements |
1629 mo_ptr->elements = (pst_mapi_element**) pst_malloc(sizeof(pst_mapi_element)*num_mapi_elements); | |
1630 mo_ptr->count_elements = num_mapi_elements; | |
1631 mo_ptr->orig_count = num_mapi_elements; | |
1632 mo_ptr->count_objects = (int32_t)num_mapi_objects; // each record will have a record of the total number of records | |
1633 for (x=0; x<num_mapi_elements; x++) mo_ptr->elements[x] = NULL; | |
1634 | |
1635 DEBUG_INFO(("going to read %i mapi elements for mapi object %i\n", num_mapi_elements, count_mapi_objects)); | |
1636 | |
1637 fr_ptr = list_start; // initialize fr_ptr to the start of the list. | |
1638 x = 0; // x almost tracks count_mapi_elements, but see 'continue' statement below | |
1639 for (count_mapi_elements=0; count_mapi_elements<num_mapi_elements; count_mapi_elements++) { //we will increase fr_ptr as we progress through index | |
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:
69
diff
changeset
|
1640 char* value_pointer = NULL; // needed for block type 2 with values larger than 4 bytes |
46 | 1641 size_t value_size = 0; |
47 | 1642 if (block_type == 1) { |
43 | 1643 memcpy(&table_rec, fr_ptr, sizeof(table_rec)); |
1644 LE16_CPU(table_rec.type); | |
1645 LE16_CPU(table_rec.ref_type); | |
1646 //LE32_CPU(table_rec.value); // done later, some may be order invariant | |
1647 fr_ptr += sizeof(table_rec); | |
47 | 1648 } else if (block_type == 2) { |
43 | 1649 // we will copy the table2_rec values into a table_rec record so that we can keep the rest of the code |
1650 memcpy(&table2_rec, fr_ptr, sizeof(table2_rec)); | |
1651 LE16_CPU(table2_rec.ref_type); | |
1652 LE16_CPU(table2_rec.type); | |
1653 LE16_CPU(table2_rec.ind2_off); | |
203 | 1654 DEBUG_INFO(("reading element %i (type=%#x, ref_type=%#x, offset=%#x, size=%#x)\n", |
1655 x, table2_rec.type, table2_rec.ref_type, table2_rec.ind2_off, table2_rec.size)); | |
43 | 1656 |
1657 // table_rec and table2_rec are arranged differently, so assign the values across | |
1658 table_rec.type = table2_rec.type; | |
1659 table_rec.ref_type = table2_rec.ref_type; | |
1660 table_rec.value = 0; | |
50 | 1661 if ((ind2_end - ind2_ptr) >= (int)(table2_rec.ind2_off + table2_rec.size)) { |
46 | 1662 size_t n = table2_rec.size; |
1663 size_t m = sizeof(table_rec.value); | |
43 | 1664 if (n <= m) { |
1665 memcpy(&table_rec.value, ind2_ptr + table2_rec.ind2_off, n); | |
1666 } | |
1667 else { | |
1668 value_pointer = ind2_ptr + table2_rec.ind2_off; | |
1669 value_size = n; | |
1670 } | |
1671 //LE32_CPU(table_rec.value); // done later, some may be order invariant | |
1672 } | |
1673 else { | |
1674 DEBUG_WARN (("Trying to read outside buffer, buffer size %#x, offset %#x, data size %#x\n", | |
1675 read_size, ind2_end-ind2_ptr+table2_rec.ind2_off, table2_rec.size)); | |
1676 } | |
1677 fr_ptr += sizeof(table2_rec); | |
1678 } else { | |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1679 DEBUG_WARN(("Missing code for block_type %i\n", block_type)); |
49 | 1680 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1681 pst_free_list(mo_head); |
43 | 1682 DEBUG_RET(); |
1683 return NULL; | |
1684 } | |
203 | 1685 DEBUG_INFO(("reading element %i (type=%#x, ref_type=%#x, value=%#x)\n", |
43 | 1686 x, table_rec.type, table_rec.ref_type, table_rec.value)); |
1687 | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1688 if (!mo_ptr->elements[x]) { |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1689 mo_ptr->elements[x] = (pst_mapi_element*) pst_malloc(sizeof(pst_mapi_element)); |
43 | 1690 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1691 memset(mo_ptr->elements[x], 0, sizeof(pst_mapi_element)); //init it |
43 | 1692 |
1693 // check here to see if the id of the attribute is a mapped one | |
1694 mapptr = pf->x_head; | |
1695 while (mapptr && (mapptr->map < table_rec.type)) mapptr = mapptr->next; | |
1696 if (mapptr && (mapptr->map == table_rec.type)) { | |
1697 if (mapptr->mytype == PST_MAP_ATTRIB) { | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1698 mo_ptr->elements[x]->mapi_id = *((uint32_t*)mapptr->data); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1699 DEBUG_INFO(("Mapped attrib %#x to %#x\n", table_rec.type, mo_ptr->elements[x]->mapi_id)); |
43 | 1700 } else if (mapptr->mytype == PST_MAP_HEADER) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1701 DEBUG_INFO(("Internet Header mapping found %#"PRIx32" to %s\n", table_rec.type, mapptr->data)); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1702 mo_ptr->elements[x]->mapi_id = (uint32_t)PST_ATTRIB_HEADER; |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
1703 mo_ptr->elements[x]->extra = mapptr->data; |
43 | 1704 } |
46 | 1705 else { |
94
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
1706 DEBUG_WARN(("Missing assertion failure\n")); |
46 | 1707 // nothing, should be assertion failure here |
1708 } | |
43 | 1709 } else { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1710 mo_ptr->elements[x]->mapi_id = table_rec.type; |
43 | 1711 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1712 mo_ptr->elements[x]->type = 0; // checked later before it is set |
43 | 1713 /* Reference Types |
1714 0x0002 - Signed 16bit value | |
1715 0x0003 - Signed 32bit value | |
1716 0x0004 - 4-byte floating point | |
1717 0x0005 - Floating point double | |
1718 0x0006 - Signed 64-bit int | |
1719 0x0007 - Application Time | |
1720 0x000A - 32-bit error value | |
1721 0x000B - Boolean (non-zero = true) | |
1722 0x000D - Embedded Object | |
1723 0x0014 - 8-byte signed integer (64-bit) | |
1724 0x001E - Null terminated String | |
1725 0x001F - Unicode string | |
1726 0x0040 - Systime - Filetime structure | |
1727 0x0048 - OLE Guid | |
1728 0x0102 - Binary data | |
1729 0x1003 - Array of 32bit values | |
1730 0x1014 - Array of 64bit values | |
1731 0x101E - Array of Strings | |
1732 0x1102 - Array of Binary data | |
1733 */ | |
1734 | |
46 | 1735 if (table_rec.ref_type == (uint16_t)0x0002 || |
1736 table_rec.ref_type == (uint16_t)0x0003 || | |
1737 table_rec.ref_type == (uint16_t)0x000b) { | |
43 | 1738 //contains 32 bits of data |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1739 mo_ptr->elements[x]->size = sizeof(int32_t); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1740 mo_ptr->elements[x]->type = table_rec.ref_type; |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1741 mo_ptr->elements[x]->data = pst_malloc(sizeof(int32_t)); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1742 memcpy(mo_ptr->elements[x]->data, &(table_rec.value), sizeof(int32_t)); |
51 | 1743 // are we missing an LE32_CPU() call here? table_rec.value is still |
1744 // in the original order. | |
43 | 1745 |
46 | 1746 } else if (table_rec.ref_type == (uint16_t)0x0005 || |
1747 table_rec.ref_type == (uint16_t)0x000d || | |
1748 table_rec.ref_type == (uint16_t)0x0014 || | |
1749 table_rec.ref_type == (uint16_t)0x001e || | |
1750 table_rec.ref_type == (uint16_t)0x001f || | |
1751 table_rec.ref_type == (uint16_t)0x0040 || | |
1752 table_rec.ref_type == (uint16_t)0x0048 || | |
1753 table_rec.ref_type == (uint16_t)0x0102 || | |
1754 table_rec.ref_type == (uint16_t)0x1003 || | |
1755 table_rec.ref_type == (uint16_t)0x1014 || | |
1756 table_rec.ref_type == (uint16_t)0x101e || | |
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:
69
diff
changeset
|
1757 table_rec.ref_type == (uint16_t)0x101f || |
46 | 1758 table_rec.ref_type == (uint16_t)0x1102) { |
43 | 1759 //contains index reference to data |
1760 LE32_CPU(table_rec.value); | |
1761 if (value_pointer) { | |
1762 // in a type 2 block, with a value that is more than 4 bytes | |
1763 // directly stored in this block. | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1764 mo_ptr->elements[x]->size = value_size; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1765 mo_ptr->elements[x]->type = table_rec.ref_type; |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1766 mo_ptr->elements[x]->data = pst_malloc(value_size); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1767 memcpy(mo_ptr->elements[x]->data, value_pointer, value_size); |
43 | 1768 } |
49 | 1769 else if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, table_rec.value, &block_offset7)) { |
46 | 1770 if ((table_rec.value & 0xf) == (uint32_t)0xf) { |
43 | 1771 DEBUG_WARN(("failed to get block offset for table_rec.value of %#x to be read later.\n", table_rec.value)); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1772 mo_ptr->elements[x]->size = 0; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1773 mo_ptr->elements[x]->data = NULL; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1774 mo_ptr->elements[x]->type = table_rec.value; |
43 | 1775 } |
1776 else { | |
1777 if (table_rec.value) { | |
1778 DEBUG_WARN(("failed to get block offset for table_rec.value of %#x\n", table_rec.value)); | |
1779 } | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1780 mo_ptr->count_elements --; //we will be skipping a row |
43 | 1781 continue; |
1782 } | |
1783 } | |
1784 else { | |
50 | 1785 value_size = (size_t)(block_offset7.to - block_offset7.from); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1786 mo_ptr->elements[x]->size = value_size; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1787 mo_ptr->elements[x]->type = table_rec.ref_type; |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1788 mo_ptr->elements[x]->data = pst_malloc(value_size+1); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1789 memcpy(mo_ptr->elements[x]->data, block_offset7.from, value_size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1790 mo_ptr->elements[x]->data[value_size] = '\0'; // it might be a string, null terminate it. |
43 | 1791 } |
46 | 1792 if (table_rec.ref_type == (uint16_t)0xd) { |
43 | 1793 // there is still more to do for the type of 0xD embedded objects |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1794 type_d_rec = (struct _type_d_rec*) mo_ptr->elements[x]->data; |
43 | 1795 LE32_CPU(type_d_rec->id); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1796 mo_ptr->elements[x]->size = pst_ff_getID2block(pf, type_d_rec->id, i2_head, &(mo_ptr->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1797 if (!mo_ptr->elements[x]->size){ |
43 | 1798 DEBUG_WARN(("not able to read the ID2 data. Setting to be read later. %#x\n", type_d_rec->id)); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1799 mo_ptr->elements[x]->type = type_d_rec->id; // fetch before freeing data, alias pointer |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1800 free(mo_ptr->elements[x]->data); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1801 mo_ptr->elements[x]->data = NULL; |
43 | 1802 } |
1803 } | |
46 | 1804 if (table_rec.ref_type == (uint16_t)0x1f) { |
43 | 1805 // there is more to do for the type 0x1f unicode strings |
116
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
1806 size_t rc; |
182
b65e8d0a088a
more cleanup on external names in the shared object file
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
1807 static pst_vbuf *utf16buf = NULL; |
b65e8d0a088a
more cleanup on external names in the shared object file
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
1808 static pst_vbuf *utf8buf = NULL; |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1809 if (!utf16buf) utf16buf = pst_vballoc((size_t)1024); |
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1810 if (!utf8buf) utf8buf = pst_vballoc((size_t)1024); |
46 | 1811 |
43 | 1812 //need UTF-16 zero-termination |
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 pst_vbset(utf16buf, mo_ptr->elements[x]->data, mo_ptr->elements[x]->size); |
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1814 pst_vbappend(utf16buf, "\0\0", (size_t)2); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1815 DEBUG_INFO(("Iconv in:\n")); |
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:
163
diff
changeset
|
1816 DEBUG_HEXDUMPC(utf16buf->b, utf16buf->dlen, 0x10); |
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 rc = pst_vb_utf16to8(utf8buf, utf16buf->b, utf16buf->dlen); |
116
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
1818 if (rc == (size_t)-1) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1819 DEBUG_WARN(("Failed to convert utf-16 to utf-8\n")); |
116
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
1820 } |
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
1821 else { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1822 free(mo_ptr->elements[x]->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:
163
diff
changeset
|
1823 mo_ptr->elements[x]->size = utf8buf->dlen; |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1824 mo_ptr->elements[x]->data = pst_malloc(utf8buf->dlen); |
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:
163
diff
changeset
|
1825 memcpy(mo_ptr->elements[x]->data, utf8buf->b, utf8buf->dlen); |
116
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
1826 } |
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(("Iconv out:\n")); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1828 DEBUG_HEXDUMPC(mo_ptr->elements[x]->data, mo_ptr->elements[x]->size, 0x10); |
43 | 1829 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1830 if (mo_ptr->elements[x]->type == 0) mo_ptr->elements[x]->type = table_rec.ref_type; |
43 | 1831 } else { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
1832 DEBUG_WARN(("ERROR Unknown ref_type %#hx\n", table_rec.ref_type)); |
43 | 1833 } |
1834 x++; | |
1835 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1836 DEBUG_INFO(("increasing ind2_ptr by %i [%#x] bytes. Was %#x, Now %#x\n", rec_size, rec_size, ind2_ptr, ind2_ptr+rec_size)); |
43 | 1837 ind2_ptr += rec_size; |
359 | 1838 // ind2 rows do not get split between blocks. See PST spec, 2.3.4.4 "Row Matrix". |
1839 if (ind2_ptr + rec_size > ind2_block_start + ind2_max_block_size) { | |
1840 ind2_block_start += ind2_max_block_size; | |
1841 DEBUG_INFO(("advancing ind2_ptr to next block. Was %#x, Now %#x\n", ind2_ptr, ind2_block_start)); | |
1842 ind2_ptr = ind2_block_start; | |
1843 } | |
43 | 1844 } |
49 | 1845 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1846 DEBUG_RET(); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1847 return mo_head; |
16 | 1848 } |
1849 | |
51 | 1850 |
48 | 1851 // This version of free does NULL check first |
1852 #define SAFE_FREE(x) {if (x) free(x);} | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1853 #define SAFE_FREE_STR(x) SAFE_FREE(x.str) |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1854 #define SAFE_FREE_BIN(x) SAFE_FREE(x.data) |
16 | 1855 |
1856 // check if item->email is NULL, and init if so | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1857 #define MALLOC_EMAIL(x) { if (!x->email) { x->email = (pst_item_email*) pst_malloc(sizeof(pst_item_email)); memset(x->email, 0, sizeof(pst_item_email) );} } |
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1858 #define MALLOC_FOLDER(x) { if (!x->folder) { x->folder = (pst_item_folder*) pst_malloc(sizeof(pst_item_folder)); memset(x->folder, 0, sizeof(pst_item_folder) );} } |
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1859 #define MALLOC_CONTACT(x) { if (!x->contact) { x->contact = (pst_item_contact*) pst_malloc(sizeof(pst_item_contact)); memset(x->contact, 0, sizeof(pst_item_contact) );} } |
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1860 #define MALLOC_MESSAGESTORE(x) { if (!x->message_store) { x->message_store = (pst_item_message_store*) pst_malloc(sizeof(pst_item_message_store)); memset(x->message_store, 0, sizeof(pst_item_message_store));} } |
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1861 #define MALLOC_JOURNAL(x) { if (!x->journal) { x->journal = (pst_item_journal*) pst_malloc(sizeof(pst_item_journal)); memset(x->journal, 0, sizeof(pst_item_journal) );} } |
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1862 #define MALLOC_APPOINTMENT(x) { if (!x->appointment) { x->appointment = (pst_item_appointment*) pst_malloc(sizeof(pst_item_appointment)); memset(x->appointment, 0, sizeof(pst_item_appointment) );} } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1863 |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
1864 // malloc space and copy the current item's data null terminated |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1865 #define LIST_COPY(targ, type) { \ |
289
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
1866 targ = type pst_realloc(targ, list->elements[x]->size+1); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1867 memcpy(targ, list->elements[x]->data, list->elements[x]->size);\ |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1868 memset(((char*)targ)+list->elements[x]->size, 0, (size_t)1); \ |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1869 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1870 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1871 #define LIST_COPY_CSTR(targ) { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1872 if ((list->elements[x]->type == 0x1f) || \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1873 (list->elements[x]->type == 0x1e) || \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1874 (list->elements[x]->type == 0x102)) { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1875 LIST_COPY(targ, (char*)) \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1876 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1877 else { \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1878 DEBUG_WARN(("src not 0x1e or 0x1f or 0x102 for string dst\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1879 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1880 SAFE_FREE(targ); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1881 targ = NULL; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1882 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1883 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1884 |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1885 #define LIST_COPY_BOOL(label, targ) { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1886 if (list->elements[x]->type != 0x0b) { \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1887 DEBUG_WARN(("src not 0x0b for boolean dst\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1888 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1889 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1890 if (*(int16_t*)list->elements[x]->data) { \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1891 DEBUG_INFO((label" - True\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1892 targ = 1; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1893 } else { \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1894 DEBUG_INFO((label" - False\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1895 targ = 0; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1896 } \ |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1897 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1898 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1899 #define LIST_COPY_EMAIL_BOOL(label, targ) { \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1900 MALLOC_EMAIL(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1901 LIST_COPY_BOOL(label, targ) \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1902 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1903 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1904 #define LIST_COPY_CONTACT_BOOL(label, targ) { \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1905 MALLOC_CONTACT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1906 LIST_COPY_BOOL(label, targ) \ |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
1907 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1908 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1909 #define LIST_COPY_APPT_BOOL(label, targ) { \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1910 MALLOC_APPOINTMENT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1911 LIST_COPY_BOOL(label, targ) \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1912 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1913 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1914 #define LIST_COPY_INT16_N(targ) { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1915 if (list->elements[x]->type != 0x02) { \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1916 DEBUG_WARN(("src not 0x02 for int16 dst\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1917 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1918 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1919 memcpy(&(targ), list->elements[x]->data, sizeof(targ)); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1920 LE16_CPU(targ); \ |
152 | 1921 } |
1922 | |
1923 #define LIST_COPY_INT16(label, targ) { \ | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1924 LIST_COPY_INT16_N(targ); \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1925 DEBUG_INFO((label" - %i %#x\n", (int)targ, (int)targ)); \ |
152 | 1926 } |
1927 | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1928 #define LIST_COPY_INT32_N(targ) { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1929 if (list->elements[x]->type != 0x03) { \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1930 DEBUG_WARN(("src not 0x03 for int32 dst\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1931 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1932 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1933 memcpy(&(targ), list->elements[x]->data, sizeof(targ)); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1934 LE32_CPU(targ); \ |
152 | 1935 } |
1936 | |
1937 #define LIST_COPY_INT32(label, targ) { \ | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1938 LIST_COPY_INT32_N(targ); \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1939 DEBUG_INFO((label" - %i %#x\n", (int)targ, (int)targ)); \ |
152 | 1940 } |
1941 | |
1942 #define LIST_COPY_EMAIL_INT32(label, targ) { \ | |
1943 MALLOC_EMAIL(item); \ | |
1944 LIST_COPY_INT32(label, targ); \ | |
1945 } | |
1946 | |
1947 #define LIST_COPY_APPT_INT32(label, targ) { \ | |
1948 MALLOC_APPOINTMENT(item); \ | |
1949 LIST_COPY_INT32(label, targ); \ | |
1950 } | |
1951 | |
1952 #define LIST_COPY_FOLDER_INT32(label, targ) { \ | |
1953 MALLOC_FOLDER(item); \ | |
1954 LIST_COPY_INT32(label, targ); \ | |
1955 } | |
1956 | |
1957 #define LIST_COPY_STORE_INT32(label, targ) { \ | |
1958 MALLOC_MESSAGESTORE(item); \ | |
1959 LIST_COPY_INT32(label, targ); \ | |
1960 } | |
1961 | |
1962 #define LIST_COPY_ENUM(label, targ, delta, count, ...) { \ | |
1963 char *tlabels[] = {__VA_ARGS__}; \ | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1964 LIST_COPY_INT32_N(targ); \ |
152 | 1965 targ += delta; \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1966 DEBUG_INFO((label" - %s [%i]\n", \ |
152 | 1967 (((int)targ < 0) || ((int)targ >= count)) \ |
1968 ? "**invalid" \ | |
1969 : tlabels[(int)targ], (int)targ)); \ | |
1970 } | |
1971 | |
1972 #define LIST_COPY_EMAIL_ENUM(label, targ, delta, count, ...) { \ | |
1973 MALLOC_EMAIL(item); \ | |
1974 LIST_COPY_ENUM(label, targ, delta, count, __VA_ARGS__); \ | |
1975 } | |
1976 | |
1977 #define LIST_COPY_APPT_ENUM(label, targ, delta, count, ...) { \ | |
1978 MALLOC_APPOINTMENT(item); \ | |
1979 LIST_COPY_ENUM(label, targ, delta, count, __VA_ARGS__); \ | |
1980 } | |
1981 | |
1982 #define LIST_COPY_ENUM16(label, targ, delta, count, ...) { \ | |
1983 char *tlabels[] = {__VA_ARGS__}; \ | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1984 LIST_COPY_INT16_N(targ); \ |
152 | 1985 targ += delta; \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
1986 DEBUG_INFO((label" - %s [%i]\n", \ |
152 | 1987 (((int)targ < 0) || ((int)targ >= count)) \ |
1988 ? "**invalid" \ | |
1989 : tlabels[(int)targ], (int)targ)); \ | |
1990 } | |
1991 | |
1992 #define LIST_COPY_CONTACT_ENUM16(label, targ, delta, count, ...) { \ | |
1993 MALLOC_CONTACT(item); \ | |
1994 LIST_COPY_ENUM16(label, targ, delta, count, __VA_ARGS__); \ | |
1995 } | |
1996 | |
1997 #define LIST_COPY_ENTRYID(label, targ) { \ | |
1998 LIST_COPY(targ, (pst_entryid*)); \ | |
1999 LE32_CPU(targ->u1); \ | |
2000 LE32_CPU(targ->id); \ | |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2001 DEBUG_INFO((label" u1=%#x, id=%#x\n", targ->u1, targ->id)); \ |
152 | 2002 } |
2003 | |
2004 #define LIST_COPY_EMAIL_ENTRYID(label, targ) { \ | |
2005 MALLOC_EMAIL(item); \ | |
2006 LIST_COPY_ENTRYID(label, targ); \ | |
2007 } | |
2008 | |
2009 #define LIST_COPY_STORE_ENTRYID(label, targ) { \ | |
2010 MALLOC_MESSAGESTORE(item); \ | |
2011 LIST_COPY_ENTRYID(label, targ); \ | |
2012 } | |
2013 | |
2014 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2015 // malloc space and copy the current item's data null terminated |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2016 // including the utf8 flag |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2017 #define LIST_COPY_STR(label, targ) { \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2018 LIST_COPY_CSTR(targ.str); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2019 targ.is_utf8 = (list->elements[x]->type == 0x1f) ? 1 : 0; \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2020 DEBUG_INFO((label" - unicode %d - %s\n", targ.is_utf8, targ.str)); \ |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2021 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2022 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2023 #define LIST_COPY_EMAIL_STR(label, targ) { \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2024 MALLOC_EMAIL(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2025 LIST_COPY_STR(label, targ); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2026 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2027 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2028 #define LIST_COPY_CONTACT_STR(label, targ) { \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2029 MALLOC_CONTACT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2030 LIST_COPY_STR(label, targ); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2031 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2032 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2033 #define LIST_COPY_APPT_STR(label, targ) { \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2034 MALLOC_APPOINTMENT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2035 LIST_COPY_STR(label, targ); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2036 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2037 |
152 | 2038 #define LIST_COPY_JOURNAL_STR(label, targ) { \ |
2039 MALLOC_JOURNAL(item); \ | |
2040 LIST_COPY_STR(label, targ); \ | |
2041 } | |
2042 | |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2043 // malloc space and copy the item filetime |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2044 #define LIST_COPY_TIME(label, targ) { \ |
341
c638905665bc
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
340
diff
changeset
|
2045 if ((list->elements[x]->type != 0x40) || \ |
342
5d0dc4db45b3
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
341
diff
changeset
|
2046 (list->elements[x]->size != sizeof(FILETIME))) { \ |
341
c638905665bc
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
340
diff
changeset
|
2047 DEBUG_WARN(("src not 0x40 or wrong length for filetime dst\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2048 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2049 } \ |
340
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2050 else { \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2051 targ = (FILETIME*) pst_realloc(targ, sizeof(FILETIME)); \ |
341
c638905665bc
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
340
diff
changeset
|
2052 memcpy(targ, list->elements[x]->data, sizeof(FILETIME)); \ |
340
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2053 LE32_CPU(targ->dwLowDateTime); \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2054 LE32_CPU(targ->dwHighDateTime); \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2055 DEBUG_INFO((label" - %s", pst_fileTimeToAscii(targ, time_buffer))); \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2056 } \ |
152 | 2057 } |
2058 | |
2059 #define LIST_COPY_EMAIL_TIME(label, targ) { \ | |
2060 MALLOC_EMAIL(item); \ | |
2061 LIST_COPY_TIME(label, targ); \ | |
2062 } | |
2063 | |
2064 #define LIST_COPY_CONTACT_TIME(label, targ) { \ | |
2065 MALLOC_CONTACT(item); \ | |
2066 LIST_COPY_TIME(label, targ); \ | |
2067 } | |
2068 | |
2069 #define LIST_COPY_APPT_TIME(label, targ) { \ | |
2070 MALLOC_APPOINTMENT(item); \ | |
2071 LIST_COPY_TIME(label, targ); \ | |
2072 } | |
2073 | |
2074 #define LIST_COPY_JOURNAL_TIME(label, targ) { \ | |
2075 MALLOC_JOURNAL(item); \ | |
2076 LIST_COPY_TIME(label, targ); \ | |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2077 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2078 |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
2079 // malloc space and copy the current item's data and size |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2080 #define LIST_COPY_BIN(targ) { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2081 targ.size = list->elements[x]->size; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2082 if (targ.size) { \ |
289
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
2083 targ.data = (char*)pst_realloc(targ.data, targ.size); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2084 memcpy(targ.data, list->elements[x]->data, targ.size); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2085 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2086 else { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2087 SAFE_FREE_BIN(targ); \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2088 targ.data = NULL; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2089 } \ |
16 | 2090 } |
2091 | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2092 #define LIST_COPY_EMAIL_BIN(label, targ) { \ |
152 | 2093 MALLOC_EMAIL(item); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2094 LIST_COPY_BIN(targ); \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2095 DEBUG_INFO((label"\n")); \ |
152 | 2096 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2097 #define LIST_COPY_APPT_BIN(label, targ) { \ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2098 MALLOC_APPOINTMENT(item); \ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2099 LIST_COPY_BIN(targ); \ |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2100 DEBUG_INFO((label"\n")); \ |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2101 DEBUG_HEXDUMP(targ.data, targ.size); \ |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2102 } |
152 | 2103 |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
2104 #define NULL_CHECK(x) { if (!x) { DEBUG_WARN(("NULL_CHECK: Null Found\n")); break;} } |
16 | 2105 |
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
|
2106 |
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
|
2107 /** |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2108 * process the list of MAPI objects produced from parse_block() |
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
|
2109 * |
304
5338d93889aa
preserve bcc headers, document -C switch to set default character set, space after colon is not required in header fields
Carl Byington <carl@five-ten-sg.com>
parents:
298
diff
changeset
|
2110 * @param block_id block number used by parse_block() to produce these MAPI objects |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2111 * @param list pointer to the list of MAPI objects from parse_block() |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
2112 * @param item pointer to the high level item to be updated from the list. |
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
|
2113 * this item may be an email, contact or other sort of item. |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
2114 * the type of this item is generally set by the MAPI elements |
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
|
2115 * from the list. |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
2116 * @param attach pointer to the list of attachment records. If |
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
|
2117 * this is non-null, the length of the this attachment list |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2118 * must be at least as large as the length of the MAPI objects list. |
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
|
2119 * |
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
|
2120 * @return 0 for ok, -1 for error. |
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
|
2121 */ |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
2122 static int pst_process(uint64_t block_id, pst_mapi_object *list, pst_item *item, pst_item_attach *attach) { |
46 | 2123 DEBUG_ENT("pst_process"); |
43 | 2124 if (!item) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2125 DEBUG_WARN(("item cannot be NULL.\n")); |
43 | 2126 DEBUG_RET(); |
2127 return -1; | |
2128 } | |
2129 | |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
2130 item->block_id = block_id; |
43 | 2131 while (list) { |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2132 int32_t x; |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
2133 char time_buffer[30]; |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2134 for (x=0; x<list->count_elements; x++) { |
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
|
2135 int32_t t; |
267
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2136 uint32_t ut; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2137 DEBUG_INFO(("#%d - mapi-id: %#x type: %#x length: %#x\n", x, list->elements[x]->mapi_id, list->elements[x]->type, list->elements[x]->size)); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2138 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2139 switch (list->elements[x]->mapi_id) { |
43 | 2140 case PST_ATTRIB_HEADER: // CUSTOM attribute for saying the Extra Headers |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
2141 if (list->elements[x]->extra) { |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2142 if (list->elements[x]->type == 0x0101e) { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2143 // an array of strings, rather than a single string |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2144 int32_t string_length, i, offset, next_offset; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2145 int32_t p = 0; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2146 int32_t array_element_count = PST_LE_GET_INT32(list->elements[x]->data); p+=4; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2147 for (i = 1; i <= array_element_count; i++) { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2148 pst_item_extra_field *ef = (pst_item_extra_field*) pst_malloc(sizeof(pst_item_extra_field)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2149 memset(ef, 0, sizeof(pst_item_extra_field)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2150 offset = PST_LE_GET_INT32(list->elements[x]->data + p); p+=4; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2151 next_offset = (i == array_element_count) ? list->elements[x]->size : PST_LE_GET_INT32(list->elements[x]->data + p);; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2152 string_length = next_offset - offset; |
289
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
2153 ef->value = pst_malloc(string_length + 1); |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2154 memcpy(ef->value, list->elements[x]->data + offset, string_length); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2155 ef->value[string_length] = '\0'; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2156 ef->field_name = strdup(list->elements[x]->extra); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2157 ef->next = item->extra_fields; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2158 item->extra_fields = ef; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2159 DEBUG_INFO(("Extra Field - \"%s\" = \"%s\"\n", ef->field_name, ef->value)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2160 } |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2161 } |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2162 else { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2163 // should be a single string |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2164 pst_item_extra_field *ef = (pst_item_extra_field*) pst_malloc(sizeof(pst_item_extra_field)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2165 memset(ef, 0, sizeof(pst_item_extra_field)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2166 LIST_COPY_CSTR(ef->value); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2167 if (ef->value) { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2168 ef->field_name = strdup(list->elements[x]->extra); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2169 ef->next = item->extra_fields; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2170 item->extra_fields = ef; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2171 DEBUG_INFO(("Extra Field - \"%s\" = \"%s\"\n", ef->field_name, ef->value)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2172 if (strcmp(ef->field_name, "content-type") == 0) { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2173 char *p = strstr(ef->value, "charset=\""); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2174 if (p) { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2175 p += 9; // skip over charset=" |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2176 char *pp = strchr(p, '"'); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2177 if (pp) { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2178 *pp = '\0'; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2179 char *set = strdup(p); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2180 *pp = '"'; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2181 if (item->body_charset.str) free(item->body_charset.str); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2182 item->body_charset.str = set; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2183 item->body_charset.is_utf8 = 1; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2184 DEBUG_INFO(("body charset %s from content-type extra field\n", set)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2185 } |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
2186 } |
116
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
2187 } |
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
2188 } |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2189 else { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2190 DEBUG_WARN(("What does this mean? Internet header %s value\n", list->elements[x]->extra)); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2191 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2192 free(ef); // caught by valgrind |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2193 } |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
2194 } |
49 | 2195 } |
43 | 2196 break; |
2197 case 0x0002: // PR_ALTERNATE_RECIPIENT_ALLOWED | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2198 if (list->elements[x]->type == 0x0b) { |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2199 // If set to true, the sender allows this email to be autoforwarded |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2200 LIST_COPY_EMAIL_BOOL("AutoForward allowed", item->email->autoforward); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2201 if (!item->email->autoforward) item->email->autoforward = -1; |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2202 } else { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
2203 DEBUG_WARN(("What does this mean?\n")); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2204 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2205 } |
43 | 2206 break; |
2207 case 0x0003: // Extended Attributes table | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2208 DEBUG_INFO(("Extended Attributes Table - NOT PROCESSED\n")); |
43 | 2209 break; |
152 | 2210 case 0x0017: // PR_IMPORTANCE - How important the sender deems it to be |
2211 LIST_COPY_EMAIL_ENUM("Importance Level", item->email->importance, 0, 3, "Low", "Normal", "High"); | |
43 | 2212 break; |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2213 case 0x001A: // PR_MESSAGE_CLASS IPM.x |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2214 if ((list->elements[x]->type == 0x1e) || |
168 | 2215 (list->elements[x]->type == 0x1f)) { |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2216 LIST_COPY_CSTR(item->ascii_type); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2217 if (!item->ascii_type) item->ascii_type = strdup("unknown"); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2218 if (pst_strincmp("IPM.Note", item->ascii_type, 8) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2219 item->type = PST_TYPE_NOTE; |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2220 else if (pst_stricmp("IPM", item->ascii_type) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2221 item->type = PST_TYPE_NOTE; |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2222 else if (pst_strincmp("IPM.Contact", item->ascii_type, 11) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2223 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
|
2224 else if (pst_strincmp("REPORT.IPM.Note", item->ascii_type, 15) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2225 item->type = PST_TYPE_REPORT; |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2226 else if (pst_strincmp("IPM.Activity", item->ascii_type, 12) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2227 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
|
2228 else if (pst_strincmp("IPM.Appointment", item->ascii_type, 15) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2229 item->type = PST_TYPE_APPOINTMENT; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2230 else if (pst_strincmp("IPM.Schedule.Meeting", item->ascii_type, 20) == 0) |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2231 item->type = PST_TYPE_SCHEDULE; // meeting requests and responses transported over email |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2232 else if (pst_strincmp("IPM.StickyNote", item->ascii_type, 14) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2233 item->type = PST_TYPE_STICKYNOTE; |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2234 else if (pst_strincmp("IPM.Task", item->ascii_type, 8) == 0) |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2235 item->type = PST_TYPE_TASK; |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2236 else |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2237 item->type = PST_TYPE_OTHER; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2238 DEBUG_INFO(("Message class %s [%"PRIi32"] \n", item->ascii_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
|
2239 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2240 else { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
2241 DEBUG_WARN(("What does this mean?\n")); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2242 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2243 } |
43 | 2244 break; |
2245 case 0x0023: // PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2246 if (list->elements[x]->type == 0x0b) { |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2247 // set if the sender wants a delivery report from all recipients |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2248 LIST_COPY_EMAIL_BOOL("Global Delivery Report", item->email->delivery_report); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2249 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2250 else { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
2251 DEBUG_WARN(("What does this mean?\n")); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2252 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2253 } |
43 | 2254 break; |
2255 case 0x0026: // PR_PRIORITY | |
152 | 2256 LIST_COPY_EMAIL_ENUM("Priority", item->email->priority, 1, 3, "NonUrgent", "Normal", "Urgent"); |
43 | 2257 break; |
51 | 2258 case 0x0029: // PR_READ_RECEIPT_REQUESTED |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2259 LIST_COPY_EMAIL_BOOL("Read Receipt", item->email->read_receipt); |
43 | 2260 break; |
2261 case 0x002B: // PR_RECIPIENT_REASSIGNMENT_PROHIBITED | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2262 LIST_COPY_BOOL("Reassignment Prohibited (Private)", item->private_member); |
43 | 2263 break; |
152 | 2264 case 0x002E: // PR_ORIGINAL_SENSITIVITY - the sensitivity of the message before being replied to or forwarded |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2265 LIST_COPY_EMAIL_ENUM("Original Sensitivity", item->email->original_sensitivity, 0, 4, |
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2266 "None", "Personal", "Private", "Company Confidential"); |
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
|
2267 break; |
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
|
2268 case 0x0032: // PR_REPORT_TIME |
152 | 2269 LIST_COPY_EMAIL_TIME("Report time", item->email->report_time); |
2270 break; | |
2271 case 0x0036: // PR_SENSITIVITY - sender's opinion of the sensitivity of an email | |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2272 LIST_COPY_EMAIL_ENUM("Sensitivity", item->email->sensitivity, 0, 4, |
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2273 "None", "Personal", "Private", "Company Confidential"); |
43 | 2274 break; |
2275 case 0x0037: // PR_SUBJECT raw subject | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2276 { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2277 int off = 0; |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2278 if ((list->elements[x]->size > 2) && (((uint8_t)list->elements[x]->data[0]) < 0x20)) { |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2279 off = 2; |
43 | 2280 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2281 list->elements[x]->data += off; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2282 list->elements[x]->size -= off; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2283 LIST_COPY_STR("Raw Subject", item->subject); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2284 list->elements[x]->size += off; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2285 list->elements[x]->data -= off; |
43 | 2286 } |
2287 break; | |
2288 case 0x0039: // PR_CLIENT_SUBMIT_TIME Date Email Sent/Created | |
152 | 2289 LIST_COPY_EMAIL_TIME("Date sent", item->email->sent_date); |
43 | 2290 break; |
2291 case 0x003B: // PR_SENT_REPRESENTING_SEARCH_KEY Sender address 1 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2292 LIST_COPY_EMAIL_STR("Sent on behalf of address 1", item->email->outlook_sender); |
43 | 2293 break; |
2294 case 0x003F: // PR_RECEIVED_BY_ENTRYID Structure containing Recipient | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2295 DEBUG_INFO(("Recipient Structure 1 -- NOT PROCESSED\n")); |
43 | 2296 break; |
2297 case 0x0040: // PR_RECEIVED_BY_NAME Name of Recipient Structure | |
308
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2298 LIST_COPY_EMAIL_STR("Received By Name 1", item->email->outlook_received_name1); |
43 | 2299 break; |
2300 case 0x0041: // PR_SENT_REPRESENTING_ENTRYID Structure containing Sender | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2301 DEBUG_INFO(("Sent on behalf of Structure 1 -- NOT PROCESSED\n")); |
43 | 2302 break; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2303 case 0x0042: // PR_SENT_REPRESENTING_NAME |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2304 LIST_COPY_EMAIL_STR("Sent on behalf of", item->email->outlook_sender_name); |
43 | 2305 break; |
2306 case 0x0043: // PR_RCVD_REPRESENTING_ENTRYID Recipient Structure 2 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2307 DEBUG_INFO(("Received on behalf of Structure -- NOT PROCESSED\n")); |
43 | 2308 break; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2309 case 0x0044: // PR_RCVD_REPRESENTING_NAME |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2310 LIST_COPY_EMAIL_STR("Received on behalf of", item->email->outlook_recipient_name); |
43 | 2311 break; |
2312 case 0x004F: // PR_REPLY_RECIPIENT_ENTRIES Reply-To Structure | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2313 DEBUG_INFO(("Reply-To Structure -- NOT PROCESSED\n")); |
43 | 2314 break; |
2315 case 0x0050: // PR_REPLY_RECIPIENT_NAMES Name of Reply-To Structure | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2316 LIST_COPY_EMAIL_STR("Reply-To", item->email->reply_to); |
43 | 2317 break; |
2318 case 0x0051: // PR_RECEIVED_BY_SEARCH_KEY Recipient Address 1 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2319 LIST_COPY_EMAIL_STR("Recipient's Address 1", item->email->outlook_recipient); |
43 | 2320 break; |
2321 case 0x0052: // PR_RCVD_REPRESENTING_SEARCH_KEY Recipient Address 2 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2322 LIST_COPY_EMAIL_STR("Recipient's Address 2", item->email->outlook_recipient2); |
43 | 2323 break; |
2324 case 0x0057: // PR_MESSAGE_TO_ME | |
2325 // this user is listed explicitly in the TO address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2326 LIST_COPY_EMAIL_BOOL("My address in TO field", item->email->message_to_me); |
43 | 2327 break; |
2328 case 0x0058: // PR_MESSAGE_CC_ME | |
2329 // this user is listed explicitly in the CC address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2330 LIST_COPY_EMAIL_BOOL("My address in CC field", item->email->message_cc_me); |
43 | 2331 break; |
51 | 2332 case 0x0059: // PR_MESSAGE_RECIP_ME |
43 | 2333 // this user appears in TO, CC or BCC address list |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2334 LIST_COPY_EMAIL_BOOL("Message addressed to me", item->email->message_recip_me); |
43 | 2335 break; |
2336 case 0x0063: // PR_RESPONSE_REQUESTED | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2337 LIST_COPY_BOOL("Response requested", item->response_requested); |
43 | 2338 break; |
2339 case 0x0064: // PR_SENT_REPRESENTING_ADDRTYPE Access method for Sender Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2340 LIST_COPY_EMAIL_STR("Sent on behalf of address type", item->email->sender_access); |
43 | 2341 break; |
2342 case 0x0065: // PR_SENT_REPRESENTING_EMAIL_ADDRESS Sender Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2343 LIST_COPY_EMAIL_STR("Sent on behalf of address", item->email->sender_address); |
43 | 2344 break; |
2345 case 0x0070: // PR_CONVERSATION_TOPIC Processed Subject | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2346 LIST_COPY_EMAIL_STR("Processed Subject (Conversation Topic)", item->email->processed_subject); |
43 | 2347 break; |
63
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
60
diff
changeset
|
2348 case 0x0071: // PR_CONVERSATION_INDEX |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2349 LIST_COPY_EMAIL_BIN("Conversation Index", item->email->conversation_index); |
43 | 2350 break; |
63
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
60
diff
changeset
|
2351 case 0x0072: // PR_ORIGINAL_DISPLAY_BCC |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2352 LIST_COPY_EMAIL_STR("Original display bcc", item->email->original_bcc); |
63
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
60
diff
changeset
|
2353 break; |
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
60
diff
changeset
|
2354 case 0x0073: // PR_ORIGINAL_DISPLAY_CC |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2355 LIST_COPY_EMAIL_STR("Original display cc", item->email->original_cc); |
63
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
60
diff
changeset
|
2356 break; |
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
60
diff
changeset
|
2357 case 0x0074: // PR_ORIGINAL_DISPLAY_TO |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2358 LIST_COPY_EMAIL_STR("Original display to", item->email->original_to); |
63
cfd6175f9334
Start work on pst2dii to convert to Summation dii load file format.
Carl Byington <carl@five-ten-sg.com>
parents:
60
diff
changeset
|
2359 break; |
43 | 2360 case 0x0075: // PR_RECEIVED_BY_ADDRTYPE Recipient Access Method |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2361 LIST_COPY_EMAIL_STR("Received by Address type", item->email->recip_access); |
43 | 2362 break; |
2363 case 0x0076: // PR_RECEIVED_BY_EMAIL_ADDRESS Recipient Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2364 LIST_COPY_EMAIL_STR("Received by Address", item->email->recip_address); |
43 | 2365 break; |
2366 case 0x0077: // PR_RCVD_REPRESENTING_ADDRTYPE Recipient Access Method 2 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2367 LIST_COPY_EMAIL_STR("Received on behalf of Address type", item->email->recip2_access); |
43 | 2368 break; |
2369 case 0x0078: // PR_RCVD_REPRESENTING_EMAIL_ADDRESS Recipient Address 2 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2370 LIST_COPY_EMAIL_STR("Received on behalf of Address", item->email->recip2_address); |
43 | 2371 break; |
2372 case 0x007D: // PR_TRANSPORT_MESSAGE_HEADERS Internet Header | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2373 LIST_COPY_EMAIL_STR("Internet Header", item->email->header); |
43 | 2374 break; |
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
|
2375 case 0x0C04: // PR_NDR_REASON_CODE |
152 | 2376 LIST_COPY_EMAIL_INT32("NDR reason code", item->email->ndr_reason_code); |
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
|
2377 break; |
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
|
2378 case 0x0C05: // PR_NDR_DIAG_CODE |
152 | 2379 LIST_COPY_EMAIL_INT32("NDR diag code", item->email->ndr_diag_code); |
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
|
2380 break; |
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
|
2381 case 0x0C06: // PR_NON_RECEIPT_NOTIFICATION_REQUESTED |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2382 DEBUG_INFO(("Non-Receipt Notification Requested -- NOT PROCESSED\n")); |
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
|
2383 break; |
43 | 2384 case 0x0C17: // PR_REPLY_REQUESTED |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2385 LIST_COPY_EMAIL_BOOL("Reply Requested", item->email->reply_requested); |
43 | 2386 break; |
2387 case 0x0C19: // PR_SENDER_ENTRYID Sender Structure 2 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2388 DEBUG_INFO(("Sender Structure 2 -- NOT PROCESSED\n")); |
43 | 2389 break; |
2390 case 0x0C1A: // PR_SENDER_NAME Name of Sender Structure 2 | |
308
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2391 LIST_COPY_EMAIL_STR("Name of Sender Structure 2", item->email->outlook_sender_name2); |
43 | 2392 break; |
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
|
2393 case 0x0C1B: // PR_SUPPLEMENTARY_INFO |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2394 LIST_COPY_EMAIL_STR("Supplementary info", item->email->supplementary_info); |
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
|
2395 break; |
43 | 2396 case 0x0C1D: // PR_SENDER_SEARCH_KEY Name of Sender Address 2 |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2397 LIST_COPY_EMAIL_STR("Name of Sender Address 2 (Sender search key)", item->email->outlook_sender2); |
43 | 2398 break; |
2399 case 0x0C1E: // PR_SENDER_ADDRTYPE Sender Address 2 access method | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2400 LIST_COPY_EMAIL_STR("Sender Address type", item->email->sender2_access); |
43 | 2401 break; |
2402 case 0x0C1F: // PR_SENDER_EMAIL_ADDRESS Sender Address 2 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2403 LIST_COPY_EMAIL_STR("Sender Address", item->email->sender2_address); |
43 | 2404 break; |
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
|
2405 case 0x0C20: // PR_NDR_STATUS_CODE |
152 | 2406 LIST_COPY_EMAIL_INT32("NDR status code", item->email->ndr_status_code); |
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
|
2407 break; |
43 | 2408 case 0x0E01: // PR_DELETE_AFTER_SUBMIT |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2409 LIST_COPY_EMAIL_BOOL("Delete after submit", item->email->delete_after_submit); |
43 | 2410 break; |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2411 case 0x0E02: // PR_DISPLAY_BCC BCC Addresses |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2412 LIST_COPY_EMAIL_STR("Display BCC Addresses", item->email->bcc_address); |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2413 break; |
43 | 2414 case 0x0E03: // PR_DISPLAY_CC CC Addresses |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2415 LIST_COPY_EMAIL_STR("Display CC Addresses", item->email->cc_address); |
43 | 2416 break; |
2417 case 0x0E04: // PR_DISPLAY_TO Address Sent-To | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2418 LIST_COPY_EMAIL_STR("Display Sent-To Address", item->email->sentto_address); |
43 | 2419 break; |
2420 case 0x0E06: // PR_MESSAGE_DELIVERY_TIME Date 3 - Email Arrival Date | |
152 | 2421 LIST_COPY_EMAIL_TIME("Date 3 (Delivery Time)", item->email->arrival_date); |
43 | 2422 break; |
2423 case 0x0E07: // PR_MESSAGE_FLAGS Email Flag | |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2424 LIST_COPY_EMAIL_INT32("Message Flags", item->flags); |
43 | 2425 break; |
2426 case 0x0E08: // PR_MESSAGE_SIZE Total size of a message object | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2427 LIST_COPY_INT32("Message Size", item->message_size); |
43 | 2428 break; |
2429 case 0x0E0A: // PR_SENTMAIL_ENTRYID | |
2430 // folder that this message is sent to after submission | |
152 | 2431 LIST_COPY_EMAIL_ENTRYID("Sentmail EntryID", item->email->sentmail_folder); |
43 | 2432 break; |
308
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2433 case 0x0E1D: // PR_NORMALIZED_SUBJECT |
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2434 LIST_COPY_EMAIL_STR("Normalized subject", item->email->outlook_normalized_subject); |
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2435 break; |
43 | 2436 case 0x0E1F: // PR_RTF_IN_SYNC |
2437 // True means that the rtf version is same as text body | |
2438 // False means rtf version is more up-to-date than text body | |
2439 // if this value doesn't exist, text body is more up-to-date than rtf and | |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2440 // cannot update to the rtf |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2441 LIST_COPY_EMAIL_BOOL("Compressed RTF in Sync", item->email->rtf_in_sync); |
43 | 2442 break; |
2443 case 0x0E20: // PR_ATTACH_SIZE binary Attachment data in record | |
2444 NULL_CHECK(attach); | |
152 | 2445 LIST_COPY_INT32("Attachment Size", t); |
269
5ca87faa020b
attachment might have a secondary list of mapi elements included a size element which overwrote the real size from the primary list of mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
268
diff
changeset
|
2446 // ignore this. we either get data and size from 0x3701 |
5ca87faa020b
attachment might have a secondary list of mapi elements included a size element which overwrote the real size from the primary list of mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
268
diff
changeset
|
2447 // or id codes from 0x3701 or 0x67f2 |
43 | 2448 break; |
2449 case 0x0FF9: // PR_RECORD_KEY Record Header 1 | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2450 LIST_COPY_BIN(item->record_key); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2451 DEBUG_INFO(("Record Key\n")); |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2452 DEBUG_HEXDUMP(item->record_key.data, item->record_key.size); |
43 | 2453 break; |
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
|
2454 case 0x1000: // PR_BODY |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2455 LIST_COPY_STR("Plain Text body", item->body); |
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
|
2456 break; |
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
|
2457 case 0x1001: // PR_REPORT_TEXT |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2458 LIST_COPY_EMAIL_STR("Report Text", item->email->report_text); |
43 | 2459 break; |
2460 case 0x1006: // PR_RTF_SYNC_BODY_CRC | |
152 | 2461 LIST_COPY_EMAIL_INT32("RTF Sync Body CRC", item->email->rtf_body_crc); |
43 | 2462 break; |
2463 case 0x1007: // PR_RTF_SYNC_BODY_COUNT | |
2464 // a count of the *significant* charcters in the rtf body. Doesn't count | |
2465 // whitespace and other ignorable characters | |
152 | 2466 LIST_COPY_EMAIL_INT32("RTF Sync Body character count", item->email->rtf_body_char_count); |
43 | 2467 break; |
2468 case 0x1008: // PR_RTF_SYNC_BODY_TAG | |
2469 // the first couple of lines of RTF body so that after modification, then beginning can | |
2470 // once again be found | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2471 LIST_COPY_EMAIL_STR("RTF Sync body tag", item->email->rtf_body_tag); |
43 | 2472 break; |
152 | 2473 case 0x1009: // PR_RTF_COMPRESSED - rtf data is lzw compressed |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2474 LIST_COPY_EMAIL_BIN("RTF Compressed body", item->email->rtf_compressed); |
43 | 2475 break; |
2476 case 0x1010: // PR_RTF_SYNC_PREFIX_COUNT | |
2477 // a count of the ignored characters before the first significant character | |
152 | 2478 LIST_COPY_EMAIL_INT32("RTF whitespace prefix count", item->email->rtf_ws_prefix_count); |
43 | 2479 break; |
2480 case 0x1011: // PR_RTF_SYNC_TRAILING_COUNT | |
2481 // a count of the ignored characters after the last significant character | |
152 | 2482 LIST_COPY_EMAIL_INT32("RTF whitespace tailing count", item->email->rtf_ws_trailing_count); |
43 | 2483 break; |
2484 case 0x1013: // HTML body | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2485 LIST_COPY_EMAIL_STR("HTML body", item->email->htmlbody); |
43 | 2486 break; |
2487 case 0x1035: // Message ID | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2488 LIST_COPY_EMAIL_STR("Message ID", item->email->messageid); |
43 | 2489 break; |
2490 case 0x1042: // in-reply-to | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2491 LIST_COPY_EMAIL_STR("In-Reply-To", item->email->in_reply_to); |
43 | 2492 break; |
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
130
diff
changeset
|
2493 case 0x1046: // Return Path - this seems to be the message-id of the rfc822 mail that is being returned |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2494 LIST_COPY_EMAIL_STR("Return Path", item->email->return_path_address); |
43 | 2495 break; |
2496 case 0x3001: // PR_DISPLAY_NAME File As | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2497 LIST_COPY_STR("Display Name", item->file_as); |
43 | 2498 break; |
2499 case 0x3002: // PR_ADDRTYPE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2500 LIST_COPY_CONTACT_STR("Address Type", item->contact->address1_transport); |
43 | 2501 break; |
2502 case 0x3003: // PR_EMAIL_ADDRESS | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2503 LIST_COPY_CONTACT_STR("Contact email Address", item->contact->address1); |
43 | 2504 break; |
2505 case 0x3004: // PR_COMMENT Comment for item - usually folders | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2506 LIST_COPY_STR("Comment", item->comment); |
43 | 2507 break; |
2508 case 0x3007: // PR_CREATION_TIME Date 4 - Creation Date? | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2509 LIST_COPY_TIME("Date 4 (Item Creation Date)", item->create_date); |
43 | 2510 break; |
2511 case 0x3008: // PR_LAST_MODIFICATION_TIME Date 5 - Modify Date | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2512 LIST_COPY_TIME("Date 5 (Modify Date)", item->modify_date); |
43 | 2513 break; |
2514 case 0x300B: // PR_SEARCH_KEY Record Header 2 | |
308
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2515 LIST_COPY_EMAIL_STR("Record Search 2", item->email->outlook_search_key); |
43 | 2516 break; |
2517 case 0x35DF: // PR_VALID_FOLDER_MASK | |
152 | 2518 LIST_COPY_STORE_INT32("Valid Folder Mask", item->message_store->valid_mask); |
43 | 2519 break; |
2520 case 0x35E0: // PR_IPM_SUBTREE_ENTRYID Top of Personal Folder Record | |
152 | 2521 LIST_COPY_STORE_ENTRYID("Top of Personal Folder Record", item->message_store->top_of_personal_folder); |
43 | 2522 break; |
51 | 2523 case 0x35E2: // PR_IPM_OUTBOX_ENTRYID |
152 | 2524 LIST_COPY_STORE_ENTRYID("Default Outbox Folder record", item->message_store->default_outbox_folder); |
51 | 2525 break; |
2526 case 0x35E3: // PR_IPM_WASTEBASKET_ENTRYID | |
152 | 2527 LIST_COPY_STORE_ENTRYID("Deleted Items Folder record", item->message_store->deleted_items_folder); |
43 | 2528 break; |
51 | 2529 case 0x35E4: // PR_IPM_SENTMAIL_ENTRYID |
152 | 2530 LIST_COPY_STORE_ENTRYID("Sent Items Folder record", item->message_store->sent_items_folder); |
51 | 2531 break; |
2532 case 0x35E5: // PR_VIEWS_ENTRYID | |
152 | 2533 LIST_COPY_STORE_ENTRYID("User Views Folder record", item->message_store->user_views_folder); |
51 | 2534 break; |
2535 case 0x35E6: // PR_COMMON_VIEWS_ENTRYID | |
152 | 2536 LIST_COPY_STORE_ENTRYID("Common View Folder record", item->message_store->common_view_folder); |
51 | 2537 break; |
2538 case 0x35E7: // PR_FINDER_ENTRYID | |
152 | 2539 LIST_COPY_STORE_ENTRYID("Search Root Folder record", item->message_store->search_root_folder); |
43 | 2540 break; |
2541 case 0x3602: // PR_CONTENT_COUNT Number of emails stored in a folder | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2542 LIST_COPY_FOLDER_INT32("Folder Email Count", item->folder->item_count); |
43 | 2543 break; |
2544 case 0x3603: // PR_CONTENT_UNREAD Number of unread emails | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2545 LIST_COPY_FOLDER_INT32("Unread Email Count", item->folder->unseen_item_count); |
43 | 2546 break; |
2547 case 0x360A: // PR_SUBFOLDERS Has children | |
2548 MALLOC_FOLDER(item); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2549 LIST_COPY_BOOL("Has Subfolders", item->folder->subfolder); |
43 | 2550 break; |
2551 case 0x3613: // PR_CONTAINER_CLASS IPF.x | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2552 LIST_COPY_CSTR(item->ascii_type); |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2553 if (pst_strincmp("IPF.Note", item->ascii_type, 8) == 0) |
43 | 2554 item->type = PST_TYPE_NOTE; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2555 else if (pst_strincmp("IPF.Imap", item->ascii_type, 8) == 0) |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
2556 item->type = PST_TYPE_NOTE; |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2557 else if (pst_stricmp("IPF", item->ascii_type) == 0) |
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2558 item->type = PST_TYPE_NOTE; |
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2559 else if (pst_strincmp("IPF.Contact", item->ascii_type, 11) == 0) |
43 | 2560 item->type = PST_TYPE_CONTACT; |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2561 else if (pst_strincmp("IPF.Journal", item->ascii_type, 11) == 0) |
43 | 2562 item->type = PST_TYPE_JOURNAL; |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2563 else if (pst_strincmp("IPF.Appointment", item->ascii_type, 15) == 0) |
43 | 2564 item->type = PST_TYPE_APPOINTMENT; |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2565 else if (pst_strincmp("IPF.StickyNote", item->ascii_type, 14) == 0) |
43 | 2566 item->type = PST_TYPE_STICKYNOTE; |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2567 else if (pst_strincmp("IPF.Task", item->ascii_type, 8) == 0) |
43 | 2568 item->type = PST_TYPE_TASK; |
2569 else | |
2570 item->type = PST_TYPE_OTHER; | |
2571 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2572 DEBUG_INFO(("Container class %s [%"PRIi32"]\n", item->ascii_type, item->type)); |
43 | 2573 break; |
2574 case 0x3617: // PR_ASSOC_CONTENT_COUNT | |
2575 // associated content are items that are attached to this folder | |
2576 // but are hidden from users | |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2577 LIST_COPY_FOLDER_INT32("Associated Content count", item->folder->assoc_count); |
43 | 2578 break; |
2579 case 0x3701: // PR_ATTACH_DATA_OBJ binary data of attachment | |
203 | 2580 DEBUG_INFO(("Binary Data [Size %i]\n", list->elements[x]->size)); |
43 | 2581 NULL_CHECK(attach); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2582 if (!list->elements[x]->data) { //special case |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2583 attach->id2_val = list->elements[x]->type; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2584 DEBUG_INFO(("Seen a Reference. The data hasn't been loaded yet. [%#"PRIx64"]\n", attach->id2_val)); |
43 | 2585 } else { |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2586 LIST_COPY_BIN(attach->data); |
43 | 2587 } |
2588 break; | |
2589 case 0x3704: // PR_ATTACH_FILENAME Attachment filename (8.3) | |
2590 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2591 LIST_COPY_STR("Attachment Filename", attach->filename1); |
43 | 2592 break; |
2593 case 0x3705: // PR_ATTACH_METHOD | |
2594 NULL_CHECK(attach); | |
152 | 2595 LIST_COPY_ENUM("Attachment method", attach->method, 0, 7, |
2596 "No Attachment", | |
2597 "Attach By Value", | |
2598 "Attach By Reference", | |
2599 "Attach by Reference Resolve", | |
2600 "Attach by Reference Only", | |
2601 "Embedded Message", | |
2602 "OLE"); | |
43 | 2603 break; |
2604 case 0x3707: // PR_ATTACH_LONG_FILENAME Attachment filename (long?) | |
2605 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2606 LIST_COPY_STR("Attachment Filename long", attach->filename2); |
43 | 2607 break; |
2608 case 0x370B: // PR_RENDERING_POSITION | |
2609 // position in characters that the attachment appears in the plain text body | |
2610 NULL_CHECK(attach); | |
152 | 2611 LIST_COPY_INT32("Attachment Position", attach->position); |
43 | 2612 break; |
2613 case 0x370E: // PR_ATTACH_MIME_TAG Mime type of encoding | |
2614 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2615 LIST_COPY_STR("Attachment mime encoding", attach->mimetype); |
43 | 2616 break; |
2617 case 0x3710: // PR_ATTACH_MIME_SEQUENCE | |
2618 // sequence number for mime parts. Includes body | |
2619 NULL_CHECK(attach); | |
152 | 2620 LIST_COPY_INT32("Attachment Mime Sequence", attach->sequence); |
43 | 2621 break; |
352
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2622 case 0x3712: // PR_ATTACH_CONTENT_ID |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2623 // content identification header (Content-ID) |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2624 NULL_CHECK(attach); |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2625 LIST_COPY_STR("Content ID", attach->content_id); |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2626 break; |
43 | 2627 case 0x3A00: // PR_ACCOUNT |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2628 LIST_COPY_CONTACT_STR("Contact's Account name", item->contact->account_name); |
43 | 2629 break; |
2630 case 0x3A01: // PR_ALTERNATE_RECIPIENT | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2631 DEBUG_INFO(("Contact Alternate Recipient - NOT PROCESSED\n")); |
43 | 2632 break; |
2633 case 0x3A02: // PR_CALLBACK_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2634 LIST_COPY_CONTACT_STR("Callback telephone number", item->contact->callback_phone); |
43 | 2635 break; |
2636 case 0x3A03: // PR_CONVERSION_PROHIBITED | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2637 LIST_COPY_EMAIL_BOOL("Message Conversion Prohibited", item->email->conversion_prohibited); |
43 | 2638 break; |
2639 case 0x3A05: // PR_GENERATION suffix | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2640 LIST_COPY_CONTACT_STR("Contacts Suffix", item->contact->suffix); |
43 | 2641 break; |
2642 case 0x3A06: // PR_GIVEN_NAME Contact's first name | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2643 LIST_COPY_CONTACT_STR("Contacts First Name", item->contact->first_name); |
43 | 2644 break; |
2645 case 0x3A07: // PR_GOVERNMENT_ID_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2646 LIST_COPY_CONTACT_STR("Contacts Government ID Number", item->contact->gov_id); |
43 | 2647 break; |
2648 case 0x3A08: // PR_BUSINESS_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2649 LIST_COPY_CONTACT_STR("Business Telephone Number", item->contact->business_phone); |
43 | 2650 break; |
2651 case 0x3A09: // PR_HOME_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2652 LIST_COPY_CONTACT_STR("Home Telephone Number", item->contact->home_phone); |
43 | 2653 break; |
2654 case 0x3A0A: // PR_INITIALS Contact's Initials | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2655 LIST_COPY_CONTACT_STR("Contacts Initials", item->contact->initials); |
43 | 2656 break; |
2657 case 0x3A0B: // PR_KEYWORD | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2658 LIST_COPY_CONTACT_STR("Keyword", item->contact->keyword); |
43 | 2659 break; |
2660 case 0x3A0C: // PR_LANGUAGE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2661 LIST_COPY_CONTACT_STR("Contact's Language", item->contact->language); |
43 | 2662 break; |
2663 case 0x3A0D: // PR_LOCATION | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2664 LIST_COPY_CONTACT_STR("Contact's Location", item->contact->location); |
43 | 2665 break; |
2666 case 0x3A0E: // PR_MAIL_PERMISSION - Can the recipient receive and send email | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2667 LIST_COPY_CONTACT_BOOL("Mail Permission", item->contact->mail_permission); |
43 | 2668 break; |
2669 case 0x3A0F: // PR_MHS_COMMON_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2670 LIST_COPY_CONTACT_STR("MHS Common Name", item->contact->common_name); |
43 | 2671 break; |
2672 case 0x3A10: // PR_ORGANIZATIONAL_ID_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2673 LIST_COPY_CONTACT_STR("Organizational ID #", item->contact->org_id); |
43 | 2674 break; |
2675 case 0x3A11: // PR_SURNAME Contact's Surname | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2676 LIST_COPY_CONTACT_STR("Contacts Surname", item->contact->surname); |
43 | 2677 break; |
2678 case 0x3A12: // PR_ORIGINAL_ENTRY_ID | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2679 DEBUG_INFO(("Original Entry ID - NOT PROCESSED\n")); |
43 | 2680 break; |
2681 case 0x3A13: // PR_ORIGINAL_DISPLAY_NAME | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2682 DEBUG_INFO(("Original Display Name - NOT PROCESSED\n")); |
43 | 2683 break; |
2684 case 0x3A14: // PR_ORIGINAL_SEARCH_KEY | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2685 DEBUG_INFO(("Original Search Key - NOT PROCESSED\n")); |
43 | 2686 break; |
2687 case 0x3A15: // PR_POSTAL_ADDRESS | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2688 LIST_COPY_CONTACT_STR("Default Postal Address", item->contact->def_postal_address); |
43 | 2689 break; |
2690 case 0x3A16: // PR_COMPANY_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2691 LIST_COPY_CONTACT_STR("Company Name", item->contact->company_name); |
43 | 2692 break; |
2693 case 0x3A17: // PR_TITLE - Job Title | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2694 LIST_COPY_CONTACT_STR("Job Title", item->contact->job_title); |
43 | 2695 break; |
2696 case 0x3A18: // PR_DEPARTMENT_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2697 LIST_COPY_CONTACT_STR("Department Name", item->contact->department); |
43 | 2698 break; |
2699 case 0x3A19: // PR_OFFICE_LOCATION | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2700 LIST_COPY_CONTACT_STR("Office Location", item->contact->office_loc); |
43 | 2701 break; |
2702 case 0x3A1A: // PR_PRIMARY_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2703 LIST_COPY_CONTACT_STR("Primary Telephone", item->contact->primary_phone); |
43 | 2704 break; |
2705 case 0x3A1B: // PR_BUSINESS2_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2706 LIST_COPY_CONTACT_STR("Business Phone Number 2", item->contact->business_phone2); |
43 | 2707 break; |
2708 case 0x3A1C: // PR_MOBILE_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2709 LIST_COPY_CONTACT_STR("Mobile Phone Number", item->contact->mobile_phone); |
43 | 2710 break; |
2711 case 0x3A1D: // PR_RADIO_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2712 LIST_COPY_CONTACT_STR("Radio Phone Number", item->contact->radio_phone); |
43 | 2713 break; |
2714 case 0x3A1E: // PR_CAR_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2715 LIST_COPY_CONTACT_STR("Car Phone Number", item->contact->car_phone); |
43 | 2716 break; |
2717 case 0x3A1F: // PR_OTHER_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2718 LIST_COPY_CONTACT_STR("Other Phone Number", item->contact->other_phone); |
43 | 2719 break; |
2720 case 0x3A20: // PR_TRANSMITTABLE_DISPLAY_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2721 LIST_COPY_CONTACT_STR("Transmittable Display Name", item->contact->transmittable_display_name); |
43 | 2722 break; |
2723 case 0x3A21: // PR_PAGER_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2724 LIST_COPY_CONTACT_STR("Pager Phone Number", item->contact->pager_phone); |
43 | 2725 break; |
2726 case 0x3A22: // PR_USER_CERTIFICATE | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2727 DEBUG_INFO(("User Certificate - NOT PROCESSED\n")); |
43 | 2728 break; |
2729 case 0x3A23: // PR_PRIMARY_FAX_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2730 LIST_COPY_CONTACT_STR("Primary Fax Number", item->contact->primary_fax); |
43 | 2731 break; |
2732 case 0x3A24: // PR_BUSINESS_FAX_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2733 LIST_COPY_CONTACT_STR("Business Fax Number", item->contact->business_fax); |
43 | 2734 break; |
2735 case 0x3A25: // PR_HOME_FAX_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2736 LIST_COPY_CONTACT_STR("Home Fax Number", item->contact->home_fax); |
43 | 2737 break; |
2738 case 0x3A26: // PR_BUSINESS_ADDRESS_COUNTRY | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2739 LIST_COPY_CONTACT_STR("Business Address Country", item->contact->business_country); |
43 | 2740 break; |
2741 case 0x3A27: // PR_BUSINESS_ADDRESS_CITY | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2742 LIST_COPY_CONTACT_STR("Business Address City", item->contact->business_city); |
43 | 2743 break; |
2744 case 0x3A28: // PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2745 LIST_COPY_CONTACT_STR("Business Address State", item->contact->business_state); |
43 | 2746 break; |
2747 case 0x3A29: // PR_BUSINESS_ADDRESS_STREET | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2748 LIST_COPY_CONTACT_STR("Business Address Street", item->contact->business_street); |
43 | 2749 break; |
2750 case 0x3A2A: // PR_BUSINESS_POSTAL_CODE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2751 LIST_COPY_CONTACT_STR("Business Postal Code", item->contact->business_postal_code); |
43 | 2752 break; |
2753 case 0x3A2B: // PR_BUSINESS_PO_BOX | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2754 LIST_COPY_CONTACT_STR("Business PO Box", item->contact->business_po_box); |
43 | 2755 break; |
2756 case 0x3A2C: // PR_TELEX_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2757 LIST_COPY_CONTACT_STR("Telex Number", item->contact->telex); |
43 | 2758 break; |
2759 case 0x3A2D: // PR_ISDN_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2760 LIST_COPY_CONTACT_STR("ISDN Number", item->contact->isdn_phone); |
43 | 2761 break; |
2762 case 0x3A2E: // PR_ASSISTANT_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2763 LIST_COPY_CONTACT_STR("Assistant Phone Number", item->contact->assistant_phone); |
43 | 2764 break; |
2765 case 0x3A2F: // PR_HOME2_TELEPHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2766 LIST_COPY_CONTACT_STR("Home Phone 2", item->contact->home_phone2); |
43 | 2767 break; |
2768 case 0x3A30: // PR_ASSISTANT | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2769 LIST_COPY_CONTACT_STR("Assistant's Name", item->contact->assistant_name); |
43 | 2770 break; |
2771 case 0x3A40: // PR_SEND_RICH_INFO | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2772 LIST_COPY_CONTACT_BOOL("Can receive Rich Text", item->contact->rich_text); |
43 | 2773 break; |
2774 case 0x3A41: // PR_WEDDING_ANNIVERSARY | |
152 | 2775 LIST_COPY_CONTACT_TIME("Wedding Anniversary", item->contact->wedding_anniversary); |
43 | 2776 break; |
2777 case 0x3A42: // PR_BIRTHDAY | |
152 | 2778 LIST_COPY_CONTACT_TIME("Birthday", item->contact->birthday); |
43 | 2779 break; |
2780 case 0x3A43: // PR_HOBBIES | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2781 LIST_COPY_CONTACT_STR("Hobbies", item->contact->hobbies); |
43 | 2782 break; |
2783 case 0x3A44: // PR_MIDDLE_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2784 LIST_COPY_CONTACT_STR("Middle Name", item->contact->middle_name); |
43 | 2785 break; |
2786 case 0x3A45: // PR_DISPLAY_NAME_PREFIX | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2787 LIST_COPY_CONTACT_STR("Display Name Prefix (Title)", item->contact->display_name_prefix); |
43 | 2788 break; |
2789 case 0x3A46: // PR_PROFESSION | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2790 LIST_COPY_CONTACT_STR("Profession", item->contact->profession); |
43 | 2791 break; |
2792 case 0x3A47: // PR_PREFERRED_BY_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2793 LIST_COPY_CONTACT_STR("Preferred By Name", item->contact->pref_name); |
43 | 2794 break; |
2795 case 0x3A48: // PR_SPOUSE_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2796 LIST_COPY_CONTACT_STR("Spouse's Name", item->contact->spouse_name); |
43 | 2797 break; |
2798 case 0x3A49: // PR_COMPUTER_NETWORK_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2799 LIST_COPY_CONTACT_STR("Computer Network Name", item->contact->computer_name); |
43 | 2800 break; |
2801 case 0x3A4A: // PR_CUSTOMER_ID | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2802 LIST_COPY_CONTACT_STR("Customer ID", item->contact->customer_id); |
43 | 2803 break; |
2804 case 0x3A4B: // PR_TTYTDD_PHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2805 LIST_COPY_CONTACT_STR("TTY/TDD Phone", item->contact->ttytdd_phone); |
43 | 2806 break; |
2807 case 0x3A4C: // PR_FTP_SITE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2808 LIST_COPY_CONTACT_STR("Ftp Site", item->contact->ftp_site); |
43 | 2809 break; |
2810 case 0x3A4D: // PR_GENDER | |
152 | 2811 LIST_COPY_CONTACT_ENUM16("Gender", item->contact->gender, 0, 3, "Unspecified", "Female", "Male"); |
43 | 2812 break; |
2813 case 0x3A4E: // PR_MANAGER_NAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2814 LIST_COPY_CONTACT_STR("Manager's Name", item->contact->manager_name); |
43 | 2815 break; |
2816 case 0x3A4F: // PR_NICKNAME | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2817 LIST_COPY_CONTACT_STR("Nickname", item->contact->nickname); |
43 | 2818 break; |
2819 case 0x3A50: // PR_PERSONAL_HOME_PAGE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2820 LIST_COPY_CONTACT_STR("Personal Home Page", item->contact->personal_homepage); |
43 | 2821 break; |
2822 case 0x3A51: // PR_BUSINESS_HOME_PAGE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2823 LIST_COPY_CONTACT_STR("Business Home Page", item->contact->business_homepage); |
43 | 2824 break; |
2825 case 0x3A57: // PR_COMPANY_MAIN_PHONE_NUMBER | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2826 LIST_COPY_CONTACT_STR("Company Main Phone", item->contact->company_main_phone); |
43 | 2827 break; |
2828 case 0x3A58: // PR_CHILDRENS_NAMES | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2829 DEBUG_INFO(("Children's Names - NOT PROCESSED\n")); |
43 | 2830 break; |
2831 case 0x3A59: // PR_HOME_ADDRESS_CITY | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2832 LIST_COPY_CONTACT_STR("Home Address City", item->contact->home_city); |
43 | 2833 break; |
2834 case 0x3A5A: // PR_HOME_ADDRESS_COUNTRY | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2835 LIST_COPY_CONTACT_STR("Home Address Country", item->contact->home_country); |
43 | 2836 break; |
2837 case 0x3A5B: // PR_HOME_ADDRESS_POSTAL_CODE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2838 LIST_COPY_CONTACT_STR("Home Address Postal Code", item->contact->home_postal_code); |
43 | 2839 break; |
2840 case 0x3A5C: // PR_HOME_ADDRESS_STATE_OR_PROVINCE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2841 LIST_COPY_CONTACT_STR("Home Address State or Province", item->contact->home_state); |
43 | 2842 break; |
2843 case 0x3A5D: // PR_HOME_ADDRESS_STREET | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2844 LIST_COPY_CONTACT_STR("Home Address Street", item->contact->home_street); |
43 | 2845 break; |
2846 case 0x3A5E: // PR_HOME_ADDRESS_POST_OFFICE_BOX | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2847 LIST_COPY_CONTACT_STR("Home Address Post Office Box", item->contact->home_po_box); |
43 | 2848 break; |
2849 case 0x3A5F: // PR_OTHER_ADDRESS_CITY | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2850 LIST_COPY_CONTACT_STR("Other Address City", item->contact->other_city); |
43 | 2851 break; |
2852 case 0x3A60: // PR_OTHER_ADDRESS_COUNTRY | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2853 LIST_COPY_CONTACT_STR("Other Address Country", item->contact->other_country); |
43 | 2854 break; |
2855 case 0x3A61: // PR_OTHER_ADDRESS_POSTAL_CODE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2856 LIST_COPY_CONTACT_STR("Other Address Postal Code", item->contact->other_postal_code); |
43 | 2857 break; |
2858 case 0x3A62: // PR_OTHER_ADDRESS_STATE_OR_PROVINCE | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2859 LIST_COPY_CONTACT_STR("Other Address State", item->contact->other_state); |
43 | 2860 break; |
2861 case 0x3A63: // PR_OTHER_ADDRESS_STREET | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2862 LIST_COPY_CONTACT_STR("Other Address Street", item->contact->other_street); |
43 | 2863 break; |
2864 case 0x3A64: // PR_OTHER_ADDRESS_POST_OFFICE_BOX | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2865 LIST_COPY_CONTACT_STR("Other Address Post Office box", item->contact->other_po_box); |
43 | 2866 break; |
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
|
2867 case 0x3FDE: // PR_INTERNET_CPID |
152 | 2868 LIST_COPY_INT32("Internet code page", item->internet_cpid); |
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
|
2869 break; |
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
|
2870 case 0x3FFD: // PR_MESSAGE_CODEPAGE |
152 | 2871 LIST_COPY_INT32("Message code page", item->message_codepage); |
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
|
2872 break; |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2873 case 0x65E3: // PR_PREDECESSOR_CHANGE_LIST |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2874 LIST_COPY_BIN(item->predecessor_change); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2875 DEBUG_INFO(("Predecessor Change\n")); |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2876 DEBUG_HEXDUMP(item->predecessor_change.data, item->predecessor_change.size); |
43 | 2877 break; |
267
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2878 case 0x67F2: // ID2 value of the attachment |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2879 NULL_CHECK(attach); |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2880 LIST_COPY_INT32("Attachment ID2 value", ut); |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2881 attach->id2_val = ut; |
43 | 2882 break; |
2883 case 0x67FF: // Extra Property Identifier (Password CheckSum) | |
152 | 2884 LIST_COPY_STORE_INT32("Password checksum", item->message_store->pwd_chksum); |
43 | 2885 break; |
2886 case 0x6F02: // Secure HTML Body | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2887 LIST_COPY_EMAIL_BIN("Secure HTML Body", item->email->encrypted_htmlbody); |
43 | 2888 break; |
2889 case 0x6F04: // Secure Text Body | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2890 LIST_COPY_EMAIL_BIN("Secure Text Body", item->email->encrypted_body); |
43 | 2891 break; |
2892 case 0x7C07: // top of folders ENTRYID | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2893 LIST_COPY_STORE_ENTRYID("Top of folders RecID", item->message_store->top_of_folder); |
43 | 2894 break; |
2895 case 0x8005: // Contact's Fullname | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2896 LIST_COPY_CONTACT_STR("Contact Fullname", item->contact->fullname); |
43 | 2897 break; |
2898 case 0x801A: // Full Home Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2899 LIST_COPY_CONTACT_STR("Home Address", item->contact->home_address); |
43 | 2900 break; |
2901 case 0x801B: // Full Business Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2902 LIST_COPY_CONTACT_STR("Business Address", item->contact->business_address); |
43 | 2903 break; |
2904 case 0x801C: // Full Other Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2905 LIST_COPY_CONTACT_STR("Other Address", item->contact->other_address); |
43 | 2906 break; |
51 | 2907 case 0x8045: // Work address street |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2908 LIST_COPY_CONTACT_STR("Work address street", item->contact->work_address_street); |
51 | 2909 break; |
2910 case 0x8046: // Work address city | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2911 LIST_COPY_CONTACT_STR("Work address city", item->contact->work_address_city); |
51 | 2912 break; |
2913 case 0x8047: // Work address state | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2914 LIST_COPY_CONTACT_STR("Work address state", item->contact->work_address_state); |
51 | 2915 break; |
2916 case 0x8048: // Work address postalcode | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2917 LIST_COPY_CONTACT_STR("Work address postalcode", item->contact->work_address_postalcode); |
51 | 2918 break; |
2919 case 0x8049: // Work address country | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2920 LIST_COPY_CONTACT_STR("Work address country", item->contact->work_address_country); |
51 | 2921 break; |
2922 case 0x804A: // Work address postofficebox | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2923 LIST_COPY_CONTACT_STR("Work address postofficebox", item->contact->work_address_postofficebox); |
51 | 2924 break; |
43 | 2925 case 0x8082: // Email Address 1 Transport |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2926 LIST_COPY_CONTACT_STR("Email Address 1 Transport", item->contact->address1_transport); |
43 | 2927 break; |
2928 case 0x8083: // Email Address 1 Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2929 LIST_COPY_CONTACT_STR("Email Address 1 Address", item->contact->address1); |
43 | 2930 break; |
2931 case 0x8084: // Email Address 1 Description | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2932 LIST_COPY_CONTACT_STR("Email Address 1 Description", item->contact->address1_desc); |
43 | 2933 break; |
2934 case 0x8085: // Email Address 1 Record | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2935 LIST_COPY_CONTACT_STR("Email Address 1 Record", item->contact->address1a); |
43 | 2936 break; |
2937 case 0x8092: // Email Address 2 Transport | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2938 LIST_COPY_CONTACT_STR("Email Address 2 Transport", item->contact->address2_transport); |
43 | 2939 break; |
2940 case 0x8093: // Email Address 2 Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2941 LIST_COPY_CONTACT_STR("Email Address 2 Address", item->contact->address2); |
43 | 2942 break; |
2943 case 0x8094: // Email Address 2 Description | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2944 LIST_COPY_CONTACT_STR("Email Address 2 Description", item->contact->address2_desc); |
43 | 2945 break; |
2946 case 0x8095: // Email Address 2 Record | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2947 LIST_COPY_CONTACT_STR("Email Address 2 Record", item->contact->address2a); |
43 | 2948 break; |
2949 case 0x80A2: // Email Address 3 Transport | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2950 LIST_COPY_CONTACT_STR("Email Address 3 Transport", item->contact->address3_transport); |
43 | 2951 break; |
2952 case 0x80A3: // Email Address 3 Address | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2953 LIST_COPY_CONTACT_STR("Email Address 3 Address", item->contact->address3); |
43 | 2954 break; |
2955 case 0x80A4: // Email Address 3 Description | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2956 LIST_COPY_CONTACT_STR("Email Address 3 Description", item->contact->address3_desc); |
43 | 2957 break; |
2958 case 0x80A5: // Email Address 3 Record | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2959 LIST_COPY_CONTACT_STR("Email Address 3 Record", item->contact->address3a); |
43 | 2960 break; |
2961 case 0x80D8: // Internet Free/Busy | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2962 LIST_COPY_CONTACT_STR("Internet Free/Busy", item->contact->free_busy_address); |
43 | 2963 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2964 case 0x8205: // PR_OUTLOOK_EVENT_SHOW_TIME_AS |
154
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2965 LIST_COPY_APPT_ENUM("Appointment shows as", item->appointment->showas, 0, 4, |
581fab9f1dc7
avoid emitting bogus empty email messages into contacts and calendar files
Carl Byington <carl@five-ten-sg.com>
parents:
153
diff
changeset
|
2966 "Free", "Tentative", "Busy", "Out Of Office"); |
43 | 2967 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2968 case 0x8208: // PR_OUTLOOK_EVENT_LOCATION |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2969 LIST_COPY_APPT_STR("Appointment Location", item->appointment->location); |
43 | 2970 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2971 case 0x820d: // PR_OUTLOOK_EVENT_START_DATE |
152 | 2972 LIST_COPY_APPT_TIME("Appointment Date Start", item->appointment->start); |
50 | 2973 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2974 case 0x820e: // PR_OUTLOOK_EVENT_START_END |
152 | 2975 LIST_COPY_APPT_TIME("Appointment Date End", item->appointment->end); |
50 | 2976 break; |
43 | 2977 case 0x8214: // Label for an appointment |
152 | 2978 LIST_COPY_APPT_ENUM("Label for appointment", item->appointment->label, 0, 11, |
2979 "None", | |
2980 "Important", | |
2981 "Business", | |
2982 "Personal", | |
2983 "Vacation", | |
2984 "Must Attend", | |
2985 "Travel Required", | |
2986 "Needs Preparation", | |
2987 "Birthday", | |
2988 "Anniversary", | |
2989 "Phone Call"); | |
43 | 2990 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2991 case 0x8215: // PR_OUTLOOK_EVENT_ALL_DAY |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2992 LIST_COPY_APPT_BOOL("All day flag", item->appointment->all_day); |
43 | 2993 break; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2994 case 0x8216: // PR_OUTLOOK_EVENT_RECURRENCE_DATA |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2995 LIST_COPY_APPT_BIN("Appointment recurrence data", item->appointment->recurrence_data); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2996 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2997 case 0x8223: // PR_OUTLOOK_EVENT_IS_RECURRING |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2998 LIST_COPY_APPT_BOOL("Is recurring", item->appointment->is_recurring); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2999 break; |
50 | 3000 case 0x8231: // Recurrence type |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3001 LIST_COPY_APPT_ENUM("Appointment recurrence type ", item->appointment->recurrence_type, 0, 5, |
152 | 3002 "None", |
3003 "Daily", | |
3004 "Weekly", | |
3005 "Monthly", | |
3006 "Yearly"); | |
50 | 3007 break; |
3008 case 0x8232: // Recurrence description | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3009 LIST_COPY_APPT_STR("Appointment recurrence description", item->appointment->recurrence_description); |
50 | 3010 break; |
43 | 3011 case 0x8234: // TimeZone as String |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3012 LIST_COPY_APPT_STR("TimeZone of times", item->appointment->timezonestring); |
43 | 3013 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3014 case 0x8235: // PR_OUTLOOK_EVENT_RECURRENCE_START |
152 | 3015 LIST_COPY_APPT_TIME("Recurrence Start Date", item->appointment->recurrence_start); |
50 | 3016 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3017 case 0x8236: // PR_OUTLOOK_EVENT_RECURRENCE_END |
152 | 3018 LIST_COPY_APPT_TIME("Recurrence End Date", item->appointment->recurrence_end); |
50 | 3019 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3020 case 0x8501: // PR_OUTLOOK_COMMON_REMINDER_MINUTES_BEFORE |
152 | 3021 LIST_COPY_APPT_INT32("Alarm minutes", item->appointment->alarm_minutes); |
50 | 3022 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3023 case 0x8503: // PR_OUTLOOK_COMMON_REMINDER_SET |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3024 LIST_COPY_APPT_BOOL("Reminder alarm", item->appointment->alarm); |
50 | 3025 break; |
51 | 3026 case 0x8516: // Common start |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3027 DEBUG_INFO(("Common Start Date - %s\n", pst_fileTimeToAscii((FILETIME*)list->elements[x]->data, time_buffer))); |
43 | 3028 break; |
51 | 3029 case 0x8517: // Common end |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3030 DEBUG_INFO(("Common End Date - %s\n", pst_fileTimeToAscii((FILETIME*)list->elements[x]->data, time_buffer))); |
43 | 3031 break; |
50 | 3032 case 0x851f: // Play reminder sound filename |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3033 LIST_COPY_APPT_STR("Appointment reminder sound filename", item->appointment->alarm_filename); |
50 | 3034 break; |
43 | 3035 case 0x8530: // Followup |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3036 LIST_COPY_CONTACT_STR("Followup String", item->contact->followup); |
43 | 3037 break; |
3038 case 0x8534: // Mileage | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3039 LIST_COPY_CONTACT_STR("Mileage", item->contact->mileage); |
43 | 3040 break; |
3041 case 0x8535: // Billing Information | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3042 LIST_COPY_CONTACT_STR("Billing Information", item->contact->billing_information); |
43 | 3043 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3044 case 0x8554: // PR_OUTLOOK_VERSION |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3045 LIST_COPY_STR("Outlook Version", item->outlook_version); |
43 | 3046 break; |
3047 case 0x8560: // Appointment Reminder Time | |
152 | 3048 LIST_COPY_APPT_TIME("Appointment Reminder Time", item->appointment->reminder); |
43 | 3049 break; |
3050 case 0x8700: // Journal Type | |
152 | 3051 LIST_COPY_JOURNAL_STR("Journal Entry Type", item->journal->type); |
43 | 3052 break; |
3053 case 0x8706: // Journal Start date/time | |
152 | 3054 LIST_COPY_JOURNAL_TIME("Start Timestamp", item->journal->start); |
43 | 3055 break; |
3056 case 0x8708: // Journal End date/time | |
152 | 3057 LIST_COPY_JOURNAL_TIME("End Timestamp", item->journal->end); |
3058 break; | |
3059 case 0x8712: // Journal Type Description | |
3060 LIST_COPY_JOURNAL_STR("Journal description", item->journal->description); | |
43 | 3061 break; |
3062 default: | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3063 if (list->elements[x]->type == (uint32_t)0x0002) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3064 DEBUG_WARN(("Unknown type %#x 16bit int = %hi\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3065 *(int16_t*)list->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3066 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3067 } else if (list->elements[x]->type == (uint32_t)0x0003) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3068 DEBUG_WARN(("Unknown type %#x 32bit int = %i\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3069 *(int32_t*)list->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3070 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3071 } else if (list->elements[x]->type == (uint32_t)0x0004) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3072 DEBUG_WARN(("Unknown type %#x 4-byte floating [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3073 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3074 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3075 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3076 } else if (list->elements[x]->type == (uint32_t)0x0005) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3077 DEBUG_WARN(("Unknown type %#x double floating [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3078 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3079 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3080 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3081 } else if (list->elements[x]->type == (uint32_t)0x0006) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3082 DEBUG_WARN(("Unknown type %#x signed 64bit int = %"PRIi64"\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3083 *(int64_t*)list->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3084 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3085 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3086 } else if (list->elements[x]->type == (uint32_t)0x0007) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3087 DEBUG_WARN(("Unknown type %#x application time [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3088 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3089 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3090 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3091 } else if (list->elements[x]->type == (uint32_t)0x000a) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3092 DEBUG_WARN(("Unknown type %#x 32bit error value = %i\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3093 *(int32_t*)list->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3094 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3095 } else if (list->elements[x]->type == (uint32_t)0x000b) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3096 DEBUG_WARN(("Unknown type %#x 16bit boolean = %s [%hi]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3097 (*((int16_t*)list->elements[x]->data)!=0?"True":"False"), |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3098 *((int16_t*)list->elements[x]->data))); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3099 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3100 } else if (list->elements[x]->type == (uint32_t)0x000d) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3101 DEBUG_WARN(("Unknown type %#x Embedded object [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3102 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3103 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3104 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3105 } else if (list->elements[x]->type == (uint32_t)0x0014) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3106 DEBUG_WARN(("Unknown type %#x signed 64bit int = %"PRIi64"\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3107 *(int64_t*)list->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3108 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3109 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3110 } else if (list->elements[x]->type == (uint32_t)0x001e) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3111 DEBUG_WARN(("Unknown type %#x String Data = \"%s\"\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3112 list->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3113 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3114 } else if (list->elements[x]->type == (uint32_t)0x001f) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3115 DEBUG_WARN(("Unknown type %#x Unicode String Data [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3116 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3117 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3118 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3119 } else if (list->elements[x]->type == (uint32_t)0x0040) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3120 DEBUG_WARN(("Unknown type %#x Date = \"%s\"\n", list->elements[x]->mapi_id, |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
3121 pst_fileTimeToAscii((FILETIME*)list->elements[x]->data, time_buffer))); |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3122 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3123 } else if (list->elements[x]->type == (uint32_t)0x0048) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3124 DEBUG_WARN(("Unknown type %#x OLE GUID [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3125 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3126 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3127 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3128 } else if (list->elements[x]->type == (uint32_t)0x0102) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3129 DEBUG_WARN(("Unknown type %#x Binary Data [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3130 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3131 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3132 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3133 } else if (list->elements[x]->type == (uint32_t)0x1003) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3134 DEBUG_WARN(("Unknown type %#x Array of 32 bit values [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3135 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3136 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3137 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3138 } else if (list->elements[x]->type == (uint32_t)0x1014) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3139 DEBUG_WARN(("Unknown type %#x Array of 64 bit values [siize = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3140 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3141 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3142 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3143 } else if (list->elements[x]->type == (uint32_t)0x101e) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3144 DEBUG_WARN(("Unknown type %#x Array of Strings [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3145 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3146 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3147 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3148 } else if (list->elements[x]->type == (uint32_t)0x101f) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3149 DEBUG_WARN(("Unknown type %#x Array of Unicode Strings [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3150 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3151 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3152 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3153 } else if (list->elements[x]->type == (uint32_t)0x1102) { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3154 DEBUG_WARN(("Unknown type %#x Array of binary data blobs [size = %#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3155 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3156 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
51 | 3157 |
43 | 3158 } else { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3159 DEBUG_WARN(("Unknown type %#x Not Printable [%#x]\n", list->elements[x]->mapi_id, |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3160 list->elements[x]->type)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3161 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
43 | 3162 } |
51 | 3163 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3164 if (list->elements[x]->data) { |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3165 free(list->elements[x]->data); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3166 list->elements[x]->data = NULL; |
43 | 3167 } |
3168 } | |
3169 } | |
3170 list = list->next; | |
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
|
3171 if (attach) attach = attach->next; |
43 | 3172 } |
3173 DEBUG_RET(); | |
3174 return 0; | |
16 | 3175 } |
3176 | |
3177 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3178 static void pst_free_list(pst_mapi_object *list) { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3179 pst_mapi_object *l; |
46 | 3180 DEBUG_ENT("pst_free_list"); |
43 | 3181 while (list) { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3182 if (list->elements) { |
43 | 3183 int32_t x; |
3184 for (x=0; x < list->orig_count; x++) { | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3185 if (list->elements[x]) { |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3186 if (list->elements[x]->data) free(list->elements[x]->data); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3187 free(list->elements[x]); |
43 | 3188 } |
3189 } | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3190 free(list->elements); |
43 | 3191 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3192 l = list->next; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3193 free (list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3194 list = l; |
43 | 3195 } |
3196 DEBUG_RET(); | |
16 | 3197 } |
3198 | |
3199 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3200 static void pst_free_id2(pst_id2_tree * head) { |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3201 pst_id2_tree *t; |
46 | 3202 DEBUG_ENT("pst_free_id2"); |
43 | 3203 while (head) { |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3204 pst_free_id2(head->child); |
43 | 3205 t = head->next; |
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
|
3206 free(head); |
43 | 3207 head = t; |
3208 } | |
3209 DEBUG_RET(); | |
16 | 3210 } |
3211 | |
3212 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3213 static void pst_free_id (pst_index_ll *head) { |
43 | 3214 pst_index_ll *t; |
46 | 3215 DEBUG_ENT("pst_free_id"); |
43 | 3216 while (head) { |
3217 t = head->next; | |
3218 free(head); | |
3219 head = t; | |
3220 } | |
3221 DEBUG_RET(); | |
16 | 3222 } |
3223 | |
3224 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3225 static void pst_free_desc (pst_desc_tree *head) { |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3226 pst_desc_tree *t; |
46 | 3227 DEBUG_ENT("pst_free_desc"); |
43 | 3228 while (head) { |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3229 pst_free_desc(head->child); |
43 | 3230 t = head->next; |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3231 free(head); |
43 | 3232 head = t; |
3233 } | |
3234 DEBUG_RET(); | |
16 | 3235 } |
3236 | |
3237 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3238 static void pst_free_xattrib(pst_x_attrib_ll *x) { |
43 | 3239 pst_x_attrib_ll *t; |
46 | 3240 DEBUG_ENT("pst_free_xattrib"); |
43 | 3241 while (x) { |
3242 if (x->data) free(x->data); | |
3243 t = x->next; | |
3244 free(x); | |
3245 x = t; | |
3246 } | |
3247 DEBUG_RET(); | |
16 | 3248 } |
3249 | |
3250 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3251 static pst_id2_tree * pst_build_id2(pst_file *pf, pst_index_ll* list) { |
43 | 3252 pst_block_header block_head; |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3253 pst_id2_tree *head = NULL, *tail = NULL; |
46 | 3254 uint16_t x = 0; |
3255 char *b_ptr = NULL; | |
43 | 3256 char *buf = NULL; |
3257 pst_id2_assoc id2_rec; | |
3258 pst_index_ll *i_ptr = NULL; | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3259 pst_id2_tree *i2_ptr = NULL; |
46 | 3260 DEBUG_ENT("pst_build_id2"); |
43 | 3261 |
51 | 3262 if (pst_read_block_size(pf, list->offset, list->size, &buf) < list->size) { |
43 | 3263 //an error occured in block read |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3264 DEBUG_WARN(("block read error occured. offset = %#"PRIx64", size = %#"PRIx64"\n", list->offset, list->size)); |
43 | 3265 if (buf) free(buf); |
3266 DEBUG_RET(); | |
3267 return NULL; | |
3268 } | |
3269 DEBUG_HEXDUMPC(buf, list->size, 16); | |
3270 | |
3271 memcpy(&block_head, buf, sizeof(block_head)); | |
3272 LE16_CPU(block_head.type); | |
3273 LE16_CPU(block_head.count); | |
3274 | |
46 | 3275 if (block_head.type != (uint16_t)0x0002) { // some sort of constant? |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3276 DEBUG_WARN(("Unknown constant [%#hx] at start of id2 values [offset %#"PRIx64"].\n", block_head.type, list->offset)); |
43 | 3277 if (buf) free(buf); |
3278 DEBUG_RET(); | |
3279 return NULL; | |
3280 } | |
3281 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3282 DEBUG_INFO(("ID %#"PRIx64" is likely to be a description record. Count is %i (offset %#"PRIx64")\n", |
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:
163
diff
changeset
|
3283 list->i_id, block_head.count, list->offset)); |
43 | 3284 x = 0; |
46 | 3285 b_ptr = buf + ((pf->do_read64) ? 0x08 : 0x04); |
43 | 3286 while (x < block_head.count) { |
46 | 3287 b_ptr += pst_decode_assoc(pf, &id2_rec, b_ptr); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3288 DEBUG_INFO(("id2 = %#x, id = %#"PRIx64", child id = %#"PRIx64"\n", id2_rec.id2, id2_rec.id, id2_rec.child_id)); |
46 | 3289 if ((i_ptr = pst_getID(pf, id2_rec.id)) == NULL) { |
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
|
3290 DEBUG_WARN(("%#"PRIx64" - Not Found\n", id2_rec.id)); |
43 | 3291 } else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3292 DEBUG_INFO(("%#"PRIx64" - Offset %#"PRIx64", u1 %#"PRIx64", Size %"PRIi64"(%#"PRIx64")\n", |
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:
163
diff
changeset
|
3293 i_ptr->i_id, i_ptr->offset, i_ptr->u1, i_ptr->size, i_ptr->size)); |
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
|
3294 // add it to the tree |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3295 i2_ptr = (pst_id2_tree*) pst_malloc(sizeof(pst_id2_tree)); |
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
|
3296 i2_ptr->id2 = id2_rec.id2; |
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
|
3297 i2_ptr->id = i_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
|
3298 i2_ptr->child = NULL; |
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
|
3299 i2_ptr->next = NULL; |
43 | 3300 if (!head) head = i2_ptr; |
3301 if (tail) tail->next = i2_ptr; | |
3302 tail = i2_ptr; | |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
3303 if (id2_rec.child_id) { |
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
3304 if ((i_ptr = pst_getID(pf, id2_rec.child_id)) == NULL) { |
233
1d50ff3c5091
better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents:
231
diff
changeset
|
3305 DEBUG_WARN(("child id [%#"PRIx64"] not found\n", id2_rec.child_id)); |
43 | 3306 } |
3307 else { | |
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
|
3308 i2_ptr->child = pst_build_id2(pf, i_ptr); |
43 | 3309 } |
3310 } | |
3311 } | |
3312 x++; | |
3313 } | |
3314 if (buf) free (buf); | |
3315 DEBUG_RET(); | |
3316 return head; | |
16 | 3317 } |
3318 | |
3319 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3320 static void pst_free_attach(pst_item_attach *attach) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3321 while (attach) { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3322 pst_item_attach *t; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3323 SAFE_FREE_STR(attach->filename1); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3324 SAFE_FREE_STR(attach->filename2); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3325 SAFE_FREE_STR(attach->mimetype); |
354
843705c25b45
code cleanup; content-id in brackets
Carl Byington <carl@five-ten-sg.com>
parents:
352
diff
changeset
|
3326 SAFE_FREE_STR(attach->content_id); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3327 SAFE_FREE_BIN(attach->data); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3328 pst_free_id2(attach->id2_head); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3329 t = attach->next; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3330 free(attach); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3331 attach = t; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3332 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3333 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3334 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3335 |
46 | 3336 void pst_freeItem(pst_item *item) { |
43 | 3337 pst_item_extra_field *et; |
3338 | |
46 | 3339 DEBUG_ENT("pst_freeItem"); |
43 | 3340 if (item) { |
3341 if (item->email) { | |
3342 SAFE_FREE(item->email->arrival_date); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3343 SAFE_FREE_STR(item->email->cc_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3344 SAFE_FREE_STR(item->email->bcc_address); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3345 SAFE_FREE_BIN(item->email->conversation_index); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3346 SAFE_FREE_BIN(item->email->encrypted_body); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3347 SAFE_FREE_BIN(item->email->encrypted_htmlbody); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3348 SAFE_FREE_STR(item->email->header); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3349 SAFE_FREE_STR(item->email->htmlbody); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3350 SAFE_FREE_STR(item->email->in_reply_to); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3351 SAFE_FREE_STR(item->email->messageid); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3352 SAFE_FREE_STR(item->email->original_bcc); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3353 SAFE_FREE_STR(item->email->original_cc); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3354 SAFE_FREE_STR(item->email->original_to); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3355 SAFE_FREE_STR(item->email->outlook_recipient); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3356 SAFE_FREE_STR(item->email->outlook_recipient_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3357 SAFE_FREE_STR(item->email->outlook_recipient2); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3358 SAFE_FREE_STR(item->email->outlook_sender); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3359 SAFE_FREE_STR(item->email->outlook_sender_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3360 SAFE_FREE_STR(item->email->outlook_sender2); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3361 SAFE_FREE_STR(item->email->processed_subject); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3362 SAFE_FREE_STR(item->email->recip_access); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3363 SAFE_FREE_STR(item->email->recip_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3364 SAFE_FREE_STR(item->email->recip2_access); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3365 SAFE_FREE_STR(item->email->recip2_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3366 SAFE_FREE_STR(item->email->reply_to); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3367 SAFE_FREE_STR(item->email->rtf_body_tag); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3368 SAFE_FREE_BIN(item->email->rtf_compressed); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3369 SAFE_FREE_STR(item->email->return_path_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3370 SAFE_FREE_STR(item->email->sender_access); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3371 SAFE_FREE_STR(item->email->sender_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3372 SAFE_FREE_STR(item->email->sender2_access); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3373 SAFE_FREE_STR(item->email->sender2_address); |
43 | 3374 SAFE_FREE(item->email->sent_date); |
3375 SAFE_FREE(item->email->sentmail_folder); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3376 SAFE_FREE_STR(item->email->sentto_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3377 SAFE_FREE_STR(item->email->report_text); |
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
|
3378 SAFE_FREE(item->email->report_time); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3379 SAFE_FREE_STR(item->email->supplementary_info); |
328 | 3380 SAFE_FREE_STR(item->email->outlook_received_name1); |
3381 SAFE_FREE_STR(item->email->outlook_sender_name2); | |
3382 SAFE_FREE_STR(item->email->outlook_normalized_subject); | |
3383 SAFE_FREE_STR(item->email->outlook_search_key); | |
43 | 3384 free(item->email); |
3385 } | |
3386 if (item->folder) { | |
3387 free(item->folder); | |
3388 } | |
3389 if (item->message_store) { | |
51 | 3390 SAFE_FREE(item->message_store->top_of_personal_folder); |
3391 SAFE_FREE(item->message_store->default_outbox_folder); | |
43 | 3392 SAFE_FREE(item->message_store->deleted_items_folder); |
51 | 3393 SAFE_FREE(item->message_store->sent_items_folder); |
3394 SAFE_FREE(item->message_store->user_views_folder); | |
3395 SAFE_FREE(item->message_store->common_view_folder); | |
43 | 3396 SAFE_FREE(item->message_store->search_root_folder); |
3397 SAFE_FREE(item->message_store->top_of_folder); | |
3398 free(item->message_store); | |
3399 } | |
3400 if (item->contact) { | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3401 SAFE_FREE_STR(item->contact->account_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3402 SAFE_FREE_STR(item->contact->address1); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3403 SAFE_FREE_STR(item->contact->address1a); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3404 SAFE_FREE_STR(item->contact->address1_desc); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3405 SAFE_FREE_STR(item->contact->address1_transport); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3406 SAFE_FREE_STR(item->contact->address2); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3407 SAFE_FREE_STR(item->contact->address2a); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3408 SAFE_FREE_STR(item->contact->address2_desc); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3409 SAFE_FREE_STR(item->contact->address2_transport); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3410 SAFE_FREE_STR(item->contact->address3); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3411 SAFE_FREE_STR(item->contact->address3a); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3412 SAFE_FREE_STR(item->contact->address3_desc); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3413 SAFE_FREE_STR(item->contact->address3_transport); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3414 SAFE_FREE_STR(item->contact->assistant_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3415 SAFE_FREE_STR(item->contact->assistant_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3416 SAFE_FREE_STR(item->contact->billing_information); |
43 | 3417 SAFE_FREE(item->contact->birthday); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3418 SAFE_FREE_STR(item->contact->business_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3419 SAFE_FREE_STR(item->contact->business_city); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3420 SAFE_FREE_STR(item->contact->business_country); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3421 SAFE_FREE_STR(item->contact->business_fax); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3422 SAFE_FREE_STR(item->contact->business_homepage); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3423 SAFE_FREE_STR(item->contact->business_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3424 SAFE_FREE_STR(item->contact->business_phone2); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3425 SAFE_FREE_STR(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
|
3426 SAFE_FREE_STR(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
|
3427 SAFE_FREE_STR(item->contact->business_state); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3428 SAFE_FREE_STR(item->contact->business_street); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3429 SAFE_FREE_STR(item->contact->callback_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3430 SAFE_FREE_STR(item->contact->car_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3431 SAFE_FREE_STR(item->contact->company_main_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3432 SAFE_FREE_STR(item->contact->company_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3433 SAFE_FREE_STR(item->contact->computer_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3434 SAFE_FREE_STR(item->contact->customer_id); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3435 SAFE_FREE_STR(item->contact->def_postal_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3436 SAFE_FREE_STR(item->contact->department); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3437 SAFE_FREE_STR(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
|
3438 SAFE_FREE_STR(item->contact->first_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3439 SAFE_FREE_STR(item->contact->followup); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3440 SAFE_FREE_STR(item->contact->free_busy_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3441 SAFE_FREE_STR(item->contact->ftp_site); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3442 SAFE_FREE_STR(item->contact->fullname); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3443 SAFE_FREE_STR(item->contact->gov_id); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3444 SAFE_FREE_STR(item->contact->hobbies); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3445 SAFE_FREE_STR(item->contact->home_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3446 SAFE_FREE_STR(item->contact->home_city); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3447 SAFE_FREE_STR(item->contact->home_country); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3448 SAFE_FREE_STR(item->contact->home_fax); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3449 SAFE_FREE_STR(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
|
3450 SAFE_FREE_STR(item->contact->home_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3451 SAFE_FREE_STR(item->contact->home_phone2); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3452 SAFE_FREE_STR(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
|
3453 SAFE_FREE_STR(item->contact->home_state); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3454 SAFE_FREE_STR(item->contact->home_street); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3455 SAFE_FREE_STR(item->contact->initials); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3456 SAFE_FREE_STR(item->contact->isdn_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3457 SAFE_FREE_STR(item->contact->job_title); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3458 SAFE_FREE_STR(item->contact->keyword); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3459 SAFE_FREE_STR(item->contact->language); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3460 SAFE_FREE_STR(item->contact->location); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3461 SAFE_FREE_STR(item->contact->manager_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3462 SAFE_FREE_STR(item->contact->middle_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3463 SAFE_FREE_STR(item->contact->mileage); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3464 SAFE_FREE_STR(item->contact->mobile_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3465 SAFE_FREE_STR(item->contact->nickname); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3466 SAFE_FREE_STR(item->contact->office_loc); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3467 SAFE_FREE_STR(item->contact->common_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3468 SAFE_FREE_STR(item->contact->org_id); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3469 SAFE_FREE_STR(item->contact->other_address); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3470 SAFE_FREE_STR(item->contact->other_city); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3471 SAFE_FREE_STR(item->contact->other_country); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3472 SAFE_FREE_STR(item->contact->other_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3473 SAFE_FREE_STR(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
|
3474 SAFE_FREE_STR(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
|
3475 SAFE_FREE_STR(item->contact->other_state); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3476 SAFE_FREE_STR(item->contact->other_street); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3477 SAFE_FREE_STR(item->contact->pager_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3478 SAFE_FREE_STR(item->contact->personal_homepage); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3479 SAFE_FREE_STR(item->contact->pref_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3480 SAFE_FREE_STR(item->contact->primary_fax); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3481 SAFE_FREE_STR(item->contact->primary_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3482 SAFE_FREE_STR(item->contact->profession); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3483 SAFE_FREE_STR(item->contact->radio_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3484 SAFE_FREE_STR(item->contact->spouse_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3485 SAFE_FREE_STR(item->contact->suffix); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3486 SAFE_FREE_STR(item->contact->surname); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3487 SAFE_FREE_STR(item->contact->telex); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3488 SAFE_FREE_STR(item->contact->transmittable_display_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3489 SAFE_FREE_STR(item->contact->ttytdd_phone); |
43 | 3490 SAFE_FREE(item->contact->wedding_anniversary); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3491 SAFE_FREE_STR(item->contact->work_address_street); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3492 SAFE_FREE_STR(item->contact->work_address_city); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3493 SAFE_FREE_STR(item->contact->work_address_state); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3494 SAFE_FREE_STR(item->contact->work_address_postalcode); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3495 SAFE_FREE_STR(item->contact->work_address_country); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3496 SAFE_FREE_STR(item->contact->work_address_postofficebox); |
43 | 3497 free(item->contact); |
3498 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3499 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3500 pst_free_attach(item->attach); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3501 |
43 | 3502 while (item->extra_fields) { |
3503 SAFE_FREE(item->extra_fields->field_name); | |
3504 SAFE_FREE(item->extra_fields->value); | |
3505 et = item->extra_fields->next; | |
3506 free(item->extra_fields); | |
3507 item->extra_fields = et; | |
3508 } | |
3509 if (item->journal) { | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3510 SAFE_FREE(item->journal->start); |
43 | 3511 SAFE_FREE(item->journal->end); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3512 SAFE_FREE_STR(item->journal->type); |
43 | 3513 free(item->journal); |
3514 } | |
3515 if (item->appointment) { | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3516 SAFE_FREE(item->appointment->start); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3517 SAFE_FREE(item->appointment->end); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3518 SAFE_FREE_STR(item->appointment->location); |
43 | 3519 SAFE_FREE(item->appointment->reminder); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3520 SAFE_FREE_STR(item->appointment->alarm_filename); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3521 SAFE_FREE_STR(item->appointment->timezonestring); |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3522 SAFE_FREE_STR(item->appointment->recurrence_description); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3523 SAFE_FREE_BIN(item->appointment->recurrence_data); |
50 | 3524 SAFE_FREE(item->appointment->recurrence_start); |
3525 SAFE_FREE(item->appointment->recurrence_end); | |
43 | 3526 free(item->appointment); |
3527 } | |
3528 SAFE_FREE(item->ascii_type); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3529 SAFE_FREE_STR(item->body_charset); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3530 SAFE_FREE_STR(item->body); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3531 SAFE_FREE_STR(item->subject); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3532 SAFE_FREE_STR(item->comment); |
43 | 3533 SAFE_FREE(item->create_date); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3534 SAFE_FREE_STR(item->file_as); |
43 | 3535 SAFE_FREE(item->modify_date); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3536 SAFE_FREE_STR(item->outlook_version); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3537 SAFE_FREE_BIN(item->record_key); |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3538 SAFE_FREE_BIN(item->predecessor_change); |
43 | 3539 free(item); |
3540 } | |
3541 DEBUG_RET(); | |
16 | 3542 } |
3543 | |
3544 | |
35 | 3545 /** |
204
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3546 * The offset might be zero, in which case we have no data, so return a pair of null pointers. |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3547 * Or, the offset might end in 0xf, so it is an id2 pointer, in which case we read the id2 block. |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3548 * Otherwise, the high order 16 bits of offset is the index into the subblocks, and |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3549 * the (low order 16 bits of offset)>>4 is an index into the table of offsets in the subblock. |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3550 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3551 static int pst_getBlockOffsetPointer(pst_file *pf, pst_id2_tree *i2_head, pst_subblocks *subblocks, uint32_t offset, pst_block_offset_pointer *p) { |
46 | 3552 size_t size; |
43 | 3553 pst_block_offset block_offset; |
46 | 3554 DEBUG_ENT("pst_getBlockOffsetPointer"); |
43 | 3555 if (p->needfree) free(p->from); |
49 | 3556 p->from = NULL; |
3557 p->to = NULL; | |
43 | 3558 p->needfree = 0; |
3559 if (!offset) { | |
49 | 3560 // no data |
43 | 3561 p->from = p->to = NULL; |
3562 } | |
46 | 3563 else if ((offset & 0xf) == (uint32_t)0xf) { |
49 | 3564 // external index reference |
43 | 3565 DEBUG_WARN(("Found id2 %#x value. Will follow it\n", offset)); |
46 | 3566 size = pst_ff_getID2block(pf, offset, i2_head, &(p->from)); |
43 | 3567 if (size) { |
3568 p->to = p->from + size; | |
3569 p->needfree = 1; | |
3570 } | |
3571 else { | |
50 | 3572 if (p->from) { |
3573 DEBUG_WARN(("size zero but non-null pointer\n")); | |
3574 free(p->from); | |
3575 } | |
43 | 3576 p->from = p->to = NULL; |
3577 } | |
3578 } | |
3579 else { | |
49 | 3580 // internal index reference |
3581 size_t subindex = offset >> 16; | |
3582 size_t suboffset = offset & 0xffff; | |
3583 if (subindex < subblocks->subblock_count) { | |
3584 if (pst_getBlockOffset(subblocks->subs[subindex].buf, | |
3585 subblocks->subs[subindex].read_size, | |
3586 subblocks->subs[subindex].i_offset, | |
3587 suboffset, &block_offset)) { | |
3588 p->from = subblocks->subs[subindex].buf + block_offset.from; | |
3589 p->to = subblocks->subs[subindex].buf + block_offset.to; | |
3590 } | |
3591 } | |
43 | 3592 } |
3593 DEBUG_RET(); | |
3594 return (p->from) ? 0 : 1; | |
35 | 3595 } |
3596 | |
3597 | |
204
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3598 /** */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3599 static int pst_getBlockOffset(char *buf, size_t read_size, uint32_t i_offset, uint32_t offset, pst_block_offset *p) { |
46 | 3600 uint32_t low = offset & 0xf; |
3601 uint32_t of1 = offset >> 4; | |
3602 DEBUG_ENT("pst_getBlockOffset"); | |
43 | 3603 if (!p || !buf || !i_offset || low || (i_offset+2+of1+sizeof(*p) > read_size)) { |
3604 DEBUG_WARN(("p is NULL or buf is NULL or offset is 0 or offset has low bits or beyond read size (%p, %p, %#x, %i, %i)\n", p, buf, offset, read_size, i_offset)); | |
3605 DEBUG_RET(); | |
49 | 3606 return 0; |
43 | 3607 } |
3608 memcpy(&(p->from), &(buf[(i_offset+2)+of1]), sizeof(p->from)); | |
3609 memcpy(&(p->to), &(buf[(i_offset+2)+of1+sizeof(p->from)]), sizeof(p->to)); | |
3610 LE16_CPU(p->from); | |
3611 LE16_CPU(p->to); | |
3612 DEBUG_WARN(("get block offset finds from=%i(%#x), to=%i(%#x)\n", p->from, p->from, p->to, p->to)); | |
359 | 3613 if (p->from > p->to || p->to > read_size) { |
3614 DEBUG_WARN(("get block offset bad range\n")); | |
52 | 3615 DEBUG_RET(); |
49 | 3616 return 0; |
43 | 3617 } |
3618 DEBUG_RET(); | |
49 | 3619 return 1; |
16 | 3620 } |
3621 | |
3622 | |
204
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3623 /** */ |
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:
163
diff
changeset
|
3624 pst_index_ll* pst_getID(pst_file* pf, uint64_t i_id) { |
69 | 3625 pst_index_ll *ptr; |
46 | 3626 DEBUG_ENT("pst_getID"); |
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:
163
diff
changeset
|
3627 if (i_id == 0) { |
43 | 3628 DEBUG_RET(); |
3629 return NULL; | |
3630 } | |
3631 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3632 //if (i_id & 1) DEBUG_INFO(("have odd id bit %#"PRIx64"\n", i_id)); |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3633 //if (i_id & 2) DEBUG_INFO(("have two id bit %#"PRIx64"\n", 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:
163
diff
changeset
|
3634 i_id -= (i_id & 1); |
ab384fed78c5
Compensate for iconv conversion to utf-7 that produces strings that are not null terminated.
Carl Byington <carl@five-ten-sg.com>
parents:
163
diff
changeset
|
3635 |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3636 DEBUG_INFO(("Trying to find %#"PRIx64"\n", i_id)); |
69 | 3637 ptr = pf->i_head; |
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:
163
diff
changeset
|
3638 while (ptr && (ptr->i_id != i_id)) { |
43 | 3639 ptr = ptr->next; |
3640 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3641 if (ptr) {DEBUG_INFO(("Found Value %#"PRIx64"\n", i_id)); } |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3642 else {DEBUG_INFO(("ERROR: Value %#"PRIx64" not found\n", i_id)); } |
43 | 3643 DEBUG_RET(); |
3644 return ptr; | |
16 | 3645 } |
3646 | |
3647 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3648 static pst_id2_tree *pst_getID2(pst_id2_tree *head, uint64_t id2) { |
46 | 3649 DEBUG_ENT("pst_getID2"); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3650 DEBUG_INFO(("looking for id2 = %#"PRIx64"\n", id2)); |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3651 pst_id2_tree *ptr = head; |
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
|
3652 while (ptr) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3653 if (ptr->id2 == id2) break; |
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
|
3654 if (ptr->child) { |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3655 pst_id2_tree *rc = pst_getID2(ptr->child, id2); |
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
|
3656 if (rc) { |
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
|
3657 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
|
3658 return rc; |
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
|
3659 } |
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
|
3660 } |
43 | 3661 ptr = ptr->next; |
3662 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3663 if (ptr && ptr->id) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3664 DEBUG_INFO(("Found value %#"PRIx64"\n", ptr->id->i_id)); |
43 | 3665 DEBUG_RET(); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3666 return ptr; |
43 | 3667 } |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3668 DEBUG_INFO(("ERROR Not Found\n")); |
43 | 3669 DEBUG_RET(); |
3670 return NULL; | |
16 | 3671 } |
3672 | |
3673 | |
35 | 3674 /** |
3675 * find the id in the descriptor tree rooted at pf->d_head | |
3676 * | |
43 | 3677 * @param pf global pst file pointer |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
3678 * @param d_id the id we are looking for |
35 | 3679 * |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3680 * @return pointer to the pst_desc_tree node in the descriptor tree |
35 | 3681 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3682 static pst_desc_tree* pst_getDptr(pst_file *pf, uint64_t d_id) { |
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3683 pst_desc_tree *ptr = pf->d_head; |
46 | 3684 DEBUG_ENT("pst_getDptr"); |
150
06aa84023b48
rename some structure fields to reflect our better understanding of the pst format
Carl Byington <carl@five-ten-sg.com>
parents:
149
diff
changeset
|
3685 while (ptr && (ptr->d_id != d_id)) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3686 //DEBUG_INFO(("Looking for %#"PRIx64" at node %#"PRIx64" with parent %#"PRIx64"\n", id, ptr->d_id, ptr->parent_d_id)); |
43 | 3687 if (ptr->child) { |
3688 ptr = ptr->child; | |
3689 continue; | |
3690 } | |
3691 while (!ptr->next && ptr->parent) { | |
3692 ptr = ptr->parent; | |
3693 } | |
3694 ptr = ptr->next; | |
3695 } | |
3696 DEBUG_RET(); | |
3697 return ptr; // will be NULL or record we are looking for | |
16 | 3698 } |
3699 | |
3700 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3701 static void pst_printDptr(pst_file *pf, pst_desc_tree *ptr) { |
46 | 3702 DEBUG_ENT("pst_printDptr"); |
43 | 3703 while (ptr) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3704 DEBUG_INFO(("%#"PRIx64" [%i] desc=%#"PRIx64", assoc tree=%#"PRIx64"\n", ptr->d_id, ptr->no_child, |
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:
163
diff
changeset
|
3705 (ptr->desc ? ptr->desc->i_id : (uint64_t)0), |
ab384fed78c5
Compensate for iconv conversion to utf-7 that produces strings that are not null terminated.
Carl Byington <carl@five-ten-sg.com>
parents:
163
diff
changeset
|
3706 (ptr->assoc_tree ? ptr->assoc_tree->i_id : (uint64_t)0))); |
43 | 3707 if (ptr->child) { |
51 | 3708 pst_printDptr(pf, ptr->child); |
43 | 3709 } |
3710 ptr = ptr->next; | |
3711 } | |
3712 DEBUG_RET(); | |
16 | 3713 } |
3714 | |
3715 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3716 static void pst_printID2ptr(pst_id2_tree *ptr) { |
46 | 3717 DEBUG_ENT("pst_printID2ptr"); |
43 | 3718 while (ptr) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3719 DEBUG_INFO(("%#"PRIx64" id=%#"PRIx64"\n", ptr->id2, (ptr->id ? ptr->id->i_id : (uint64_t)0))); |
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
|
3720 if (ptr->child) pst_printID2ptr(ptr->child); |
43 | 3721 ptr = ptr->next; |
3722 } | |
3723 DEBUG_RET(); | |
16 | 3724 } |
3725 | |
3726 | |
52 | 3727 /** |
3728 * Read a block of data from file into memory | |
3729 * @param pf PST file | |
3730 * @param offset offset in the pst file of the data | |
3731 * @param size size of the block to be read | |
3732 * @param buf reference to pointer to buffer. If this pointer | |
3733 is non-NULL, it will first be free()d | |
3734 * @return size of block read into memory | |
3735 */ | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3736 static size_t pst_read_block_size(pst_file *pf, int64_t offset, size_t size, char **buf) { |
51 | 3737 size_t rsize; |
46 | 3738 DEBUG_ENT("pst_read_block_size"); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3739 DEBUG_INFO(("Reading block from %#"PRIx64", %x bytes\n", offset, size)); |
43 | 3740 |
3741 if (*buf) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3742 DEBUG_INFO(("Freeing old memory\n")); |
43 | 3743 free(*buf); |
3744 } | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
3745 *buf = (char*) pst_malloc(size); |
52 | 3746 |
3747 rsize = pst_getAtPos(pf, offset, *buf, size); | |
43 | 3748 if (rsize != size) { |
52 | 3749 DEBUG_WARN(("Didn't read all the data. fread returned less [%i instead of %i]\n", rsize, size)); |
43 | 3750 if (feof(pf->fp)) { |
87
3ec5ad97e926
Use inttypes.h for portable printing of 64 bit items.
Carl Byington <carl@five-ten-sg.com>
parents:
85
diff
changeset
|
3751 DEBUG_WARN(("We tried to read past the end of the file at [offset %#"PRIx64", size %#x]\n", offset, size)); |
43 | 3752 } else if (ferror(pf->fp)) { |
3753 DEBUG_WARN(("Error is set on file stream.\n")); | |
3754 } else { | |
3755 DEBUG_WARN(("I can't tell why it failed\n")); | |
3756 } | |
3757 } | |
3758 | |
3759 DEBUG_RET(); | |
52 | 3760 return rsize; |
16 | 3761 } |
3762 | |
3763 | |
204
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3764 /** Decrypt a block of data from the pst file. |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3765 * @param i_id identifier of this block, needed as part of the key for the enigma cipher |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3766 * @param buf pointer to the buffer to be decrypted in place |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3767 * @param size size of the buffer |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3768 * @param type |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3769 @li 0 PST_NO_ENCRYPT, none |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3770 @li 1 PST_COMP_ENCRYPT, simple byte substitution cipher with fixed key |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3771 @li 2 PST_ENCRYPT, german enigma 3 rotor cipher with fixed key |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3772 * @return 0 if ok, -1 if error (NULL buffer or unknown encryption type) |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3773 */ |
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3774 static int pst_decrypt(uint64_t i_id, char *buf, size_t size, unsigned char type) { |
43 | 3775 size_t x = 0; |
3776 unsigned char y; | |
46 | 3777 DEBUG_ENT("pst_decrypt"); |
43 | 3778 if (!buf) { |
3779 DEBUG_RET(); | |
3780 return -1; | |
3781 } | |
3782 | |
3783 if (type == PST_COMP_ENCRYPT) { | |
3784 x = 0; | |
3785 while (x < size) { | |
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:
69
diff
changeset
|
3786 y = (unsigned char)(buf[x]); |
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:
69
diff
changeset
|
3787 buf[x] = (char)comp_enc[y]; // transpose from encrypt array |
43 | 3788 x++; |
3789 } | |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3790 |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3791 } else if (type == PST_ENCRYPT) { |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3792 // The following code was based on the information at |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3793 // http://www.passcape.com/outlook_passwords.htm |
188 | 3794 uint16_t salt = (uint16_t) (((i_id & 0x00000000ffff0000) >> 16) ^ (i_id & 0x000000000000ffff)); |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3795 x = 0; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3796 while (x < size) { |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3797 uint8_t losalt = (salt & 0x00ff); |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3798 uint8_t hisalt = (salt & 0xff00) >> 8; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3799 y = (unsigned char)buf[x]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3800 y += losalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3801 y = comp_high1[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3802 y += hisalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3803 y = comp_high2[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3804 y -= hisalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3805 y = comp_enc[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3806 y -= losalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3807 buf[x] = (char)y; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3808 x++; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3809 salt++; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3810 } |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3811 |
43 | 3812 } else { |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
3813 DEBUG_WARN(("Unknown encryption: %i. Cannot decrypt\n", type)); |
43 | 3814 DEBUG_RET(); |
3815 return -1; | |
3816 } | |
3817 DEBUG_RET(); | |
3818 return 0; | |
16 | 3819 } |
3820 | |
3821 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3822 static uint64_t pst_getIntAt(pst_file *pf, char *buf) { |
46 | 3823 uint64_t buf64; |
3824 uint32_t buf32; | |
3825 if (pf->do_read64) { | |
43 | 3826 memcpy(&buf64, buf, sizeof(buf64)); |
3827 LE64_CPU(buf64); | |
3828 return buf64; | |
3829 } | |
3830 else { | |
3831 memcpy(&buf32, buf, sizeof(buf32)); | |
3832 LE32_CPU(buf32); | |
3833 return buf32; | |
3834 } | |
3835 } | |
3836 | |
3837 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3838 static uint64_t pst_getIntAtPos(pst_file *pf, int64_t pos ) { |
46 | 3839 uint64_t buf64; |
3840 uint32_t buf32; | |
3841 if (pf->do_read64) { | |
52 | 3842 (void)pst_getAtPos(pf, pos, &buf64, sizeof(buf64)); |
43 | 3843 LE64_CPU(buf64); |
3844 return buf64; | |
3845 } | |
3846 else { | |
52 | 3847 (void)pst_getAtPos(pf, pos, &buf32, sizeof(buf32)); |
43 | 3848 LE32_CPU(buf32); |
3849 return buf32; | |
3850 } | |
16 | 3851 } |
3852 | |
52 | 3853 /** |
3854 * Read part of the pst file. | |
3855 * | |
3856 * @param pf PST file structure | |
3857 * @param pos offset of the data in the pst file | |
3858 * @param buf buffer to contain the data | |
3859 * @param size size of the buffer and the amount of data to be read | |
3860 * @return actual read size, 0 if seek error | |
3861 */ | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3862 static size_t pst_getAtPos(pst_file *pf, int64_t pos, void* buf, size_t size) { |
52 | 3863 size_t rc; |
46 | 3864 DEBUG_ENT("pst_getAtPos"); |
52 | 3865 // pst_block_recorder **t = &pf->block_head; |
3866 // pst_block_recorder *p = pf->block_head; | |
3867 // while (p && ((p->offset+p->size) <= pos)) { | |
3868 // t = &p->next; | |
3869 // p = p->next; | |
3870 // } | |
3871 // if (p && (p->offset <= pos) && (pos < (p->offset+p->size))) { | |
3872 // // bump the count | |
3873 // p->readcount++; | |
3874 // } else { | |
3875 // // add a new block | |
3876 // pst_block_recorder *tail = *t; | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
3877 // p = (pst_block_recorder*)pst_malloc(sizeof(*p)); |
52 | 3878 // *t = p; |
3879 // p->next = tail; | |
3880 // p->offset = pos; | |
3881 // p->size = size; | |
3882 // p->readcount = 1; | |
3883 // } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3884 // DEBUG_INFO(("pst file old offset %#"PRIx64" old size %#x read count %i offset %#"PRIx64" size %#x\n", |
52 | 3885 // p->offset, p->size, p->readcount, pos, size)); |
3886 | |
75
987aa872294e
Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents:
73
diff
changeset
|
3887 if (fseeko(pf->fp, pos, SEEK_SET) == -1) { |
43 | 3888 DEBUG_RET(); |
52 | 3889 return 0; |
43 | 3890 } |
52 | 3891 rc = fread(buf, (size_t)1, size, pf->fp); |
43 | 3892 DEBUG_RET(); |
52 | 3893 return rc; |
16 | 3894 } |
3895 | |
3896 | |
50 | 3897 /** |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
3898 * Get an ID block from file using pst_ff_getIDblock() and decrypt if necessary |
52 | 3899 * @param pf PST file structure |
188 | 3900 * @param i_id ID of block to retrieve |
3901 * @param buf reference to pointer to buffer that will contain the data block. | |
3902 * If this pointer is non-NULL, it will first be free()d. | |
3903 * @return Size of block read into memory | |
50 | 3904 */ |
188 | 3905 size_t pst_ff_getIDblock_dec(pst_file *pf, uint64_t i_id, char **buf) { |
43 | 3906 size_t r; |
188 | 3907 int noenc = (int)(i_id & 2); // disable encryption |
46 | 3908 DEBUG_ENT("pst_ff_getIDblock_dec"); |
233
1d50ff3c5091
better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents:
231
diff
changeset
|
3909 DEBUG_INFO(("for id %#"PRIx64"\n", i_id)); |
188 | 3910 r = pst_ff_getIDblock(pf, i_id, buf); |
46 | 3911 if ((pf->encryption) && !(noenc)) { |
188 | 3912 (void)pst_decrypt(i_id, *buf, r, pf->encryption); |
43 | 3913 } |
52 | 3914 DEBUG_HEXDUMPC(*buf, r, 16); |
43 | 3915 DEBUG_RET(); |
3916 return r; | |
3917 } | |
3918 | |
3919 | |
50 | 3920 /** |
3921 * Read a block of data from file into memory | |
188 | 3922 * @param pf PST file structure |
3923 * @param i_id ID of block to read | |
3924 * @param buf reference to pointer to buffer that will contain the data block. | |
3925 * If this pointer is non-NULL, it will first be free()d. | |
52 | 3926 * @return size of block read into memory |
50 | 3927 */ |
204
268458c79e9b
more cleanup of the shared library interface, but still not fully thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
203
diff
changeset
|
3928 static size_t pst_ff_getIDblock(pst_file *pf, uint64_t i_id, char** buf) { |
43 | 3929 pst_index_ll *rec; |
52 | 3930 size_t rsize; |
46 | 3931 DEBUG_ENT("pst_ff_getIDblock"); |
188 | 3932 rec = pst_getID(pf, i_id); |
52 | 3933 if (!rec) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3934 DEBUG_INFO(("Cannot find ID %#"PRIx64"\n", i_id)); |
43 | 3935 DEBUG_RET(); |
3936 return 0; | |
3937 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3938 DEBUG_INFO(("id = %#"PRIx64", record size = %#x, offset = %#x\n", i_id, rec->size, rec->offset)); |
52 | 3939 rsize = pst_read_block_size(pf, rec->offset, rec->size, buf); |
43 | 3940 DEBUG_RET(); |
3941 return rsize; | |
16 | 3942 } |
3943 | |
3944 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3945 static size_t pst_ff_getID2block(pst_file *pf, uint64_t id2, pst_id2_tree *id2_head, char** buf) { |
50 | 3946 size_t ret; |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3947 pst_id2_tree* ptr; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3948 pst_holder h = {buf, NULL, 0, 0, 0}; |
46 | 3949 DEBUG_ENT("pst_ff_getID2block"); |
3950 ptr = pst_getID2(id2_head, id2); | |
43 | 3951 |
3952 if (!ptr) { | |
233
1d50ff3c5091
better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents:
231
diff
changeset
|
3953 DEBUG_WARN(("Cannot find id2 value %#"PRIx64"\n", id2)); |
43 | 3954 DEBUG_RET(); |
3955 return 0; | |
3956 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3957 ret = pst_ff_getID2data(pf, ptr->id, &h); |
43 | 3958 DEBUG_RET(); |
50 | 3959 return ret; |
16 | 3960 } |
3961 | |
3962 | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3963 /** find the actual data from an i_id and send it to the destination |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3964 * specified by the pst_holder h. h must be a new empty destination. |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3965 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3966 * @param pf PST file structure |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3967 * @param ptr |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3968 * @param h specifies the output destination (buffer, file, encoding) |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3969 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3970 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3971 static size_t pst_ff_getID2data(pst_file *pf, pst_index_ll *ptr, pst_holder *h) { |
46 | 3972 size_t ret; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3973 char *b = NULL; |
46 | 3974 DEBUG_ENT("pst_ff_getID2data"); |
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:
163
diff
changeset
|
3975 if (!(ptr->i_id & 0x02)) { |
ab384fed78c5
Compensate for iconv conversion to utf-7 that produces strings that are not null terminated.
Carl Byington <carl@five-ten-sg.com>
parents:
163
diff
changeset
|
3976 ret = pst_ff_getIDblock_dec(pf, ptr->i_id, &b); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3977 ret = pst_append_holder(h, (size_t)0, &b, ret); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3978 free(b); |
43 | 3979 } else { |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3980 // here we will assume it is an indirection block that points to others |
260
156cf548c764
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
257
diff
changeset
|
3981 DEBUG_INFO(("Assuming it is a multi-block record because of it's id %#"PRIx64"\n", ptr->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:
163
diff
changeset
|
3982 ret = pst_ff_compile_ID(pf, ptr->i_id, h, (size_t)0); |
43 | 3983 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3984 ret = pst_finish_cleanup_holder(h, ret); |
43 | 3985 DEBUG_RET(); |
3986 return ret; | |
16 | 3987 } |
3988 | |
3989 | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3990 /** find the actual data from an indirection i_id and send it to the destination |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3991 * specified by the pst_holder. |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3992 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3993 * @param pf PST file structure |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3994 * @param i_id ID of the block to read |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3995 * @param h specifies the output destination (buffer, file, encoding) |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3996 * @param size number of bytes of data already sent to h |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3997 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3998 */ |
188 | 3999 static size_t pst_ff_compile_ID(pst_file *pf, uint64_t i_id, pst_holder *h, size_t size) { |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4000 size_t z, a; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4001 uint16_t count, y; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4002 char *buf3 = NULL; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4003 char *buf2 = NULL; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4004 char *b_ptr; |
50 | 4005 pst_block_hdr block_hdr; |
4006 pst_table3_rec table3_rec; //for type 3 (0x0101) blocks | |
43 | 4007 |
46 | 4008 DEBUG_ENT("pst_ff_compile_ID"); |
188 | 4009 a = pst_ff_getIDblock(pf, i_id, &buf3); |
43 | 4010 if (!a) { |
4011 if (buf3) free(buf3); | |
52 | 4012 DEBUG_RET(); |
43 | 4013 return 0; |
4014 } | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
4015 DEBUG_HEXDUMPC(buf3, a, 16); |
50 | 4016 memcpy(&block_hdr, buf3, sizeof(block_hdr)); |
4017 LE16_CPU(block_hdr.index_offset); | |
4018 LE16_CPU(block_hdr.type); | |
4019 LE32_CPU(block_hdr.offset); | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
4020 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#x)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
50 | 4021 |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4022 count = block_hdr.type; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4023 b_ptr = buf3 + 8; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4024 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4025 // For indirect lookups through a table of i_ids, just recurse back into this |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4026 // function, letting it concatenate all the data together, and then return the |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4027 // total size of the data. |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4028 if (block_hdr.index_offset == (uint16_t)0x0201) { // Indirect lookup (depth 2). |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4029 for (y=0; y<count; y++) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4030 b_ptr += pst_decode_type3(pf, &table3_rec, b_ptr); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4031 size = pst_ff_compile_ID(pf, table3_rec.id, h, size); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4032 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4033 free(buf3); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4034 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4035 return size; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4036 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4037 |
50 | 4038 if (block_hdr.index_offset != (uint16_t)0x0101) { //type 3 |
4039 DEBUG_WARN(("WARNING: not a type 0x0101 buffer, Treating as normal buffer\n")); | |
188 | 4040 if (pf->encryption) (void)pst_decrypt(i_id, buf3, a, pf->encryption); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4041 size = pst_append_holder(h, size, &buf3, a); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4042 free(buf3); |
43 | 4043 DEBUG_RET(); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4044 return size; |
43 | 4045 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4046 |
50 | 4047 for (y=0; y<count; y++) { |
4048 b_ptr += pst_decode_type3(pf, &table3_rec, b_ptr); | |
4049 z = pst_ff_getIDblock_dec(pf, table3_rec.id, &buf2); | |
4050 if (!z) { | |
4051 DEBUG_WARN(("call to getIDblock returned zero %i\n", z)); | |
4052 if (buf2) free(buf2); | |
4053 free(buf3); | |
52 | 4054 DEBUG_RET(); |
50 | 4055 return z; |
4056 } | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4057 size = pst_append_holder(h, size, &buf2, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4058 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4059 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4060 free(buf3); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4061 if (buf2) free(buf2); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4062 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4063 return size; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4064 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4065 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4066 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4067 /** append (buf,z) data to the output destination (h,size) |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4068 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4069 * @param h specifies the output destination (buffer, file, encoding) |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4070 * @param size number of bytes of data already sent to h |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4071 * @param buf reference to a pointer to the buffer to be appended to the destination |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4072 * @param z number of bytes in buf |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4073 * @return updated size of the output, buffer pointer possibly reallocated |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4074 */ |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4075 static size_t pst_append_holder(pst_holder *h, size_t size, char **buf, size_t z) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4076 char *t; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4077 DEBUG_ENT("pst_append_holder"); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4078 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4079 // raw append to a buffer |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4080 if (h->buf) { |
289
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
4081 *(h->buf) = pst_realloc(*(h->buf), size+z+1); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4082 DEBUG_INFO(("appending read data of size %i onto main buffer from pos %i\n", z, size)); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4083 memcpy(*(h->buf)+size, *buf, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4084 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4085 // base64 encoding to a file |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4086 } else if ((h->base64 == 1) && h->fp) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4087 // |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4088 if (h->base64_extra) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4089 // include any bytes left over from the last encoding |
289
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
4090 *buf = (char*)pst_realloc(*buf, z+h->base64_extra); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4091 memmove(*buf+h->base64_extra, *buf, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4092 memcpy(*buf, h->base64_extra_chars, h->base64_extra); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4093 z += h->base64_extra; |
43 | 4094 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4095 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4096 // find out how many bytes will be left over after this encoding and save them |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4097 h->base64_extra = z % 3; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4098 if (h->base64_extra) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4099 z -= h->base64_extra; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4100 memcpy(h->base64_extra_chars, *buf+z, h->base64_extra); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4101 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4102 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4103 // encode this chunk |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4104 t = pst_base64_encode_multiple(*buf, z, &h->base64_line_count); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4105 if (t) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4106 DEBUG_INFO(("writing %i bytes to file as base64 [%i]. Currently %i\n", z, strlen(t), size)); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4107 (void)pst_fwrite(t, (size_t)1, strlen(t), h->fp); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4108 free(t); // caught by valgrind |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4109 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4110 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4111 // raw append to a file |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4112 } else if (h->fp) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4113 DEBUG_INFO(("writing %i bytes to file. Currently %i\n", z, size)); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4114 (void)pst_fwrite(*buf, (size_t)1, z, h->fp); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4115 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4116 // null output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4117 } else { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4118 // h-> does not specify any output |
43 | 4119 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4120 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4121 return size+z; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4122 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4123 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4124 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4125 /** finish cleanup for base64 encoding to a file with extra bytes left over |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4126 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4127 * @param h specifies the output destination (buffer, file, encoding) |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4128 * @param size number of bytes of data already sent to h |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4129 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4130 */ |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4131 static size_t pst_finish_cleanup_holder(pst_holder *h, size_t size) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4132 char *t; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4133 DEBUG_ENT("pst_finish_cleanup_holder"); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4134 if ((h->base64 == 1) && h->fp && h->base64_extra) { |
94
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4135 // need to encode any bytes left over |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4136 t = pst_base64_encode_multiple(h->base64_extra_chars, h->base64_extra, &h->base64_line_count); |
94
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4137 if (t) { |
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4138 (void)pst_fwrite(t, (size_t)1, strlen(t), h->fp); |
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4139 free(t); // caught by valgrind |
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4140 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4141 size += h->base64_extra; |
94
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4142 } |
43 | 4143 DEBUG_RET(); |
4144 return size; | |
16 | 4145 } |
4146 | |
4147 | |
328 | 4148 /** compare strings case-insensitive. |
4149 * @return -1 if a < b, 0 if a==b, 1 if a > b | |
4150 */ | |
4151 int pst_stricmp(char *a, char *b) { | |
43 | 4152 while(*a != '\0' && *b != '\0' && toupper(*a)==toupper(*b)) { |
4153 a++; b++; | |
4154 } | |
4155 if (toupper(*a) == toupper(*b)) | |
4156 return 0; | |
4157 else if (toupper(*a) < toupper(*b)) | |
4158 return -1; | |
4159 else | |
4160 return 1; | |
16 | 4161 } |
4162 | |
4163 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4164 static int pst_strincmp(char *a, char *b, size_t x) { |
43 | 4165 // compare upto x chars in string a and b case-insensitively |
4166 // returns -1 if a < b, 0 if a==b, 1 if a > b | |
46 | 4167 size_t y = 0; |
43 | 4168 while (*a != '\0' && *b != '\0' && y < x && toupper(*a)==toupper(*b)) { |
4169 a++; b++; y++; | |
4170 } | |
4171 // if we have reached the end of either string, or a and b still match | |
4172 if (*a == '\0' || *b == '\0' || toupper(*a)==toupper(*b)) | |
4173 return 0; | |
4174 else if (toupper(*a) < toupper(*b)) | |
4175 return -1; | |
4176 else | |
4177 return 1; | |
16 | 4178 } |
4179 | |
4180 | |
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:
69
diff
changeset
|
4181 size_t pst_fwrite(const void* ptr, size_t size, size_t nmemb, FILE *stream) { |
43 | 4182 size_t r; |
4183 if (ptr) | |
4184 r = fwrite(ptr, size, nmemb, stream); | |
4185 else { | |
4186 r = 0; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
4187 DEBUG_ENT("pst_fwrite"); |
43 | 4188 DEBUG_WARN(("An attempt to write a NULL Pointer was made\n")); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
4189 DEBUG_RET(); |
43 | 4190 } |
4191 return r; | |
16 | 4192 } |
4193 | |
4194 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4195 static char* pst_wide_to_single(char *wt, size_t size) { |
43 | 4196 // returns the first byte of each wide char. the size is the number of bytes in source |
4197 char *x, *y; | |
46 | 4198 DEBUG_ENT("pst_wide_to_single"); |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
4199 x = pst_malloc((size/2)+1); |
43 | 4200 y = x; |
4201 while (size != 0 && *wt != '\0') { | |
4202 *y = *wt; | |
4203 wt+=2; | |
4204 size -= 2; | |
4205 y++; | |
4206 } | |
4207 *y = '\0'; | |
4208 DEBUG_RET(); | |
4209 return x; | |
16 | 4210 } |
4211 | |
43 | 4212 |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4213 char* pst_rfc2426_escape(char* str, char **buf, size_t* buflen) { |
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4214 //static char* buf = NULL; |
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4215 //static size_t buflen = 0; |
43 | 4216 char *ret, *a, *b; |
47 | 4217 size_t x = 0; |
4218 int y, z; | |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4219 if (!str) return NULL; |
43 | 4220 DEBUG_ENT("rfc2426_escape"); |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4221 // calculate space required to escape all the following characters |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4222 y = pst_chr_count(str, ',') |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4223 + pst_chr_count(str, '\\') |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4224 + pst_chr_count(str, ';') |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4225 + pst_chr_count(str, '\n'); |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4226 z = pst_chr_count(str, '\r'); |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4227 if (y == 0 && z == 0) |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4228 // there isn't any extra space required |
43 | 4229 ret = str; |
4230 else { | |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4231 x = strlen(str) + y - z + 1; // don't forget room for the NUL |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4232 if (x > *buflen) { |
289
cc8ee701f190
pst_block_offset elements are unsigned; consistent usage of pst_malloc and pst_realloc
Carl Byington <carl@five-ten-sg.com>
parents:
287
diff
changeset
|
4233 *buf = (char*)pst_realloc(*buf, x); |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4234 *buflen = x; |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4235 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4236 a = str; |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4237 b = *buf; |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4238 while (*a != '\0') { |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4239 switch (*a) { |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4240 case ',' : |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4241 case '\\': |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4242 case ';' : |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4243 *(b++) = '\\'; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4244 *b = *a; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4245 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4246 case '\n': // newlines are encoded as "\n" |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4247 *(b++) = '\\'; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4248 *b = 'n'; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4249 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4250 case '\r': // skip cr |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4251 b--; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4252 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4253 default: |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4254 *b=*a; |
48 | 4255 } |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4256 b++; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4257 a++; |
43 | 4258 } |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4259 *b = '\0'; // NUL-terminate the string (buf) |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4260 ret = *buf; |
43 | 4261 } |
4262 DEBUG_RET(); | |
4263 return ret; | |
4264 } | |
4265 | |
4266 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4267 static int pst_chr_count(char *str, char x) { |
43 | 4268 int r = 0; |
46 | 4269 while (*str) { |
4270 if (*str == x) r++; | |
43 | 4271 str++; |
4272 } | |
4273 return r; | |
4274 } | |
4275 | |
4276 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4277 char* pst_rfc2425_datetime_format(const FILETIME* ft, int buflen, char* result) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4278 struct tm stm; |
43 | 4279 DEBUG_ENT("rfc2425_datetime_format"); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4280 pst_fileTimeToStructTM(ft, &stm); |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4281 if (strftime(result, buflen, "%Y-%m-%dT%H:%M:%SZ", &stm)==0) { |
43 | 4282 DEBUG_INFO(("Problem occured formatting date\n")); |
4283 } | |
4284 DEBUG_RET(); | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4285 return result; |
43 | 4286 } |
4287 | |
4288 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4289 char* pst_rfc2445_datetime_format(const FILETIME* ft, int buflen, char* result) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4290 struct tm stm; |
43 | 4291 DEBUG_ENT("rfc2445_datetime_format"); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4292 pst_fileTimeToStructTM(ft, &stm); |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4293 if (strftime(result, buflen, "%Y%m%dT%H%M%SZ", &stm)==0) { |
43 | 4294 DEBUG_INFO(("Problem occured formatting date\n")); |
4295 } | |
4296 DEBUG_RET(); | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4297 return result; |
43 | 4298 } |
4299 | |
4300 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4301 char* pst_rfc2445_datetime_format_now(int buflen, char* result) { |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4302 struct tm stm; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4303 time_t t = time(NULL); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4304 DEBUG_ENT("rfc2445_datetime_format_now"); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4305 gmtime_r(&t, &stm); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4306 if (strftime(result, buflen, "%Y%m%dT%H%M%SZ", &stm)==0) { |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4307 DEBUG_INFO(("Problem occured formatting date\n")); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4308 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4309 DEBUG_RET(); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4310 return result; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4311 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4312 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4313 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4314 /** Convert a code page integer into a string suitable for iconv() |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4315 * |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4316 * @param cp the code page integer used in the pst file |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4317 * @param[in] buflen length of the output buffer |
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4318 * @param[out] result pointer to output buffer, must be at least 30 bytes |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4319 * @return pointer to a static buffer holding the string representation of the |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4320 * equivalent iconv character set |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4321 */ |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4322 static const char* codepage(int cp, int buflen, char* result); |
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4323 static const char* codepage(int cp, int buflen, char* result) { |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4324 switch (cp) { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4325 case 932 : return "iso-2022-jp"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4326 case 936 : return "gb2313"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4327 case 950 : return "big5"; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4328 case 1200 : return "ucs-2le"; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4329 case 1201 : return "ucs-2be"; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4330 case 20127 : return "us-ascii"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4331 case 20269 : return "iso-6937"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4332 case 20865 : return "iso-8859-15"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4333 case 20866 : return "koi8-r"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4334 case 21866 : return "koi8-u"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4335 case 28591 : return "iso-8859-1"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4336 case 28592 : return "iso-8859-2"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4337 case 28595 : return "iso-8859-5"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4338 case 28596 : return "iso-8859-6"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4339 case 28597 : return "iso-8859-7"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4340 case 28598 : return "iso-8859-8"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4341 case 28599 : return "iso-8859-9"; |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4342 case 28600 : return "iso-8859-10"; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4343 case 28601 : return "iso-8859-11"; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4344 case 28602 : return "iso-8859-12"; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4345 case 28603 : return "iso-8859-13"; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4346 case 28604 : return "iso-8859-14"; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4347 case 28605 : return "iso-8859-15"; |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4348 case 28606 : return "iso-8859-16"; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4349 case 50220 : return "iso-2022-jp"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4350 case 50221 : return "csiso2022jp"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4351 case 51932 : return "euc-jp"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4352 case 51949 : return "euc-kr"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4353 case 65000 : return "utf-7"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4354 case 65001 : return "utf-8"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4355 default : |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4356 snprintf(result, buflen, "windows-%d", cp); |
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4357 return result; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4358 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4359 return NULL; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4360 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4361 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4362 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4363 /** Get the default character set for this item. This is used to find |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4364 * the charset for pst_string elements that are not already in utf8 encoding. |
271 | 4365 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4366 * @param item pointer to the mapi item of interest |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4367 * @param[in] buflen length of the output buffer |
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4368 * @param[out] result pointer to output buffer, must be at least 30 bytes |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4369 * @return default character set as a string useable by iconv() |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4370 */ |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4371 const char* pst_default_charset(pst_item *item, int buflen, char* result) { |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4372 return (item->body_charset.str) ? item->body_charset.str : |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4373 (item->message_codepage) ? codepage(item->message_codepage, buflen, result) : |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4374 (item->internet_cpid) ? codepage(item->internet_cpid, buflen, result) : |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4375 (item->pf && item->pf->charset) ? item->pf->charset : |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4376 "iso-8859-1"; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4377 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4378 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4379 |
257
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4380 /** Convert str to rfc2231 encoding of str |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4381 * |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4382 * @param str pointer to the mapi string of interest |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4383 */ |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4384 void pst_rfc2231(pst_string *str) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4385 int needs = 0; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4386 const int8_t *x = (int8_t *)str->str; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4387 while (*x) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4388 if (*x <= 32) needs++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4389 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4390 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4391 int n = strlen(str->str) + 2*needs + 15; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4392 char *buffer = pst_malloc(n); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4393 strcpy(buffer, "utf-8''"); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4394 x = (int8_t *)str->str; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4395 const uint8_t *y = (uint8_t *)str->str; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4396 uint8_t *z = (uint8_t *)buffer; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4397 z += strlen(buffer); // skip the utf8 prefix |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4398 while (*y) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4399 if (*x <= 32) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4400 *(z++) = (uint8_t)'%'; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4401 snprintf(z, 3, "%2x", *y); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4402 z += 2; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4403 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4404 else { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4405 *(z++) = *y; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4406 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4407 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4408 y++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4409 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4410 *z = '\0'; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4411 free(str->str); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4412 str->str = buffer; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4413 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4414 |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4415 |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4416 /** Convert str to rfc2047 encoding of str, possibly enclosed in quotes if it contains spaces |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4417 * |
271 | 4418 * @param item pointer to the containing mapi item |
4419 * @param str pointer to the mapi string of interest | |
4420 * @param needs_quote true if strings containing spaces should be wrapped in quotes | |
257
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4421 */ |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4422 void pst_rfc2047(pst_item *item, pst_string *str, int needs_quote) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4423 int has_space = 0; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4424 int needs_coding = 0; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4425 pst_convert_utf8(item, str); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4426 const int8_t *x = (int8_t *)str->str; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4427 while (*x) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4428 if (*x == 32) has_space = 1; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4429 if (*x < 32) needs_coding = 1; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4430 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4431 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4432 if (needs_coding) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4433 char *enc = pst_base64_encode_single(str->str, strlen(str->str)); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4434 free(str->str); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4435 int n = strlen(enc) + 20; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4436 str->str = pst_malloc(n); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4437 snprintf(str->str, n, "=?utf-8?B?%s?=", enc); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4438 free(enc); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4439 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4440 else if (has_space && needs_quote) { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4441 int n = strlen(str->str) + 10; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4442 char *buffer = pst_malloc(n); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4443 snprintf(buffer, n, "\"%s\"", str->str); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4444 free(str->str); |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4445 str->str = buffer; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4446 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4447 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4448 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4449 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4450 /** Convert str to utf8 if possible; null strings are preserved. |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4451 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4452 * @param item pointer to the containing mapi item |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4453 * @param str pointer to the mapi string of interest |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4454 */ |
193 | 4455 void pst_convert_utf8_null(pst_item *item, pst_string *str) { |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4456 if (!str->str) return; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4457 pst_convert_utf8(item, str); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4458 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4459 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4460 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4461 /** Convert str to utf8 if possible; null strings are converted into empty strings. |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4462 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4463 * @param item pointer to the containing mapi item |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4464 * @param str pointer to the mapi string of interest |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4465 */ |
193 | 4466 void pst_convert_utf8(pst_item *item, pst_string *str) { |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4467 DEBUG_ENT("pst_convert_utf8"); |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4468 char buffer[30]; |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4469 if (str->is_utf8) { |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4470 DEBUG_WARN(("Already utf8\n")); |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4471 DEBUG_RET(); |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4472 return; |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4473 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4474 if (!str->str) { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4475 str->str = strdup(""); |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4476 DEBUG_WARN(("null to empty string\n")); |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4477 DEBUG_RET(); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4478 return; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4479 } |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4480 const char *charset = pst_default_charset(item, sizeof(buffer), buffer); |
298
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4481 DEBUG_WARN(("default charset is %s\n", charset)); |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4482 if (!strcasecmp("utf-8", charset)) { |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4483 DEBUG_RET(); |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4484 return; |
201464dd356e
add default character set for items where the pst file does not specify a character set
Carl Byington <carl@five-ten-sg.com>
parents:
297
diff
changeset
|
4485 } |
182
b65e8d0a088a
more cleanup on external names in the shared object file
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
4486 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
|
4487 size_t rc = pst_vb_8bit2utf8(newer, str->str, strlen(str->str) + 1, charset); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4488 if (rc == (size_t)-1) { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4489 free(newer->b); |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
4490 DEBUG_WARN(("Failed to convert %s to utf-8 - %s\n", charset, str->str)); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4491 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4492 else { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4493 free(str->str); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4494 str->str = newer->b; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4495 str->is_utf8 = 1; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4496 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4497 free(newer); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4498 DEBUG_RET(); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4499 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4500 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4501 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4502 /** Decode raw recurrence data into a better structure. |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4503 * @param appt pointer to appointment structure |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4504 * @return pointer to decoded recurrence structure that must be free'd by the caller. |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4505 */ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4506 pst_recurrence* pst_convert_recurrence(pst_item_appointment* appt) |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4507 { |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4508 const int bias = 30 * 24 * 60; // minutes in 30 days |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4509 int m[4] = {3,4,4,5}; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4510 pst_recurrence *r = pst_malloc(sizeof(pst_recurrence)); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4511 memset(r, 0, sizeof(pst_recurrence)); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4512 size_t s = appt->recurrence_data.size; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4513 size_t i = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4514 char* p = appt->recurrence_data.data; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4515 if (p) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4516 if (i+4 <= s) { r->signature = PST_LE_GET_UINT32(p+i); i += 4; } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4517 if (i <= s) { r->type = PST_LE_GET_UINT8(p+i) - 0x0a; i += 2; } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4518 if (i+4 <= s) { r->sub_type = PST_LE_GET_UINT32(p+i); i += 4; } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4519 if (r->sub_type <= 3) { |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4520 int n = m[r->sub_type]; // number of parms for this sub_type |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4521 int j = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4522 for (j=0; j<n; j++) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4523 if (i+4 <= s) { *(&r->parm1 + j) = PST_LE_GET_UINT32(p+i); i += 4; } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4524 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4525 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4526 if (i <= s) { r->termination = PST_LE_GET_UINT8(p+i) - 0x21; i += 4; } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4527 if (i+4 <= s) { r->count = PST_LE_GET_UINT32(p+i); i += 4; } |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
4528 if (r->termination == 2) r->count = 0; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4529 switch (r->type) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4530 case 0: // daily |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4531 if (r->sub_type == 0) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4532 // simple daily |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4533 r->interval = r->parm2 / (24 * 60); // was minutes between recurrences |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4534 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4535 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4536 // daily every weekday, subset of weekly |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4537 r->interval = 1; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4538 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4539 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4540 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4541 case 1: // weekly |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4542 r->interval = r->parm2; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4543 r->bydaymask = r->parm4; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4544 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4545 case 2: // monthly |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4546 r->interval = r->parm2; |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4547 if (r->sub_type == 2) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4548 // monthly on day d |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4549 r->dayofmonth = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4550 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4551 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4552 // monthly on 2nd tuesday |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4553 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4554 r->position = r->parm5; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4555 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4556 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4557 case 3: // yearly |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4558 r->interval = 1; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4559 r->monthofyear = ((r->parm1 + bias/2) / bias) + 1; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4560 if (r->sub_type == 2) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4561 // yearly on day d of month m |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4562 r->dayofmonth = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4563 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4564 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4565 // yearly on 2nd tuesday of month m |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4566 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4567 r->position = r->parm5; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4568 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4569 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4570 default: |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4571 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4572 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4573 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4574 return r; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4575 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4576 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4577 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4578 /** Free a recurrence structure. |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4579 * @param r input pointer to be freed |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4580 */ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4581 void pst_free_recurrence(pst_recurrence* r) |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4582 { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4583 if (r) free(r); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4584 } |