Mercurial > libpst
annotate src/libpst.c @ 340:0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Fri, 27 Dec 2013 08:27:47 -0800 |
parents | c507af52515a |
children | c638905665bc |
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; | |
46 | 1046 if (x == (int32_t)1) { // first entry |
43 | 1047 if ((start_val) && (index.id != start_val)) { |
1048 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); | |
1049 if (buf) free(buf); | |
1050 DEBUG_RET(); | |
1051 return -1; | |
1052 } | |
1053 } | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1054 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
|
1055 i_ptr->i_id = index.id; |
43 | 1056 i_ptr->offset = index.offset; |
1057 i_ptr->u1 = index.u1; | |
1058 i_ptr->size = index.size; | |
1059 i_ptr->next = NULL; | |
1060 if (pf->i_tail) pf->i_tail->next = i_ptr; | |
1061 if (!pf->i_head) pf->i_head = i_ptr; | |
1062 pf->i_tail = i_ptr; | |
1063 } | |
1064 } else { | |
1065 // this node contains node pointers | |
1066 x = 0; | |
1067 while (x < item_count) { | |
46 | 1068 bptr += pst_decode_table(pf, &table, bptr); |
43 | 1069 x++; |
1070 if (table.start == 0) break; | |
1071 if (x < item_count) { | |
46 | 1072 (void)pst_decode_table(pf, &table2, bptr); |
43 | 1073 } |
1074 else { | |
1075 table2.start = end_val; | |
1076 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1077 DEBUG_INFO(("[%i] %i Index Table [start id = %#"PRIx64", u1 = %#"PRIx64", offset = %#"PRIx64", end id = %#"PRIx64"]\n", |
43 | 1078 depth, x, table.start, table.u1, table.offset, table2.start)); |
1079 if ((table.start >= end_val) || (table.start < old)) { | |
1080 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); | |
1081 if (buf) free(buf); | |
1082 DEBUG_RET(); | |
1083 return -1; | |
1084 } | |
1085 old = table.start; | |
46 | 1086 if (x == (int32_t)1) { // first entry |
43 | 1087 if ((start_val) && (table.start != start_val)) { |
1088 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); | |
1089 if (buf) free(buf); | |
1090 DEBUG_RET(); | |
1091 return -1; | |
1092 } | |
1093 } | |
46 | 1094 (void)pst_build_id_ptr(pf, table.offset, depth+1, table.u1, table.start, table2.start); |
43 | 1095 } |
1096 } | |
1097 if (buf) free (buf); | |
1098 DEBUG_RET(); | |
1099 return 0; | |
16 | 1100 } |
1101 | |
1102 | |
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
|
1103 /** 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
|
1104 * 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
|
1105 * 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
|
1106 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
1107 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
|
1108 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
|
1109 pst_desc desc_rec; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1110 int32_t item_count; |
48 | 1111 uint64_t old = start_val; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1112 int x; |
43 | 1113 char *buf = NULL, *bptr; |
1114 | |
46 | 1115 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
|
1116 DEBUG_INFO(("offset %#"PRIx64" depth %i linku1 %#"PRIx64" start %#"PRIx64" end %#"PRIx64"\n", offset, depth, linku1, start_val, end_val)); |
43 | 1117 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
|
1118 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 | 1119 DEBUG_RET(); |
1120 return -1; | |
1121 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1122 DEBUG_INFO(("Reading desc block\n")); |
51 | 1123 if (pst_read_block_size(pf, offset, DESC_BLOCK_SIZE, &buf) < DESC_BLOCK_SIZE) { |
43 | 1124 DEBUG_WARN(("Failed to read %i bytes\n", DESC_BLOCK_SIZE)); |
1125 if (buf) free(buf); | |
1126 DEBUG_RET(); | |
1127 return -1; | |
1128 } | |
1129 bptr = buf; | |
46 | 1130 item_count = (int32_t)(unsigned)(buf[ITEM_COUNT_OFFSET]); |
1131 | |
1132 desc_rec.d_id = pst_getIntAt(pf, buf+BACKLINK_OFFSET); | |
43 | 1133 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
|
1134 DEBUG_WARN(("Backlink %#"PRIx64" in this node does not match required %#"PRIx64"\n", desc_rec.d_id, linku1)); |
43 | 1135 if (buf) free(buf); |
1136 DEBUG_RET(); | |
1137 return -1; | |
1138 } | |
1139 if (buf[LEVEL_INDICATOR_OFFSET] == '\0') { | |
1140 // this node contains leaf pointers | |
44 | 1141 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, DESC_SIZE32); |
43 | 1142 if (item_count > DESC_COUNT_MAX) { |
1143 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, DESC_COUNT_MAX)); | |
1144 if (buf) free(buf); | |
1145 DEBUG_RET(); | |
1146 return -1; | |
1147 } | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1148 for (x=0; x<item_count; x++) { |
46 | 1149 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
|
1150 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
|
1151 depth, x, desc_rec.d_id, desc_rec.desc_id, desc_rec.tree_id, desc_rec.parent_d_id)); |
43 | 1152 if ((desc_rec.d_id >= end_val) || (desc_rec.d_id < old)) { |
1153 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); | |
1154 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, 16); | |
1155 if (buf) free(buf); | |
1156 DEBUG_RET(); | |
1157 return -1; | |
1158 } | |
1159 old = desc_rec.d_id; | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1160 if (x == 0) { // first entry |
43 | 1161 if (start_val && (desc_rec.d_id != start_val)) { |
1162 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); | |
1163 if (buf) free(buf); | |
1164 DEBUG_RET(); | |
1165 return -1; | |
1166 } | |
1167 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1168 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
|
1169 { |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1170 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
|
1171 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
|
1172 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
|
1173 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
|
1174 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
|
1175 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
|
1176 } |
43 | 1177 } |
1178 } else { | |
1179 // this node contains node pointers | |
44 | 1180 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, ITEM_SIZE32); |
43 | 1181 if (item_count > INDEX_COUNT_MAX) { |
1182 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, INDEX_COUNT_MAX)); | |
1183 if (buf) free(buf); | |
1184 DEBUG_RET(); | |
1185 return -1; | |
1186 } | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1187 for (x=0; x<item_count; x++) { |
46 | 1188 bptr += pst_decode_table(pf, &table, bptr); |
43 | 1189 if (table.start == 0) break; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1190 if (x < (item_count-1)) { |
46 | 1191 (void)pst_decode_table(pf, &table2, bptr); |
43 | 1192 } |
1193 else { | |
1194 table2.start = end_val; | |
1195 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1196 DEBUG_INFO(("[%i] %i Descriptor Table [start id = %#"PRIx64", u1 = %#"PRIx64", offset = %#"PRIx64", end id = %#"PRIx64"]\n", |
43 | 1197 depth, x, table.start, table.u1, table.offset, table2.start)); |
1198 if ((table.start >= end_val) || (table.start < old)) { | |
1199 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); | |
1200 if (buf) free(buf); | |
1201 DEBUG_RET(); | |
1202 return -1; | |
1203 } | |
1204 old = table.start; | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1205 if (x == 0) { // first entry |
46 | 1206 if (start_val && (table.start != start_val)) { |
43 | 1207 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); |
1208 if (buf) free(buf); | |
1209 DEBUG_RET(); | |
1210 return -1; | |
1211 } | |
1212 } | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1213 (void)pst_build_desc_ptr(pf, table.offset, depth+1, table.u1, table.start, table2.start); |
43 | 1214 } |
1215 } | |
1216 if (buf) free(buf); | |
1217 DEBUG_RET(); | |
1218 return 0; | |
16 | 1219 } |
1220 | |
1221 | |
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
|
1222 /** 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
|
1223 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1224 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
|
1225 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
|
1226 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
|
1227 pst_id2_tree *id2_ptr = NULL; |
43 | 1228 pst_item *item = NULL; |
1229 pst_item_attach *attach = NULL; | |
46 | 1230 int32_t x; |
1231 DEBUG_ENT("pst_parse_item"); | |
43 | 1232 if (!d_ptr) { |
1233 DEBUG_WARN(("you cannot pass me a NULL! I don't want it!\n")); | |
1234 DEBUG_RET(); | |
1235 return NULL; | |
1236 } | |
1237 | |
1238 if (!d_ptr->desc) { | |
1239 DEBUG_WARN(("why is d_ptr->desc == NULL? I don't want to do anything else with this record\n")); | |
1240 DEBUG_RET(); | |
1241 return NULL; | |
1242 } | |
1243 | |
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
|
1244 if (d_ptr->assoc_tree) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1245 if (m_head) { |
203 | 1246 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
|
1247 m_head = NULL; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1248 } |
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
|
1249 id2_head = pst_build_id2(pf, d_ptr->assoc_tree); |
43 | 1250 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1251 pst_printID2ptr(id2_head); |
43 | 1252 |
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
|
1253 list = pst_parse_block(pf, d_ptr->desc->i_id, id2_head); |
43 | 1254 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
|
1255 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
|
1256 if (!m_head) pst_free_id2(id2_head); |
43 | 1257 DEBUG_RET(); |
1258 return NULL; | |
1259 } | |
1260 | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1261 item = (pst_item*) pst_malloc(sizeof(pst_item)); |
43 | 1262 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
|
1263 item->pf = pf; |
43 | 1264 |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1265 if (pst_process(d_ptr->desc->i_id, list, item, NULL)) { |
46 | 1266 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
|
1267 pst_freeItem(item); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1268 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1269 if (!m_head) pst_free_id2(id2_head); |
43 | 1270 DEBUG_RET(); |
1271 return NULL; | |
1272 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1273 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1274 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1275 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
|
1276 // 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
|
1277 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
|
1278 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
|
1279 if (list) { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1280 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
|
1281 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
|
1282 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
|
1283 attach->next = item->attach; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1284 item->attach = attach; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1285 } |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1286 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
|
1287 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
|
1288 pst_freeItem(item); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1289 pst_free_list(list); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1290 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
|
1291 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1292 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1293 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1294 pst_free_list(list); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1295 } 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
|
1296 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
|
1297 // 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
|
1298 // DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1299 // 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
|
1300 } |
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
|
1301 } |
46 | 1302 |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1303 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
|
1304 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
|
1305 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
|
1306 if (!list) { |
43 | 1307 DEBUG_WARN(("ERROR error processing main attachment record\n")); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1308 if (!m_head) pst_free_id2(id2_head); |
43 | 1309 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
|
1310 return item; |
43 | 1311 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1312 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
|
1313 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
|
1314 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
|
1315 attach->next = item->attach; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1316 item->attach = attach; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1317 } |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1318 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
|
1319 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
|
1320 pst_freeItem(item); |
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 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
|
1323 DEBUG_RET(); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1324 return NULL; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1325 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1326 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1327 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1328 // 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
|
1329 // 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
|
1330 // 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
|
1331 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
|
1332 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
|
1333 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
|
1334 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
|
1335 // 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
|
1336 // 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
|
1337 // 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
|
1338 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
|
1339 if (!list) { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1340 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
|
1341 continue; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1342 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1343 if (list->count_objects > 1) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1344 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
|
1345 } |
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
|
1346 // 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
|
1347 // 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
|
1348 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
|
1349 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
|
1350 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1351 continue; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1352 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1353 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1354 id2_ptr = pst_getID2(id2_head, attach->id2_val); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1355 if (id2_ptr) { |
260
156cf548c764
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
257
diff
changeset
|
1356 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
|
1357 // 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
|
1358 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
|
1359 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
|
1360 } else { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1361 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
|
1362 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1363 } else { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1364 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
|
1365 attach->id2_val = 0; // suppress this missing attachment |
43 | 1366 } |
1367 } | |
1368 } | |
1369 | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1370 if (!m_head) pst_free_id2(id2_head); |
43 | 1371 DEBUG_RET(); |
1372 return item; | |
16 | 1373 } |
1374 | |
1375 | |
49 | 1376 static void freeall(pst_subblocks *subs, pst_block_offset_pointer *p1, |
1377 pst_block_offset_pointer *p2, | |
1378 pst_block_offset_pointer *p3, | |
1379 pst_block_offset_pointer *p4, | |
1380 pst_block_offset_pointer *p5, | |
1381 pst_block_offset_pointer *p6, | |
1382 pst_block_offset_pointer *p7); | |
1383 static void freeall(pst_subblocks *subs, pst_block_offset_pointer *p1, | |
1384 pst_block_offset_pointer *p2, | |
1385 pst_block_offset_pointer *p3, | |
1386 pst_block_offset_pointer *p4, | |
1387 pst_block_offset_pointer *p5, | |
1388 pst_block_offset_pointer *p6, | |
1389 pst_block_offset_pointer *p7) { | |
1390 size_t i; | |
1391 for (i=0; i<subs->subblock_count; i++) { | |
1392 if (subs->subs[i].buf) free(subs->subs[i].buf); | |
1393 } | |
1394 free(subs->subs); | |
43 | 1395 if (p1->needfree) free(p1->from); |
1396 if (p2->needfree) free(p2->from); | |
1397 if (p3->needfree) free(p3->from); | |
1398 if (p4->needfree) free(p4->from); | |
1399 if (p5->needfree) free(p5->from); | |
1400 if (p6->needfree) free(p6->from); | |
1401 if (p7->needfree) free(p7->from); | |
35 | 1402 } |
1403 | |
1404 | |
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
|
1405 /** 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
|
1406 * 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
|
1407 * |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1408 * @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
|
1409 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1410 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
|
1411 pst_mapi_object *mo_head = NULL; |
52 | 1412 char *buf = NULL; |
1413 size_t read_size = 0; | |
49 | 1414 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
|
1415 pst_mapi_object *mo_ptr = NULL; |
43 | 1416 pst_block_offset_pointer block_offset1; |
1417 pst_block_offset_pointer block_offset2; | |
1418 pst_block_offset_pointer block_offset3; | |
1419 pst_block_offset_pointer block_offset4; | |
1420 pst_block_offset_pointer block_offset5; | |
1421 pst_block_offset_pointer block_offset6; | |
1422 pst_block_offset_pointer block_offset7; | |
46 | 1423 int32_t x; |
203 | 1424 int32_t num_mapi_objects; |
1425 int32_t count_mapi_objects; | |
1426 int32_t num_mapi_elements; | |
1427 int32_t count_mapi_elements; | |
47 | 1428 int block_type; |
43 | 1429 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
|
1430 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
|
1431 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
|
1432 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
|
1433 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
|
1434 char* ind2_ptr = NULL; |
43 | 1435 pst_x_attrib_ll *mapptr; |
50 | 1436 pst_block_hdr block_hdr; |
1437 pst_table3_rec table3_rec; //for type 3 (0x0101) blocks | |
48 | 1438 |
43 | 1439 struct { |
1440 unsigned char seven_c; | |
1441 unsigned char item_count; | |
1442 uint16_t u1; | |
1443 uint16_t u2; | |
1444 uint16_t u3; | |
1445 uint16_t rec_size; | |
1446 uint32_t b_five_offset; | |
1447 uint32_t ind2_offset; | |
1448 uint16_t u7; | |
1449 uint16_t u8; | |
1450 } seven_c_blk; | |
48 | 1451 |
43 | 1452 struct _type_d_rec { |
1453 uint32_t id; | |
1454 uint32_t u1; | |
1455 } * type_d_rec; | |
1456 | |
48 | 1457 struct { |
1458 uint16_t type; | |
1459 uint16_t ref_type; | |
1460 uint32_t value; | |
1461 } table_rec; //for type 1 (0xBCEC) blocks | |
1462 | |
1463 struct { | |
1464 uint16_t ref_type; | |
1465 uint16_t type; | |
1466 uint16_t ind2_off; | |
1467 uint8_t size; | |
1468 uint8_t slot; | |
1469 } table2_rec; //for type 2 (0x7CEC) blocks | |
1470 | |
46 | 1471 DEBUG_ENT("pst_parse_block"); |
1472 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
|
1473 DEBUG_WARN(("Error reading block id %#"PRIx64"\n", block_id)); |
43 | 1474 if (buf) free (buf); |
1475 DEBUG_RET(); | |
1476 return NULL; | |
1477 } | |
1478 | |
1479 block_offset1.needfree = 0; | |
1480 block_offset2.needfree = 0; | |
1481 block_offset3.needfree = 0; | |
1482 block_offset4.needfree = 0; | |
1483 block_offset5.needfree = 0; | |
1484 block_offset6.needfree = 0; | |
1485 block_offset7.needfree = 0; | |
1486 | |
1487 memcpy(&block_hdr, buf, sizeof(block_hdr)); | |
1488 LE16_CPU(block_hdr.index_offset); | |
1489 LE16_CPU(block_hdr.type); | |
1490 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
|
1491 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#hx)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
43 | 1492 |
49 | 1493 if (block_hdr.index_offset == (uint16_t)0x0101) { //type 3 |
50 | 1494 size_t i; |
1495 char *b_ptr = buf + 8; | |
49 | 1496 subblocks.subblock_count = block_hdr.type; |
1497 subblocks.subs = malloc(sizeof(pst_subblock) * subblocks.subblock_count); | |
1498 for (i=0; i<subblocks.subblock_count; i++) { | |
1499 b_ptr += pst_decode_type3(pf, &table3_rec, b_ptr); | |
1500 subblocks.subs[i].buf = NULL; | |
1501 subblocks.subs[i].read_size = pst_ff_getIDblock_dec(pf, table3_rec.id, &subblocks.subs[i].buf); | |
1502 if (subblocks.subs[i].buf) { | |
1503 memcpy(&block_hdr, subblocks.subs[i].buf, sizeof(block_hdr)); | |
1504 LE16_CPU(block_hdr.index_offset); | |
1505 subblocks.subs[i].i_offset = block_hdr.index_offset; | |
1506 } | |
1507 else { | |
1508 subblocks.subs[i].read_size = 0; | |
1509 subblocks.subs[i].i_offset = 0; | |
1510 } | |
1511 } | |
1512 free(buf); | |
1513 memcpy(&block_hdr, subblocks.subs[0].buf, sizeof(block_hdr)); | |
1514 LE16_CPU(block_hdr.index_offset); | |
1515 LE16_CPU(block_hdr.type); | |
1516 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
|
1517 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#hx)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
49 | 1518 } |
1519 else { | |
1520 // setup the subblock descriptors, but we only have one block | |
50 | 1521 subblocks.subblock_count = (size_t)1; |
49 | 1522 subblocks.subs = malloc(sizeof(pst_subblock)); |
1523 subblocks.subs[0].buf = buf; | |
1524 subblocks.subs[0].read_size = read_size; | |
1525 subblocks.subs[0].i_offset = block_hdr.index_offset; | |
1526 } | |
43 | 1527 |
46 | 1528 if (block_hdr.type == (uint16_t)0xBCEC) { //type 1 |
43 | 1529 block_type = 1; |
1530 | |
49 | 1531 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
|
1532 DEBUG_WARN(("internal error (bc.b5 offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id)); |
49 | 1533 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1534 DEBUG_RET(); |
1535 return NULL; | |
1536 } | |
1537 memcpy(&table_rec, block_offset1.from, sizeof(table_rec)); | |
1538 LE16_CPU(table_rec.type); | |
1539 LE16_CPU(table_rec.ref_type); | |
1540 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
|
1541 DEBUG_INFO(("table_rec (type=%#hx, ref_type=%#hx, value=%#x)\n", table_rec.type, table_rec.ref_type, table_rec.value)); |
43 | 1542 |
75
987aa872294e
Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents:
73
diff
changeset
|
1543 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
|
1544 DEBUG_WARN(("Unknown second block constant - %#hx %#hx for id %#"PRIx64"\n", table_rec.type, table_rec.ref_type, block_id)); |
49 | 1545 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1546 DEBUG_RET(); |
1547 return NULL; | |
1548 } | |
1549 | |
49 | 1550 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
|
1551 DEBUG_WARN(("internal error (bc.b5.desc offset #x) in reading block id %#"PRIx64"\n", table_rec.value, block_id)); |
49 | 1552 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1553 DEBUG_RET(); |
1554 return NULL; | |
1555 } | |
1556 list_start = block_offset2.from; | |
1557 to_ptr = block_offset2.to; | |
203 | 1558 num_mapi_elements = (to_ptr - list_start)/sizeof(table_rec); |
1559 num_mapi_objects = 1; // only going to be one object in these blocks | |
43 | 1560 } |
46 | 1561 else if (block_hdr.type == (uint16_t)0x7CEC) { //type 2 |
43 | 1562 block_type = 2; |
1563 | |
49 | 1564 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
|
1565 DEBUG_WARN(("internal error (7c.7c offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id)); |
49 | 1566 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1567 DEBUG_RET(); |
1568 return NULL; | |
1569 } | |
1570 fr_ptr = block_offset3.from; //now got pointer to "7C block" | |
1571 memset(&seven_c_blk, 0, sizeof(seven_c_blk)); | |
1572 memcpy(&seven_c_blk, fr_ptr, sizeof(seven_c_blk)); | |
1573 LE16_CPU(seven_c_blk.u1); | |
1574 LE16_CPU(seven_c_blk.u2); | |
1575 LE16_CPU(seven_c_blk.u3); | |
1576 LE16_CPU(seven_c_blk.rec_size); | |
1577 LE32_CPU(seven_c_blk.b_five_offset); | |
1578 LE32_CPU(seven_c_blk.ind2_offset); | |
1579 LE16_CPU(seven_c_blk.u7); | |
1580 LE16_CPU(seven_c_blk.u8); | |
1581 | |
1582 list_start = fr_ptr + sizeof(seven_c_blk); // the list of item numbers start after this record | |
1583 | |
1584 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
|
1585 DEBUG_WARN(("Error. There isn't a 7C where I want to see 7C!\n")); |
49 | 1586 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1587 DEBUG_RET(); |
1588 return NULL; | |
1589 } | |
1590 | |
1591 rec_size = seven_c_blk.rec_size; | |
203 | 1592 num_mapi_elements = (int32_t)(unsigned)seven_c_blk.item_count; |
43 | 1593 |
49 | 1594 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
|
1595 DEBUG_WARN(("internal error (7c.b5 offset %#x) in reading block id %#"PRIx64"\n", seven_c_blk.b_five_offset, block_id)); |
49 | 1596 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1597 DEBUG_RET(); |
1598 return NULL; | |
1599 } | |
1600 memcpy(&table_rec, block_offset4.from, sizeof(table_rec)); | |
1601 LE16_CPU(table_rec.type); | |
1602 LE16_CPU(table_rec.ref_type); | |
1603 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
|
1604 DEBUG_INFO(("table_rec (type=%#hx, ref_type=%#hx, value=%#x)\n", table_rec.type, table_rec.ref_type, table_rec.value)); |
43 | 1605 |
46 | 1606 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
|
1607 DEBUG_WARN(("Unknown second block constant - %#hx for id %#"PRIx64"\n", table_rec.type, block_id)); |
49 | 1608 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1609 DEBUG_RET(); |
1610 return NULL; | |
1611 } | |
1612 | |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1613 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
|
1614 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
|
1615 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
|
1616 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
|
1617 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1618 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1619 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1620 |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1621 // 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
|
1622 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
|
1623 |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1624 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
|
1625 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
|
1626 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
|
1627 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1628 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1629 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1630 ind2_ptr = block_offset6.from; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1631 ind2_end = block_offset6.to; |
43 | 1632 } |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1633 else { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1634 num_mapi_objects = 0; |
43 | 1635 } |
203 | 1636 DEBUG_INFO(("7cec block index2 pointer %#x and end %#x\n", ind2_ptr, ind2_end)); |
43 | 1637 } |
49 | 1638 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
|
1639 DEBUG_WARN(("ERROR: Unknown block constant - %#hx for id %#"PRIx64"\n", block_hdr.type, block_id)); |
49 | 1640 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1641 DEBUG_RET(); |
1642 return NULL; | |
1643 } | |
1644 | |
203 | 1645 DEBUG_INFO(("found %i mapi objects each with %i mapi elements\n", num_mapi_objects, num_mapi_elements)); |
1646 for (count_mapi_objects=0; count_mapi_objects<num_mapi_objects; count_mapi_objects++) { | |
1647 // 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
|
1648 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
|
1649 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
|
1650 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
|
1651 mo_head = mo_ptr; |
203 | 1652 // allocate the array of mapi elements |
1653 mo_ptr->elements = (pst_mapi_element**) pst_malloc(sizeof(pst_mapi_element)*num_mapi_elements); | |
1654 mo_ptr->count_elements = num_mapi_elements; | |
1655 mo_ptr->orig_count = num_mapi_elements; | |
1656 mo_ptr->count_objects = (int32_t)num_mapi_objects; // each record will have a record of the total number of records | |
1657 for (x=0; x<num_mapi_elements; x++) mo_ptr->elements[x] = NULL; | |
1658 | |
1659 DEBUG_INFO(("going to read %i mapi elements for mapi object %i\n", num_mapi_elements, count_mapi_objects)); | |
1660 | |
1661 fr_ptr = list_start; // initialize fr_ptr to the start of the list. | |
1662 x = 0; // x almost tracks count_mapi_elements, but see 'continue' statement below | |
1663 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
|
1664 char* value_pointer = NULL; // needed for block type 2 with values larger than 4 bytes |
46 | 1665 size_t value_size = 0; |
47 | 1666 if (block_type == 1) { |
43 | 1667 memcpy(&table_rec, fr_ptr, sizeof(table_rec)); |
1668 LE16_CPU(table_rec.type); | |
1669 LE16_CPU(table_rec.ref_type); | |
1670 //LE32_CPU(table_rec.value); // done later, some may be order invariant | |
1671 fr_ptr += sizeof(table_rec); | |
47 | 1672 } else if (block_type == 2) { |
43 | 1673 // we will copy the table2_rec values into a table_rec record so that we can keep the rest of the code |
1674 memcpy(&table2_rec, fr_ptr, sizeof(table2_rec)); | |
1675 LE16_CPU(table2_rec.ref_type); | |
1676 LE16_CPU(table2_rec.type); | |
1677 LE16_CPU(table2_rec.ind2_off); | |
203 | 1678 DEBUG_INFO(("reading element %i (type=%#x, ref_type=%#x, offset=%#x, size=%#x)\n", |
1679 x, table2_rec.type, table2_rec.ref_type, table2_rec.ind2_off, table2_rec.size)); | |
43 | 1680 |
1681 // table_rec and table2_rec are arranged differently, so assign the values across | |
1682 table_rec.type = table2_rec.type; | |
1683 table_rec.ref_type = table2_rec.ref_type; | |
1684 table_rec.value = 0; | |
50 | 1685 if ((ind2_end - ind2_ptr) >= (int)(table2_rec.ind2_off + table2_rec.size)) { |
46 | 1686 size_t n = table2_rec.size; |
1687 size_t m = sizeof(table_rec.value); | |
43 | 1688 if (n <= m) { |
1689 memcpy(&table_rec.value, ind2_ptr + table2_rec.ind2_off, n); | |
1690 } | |
1691 else { | |
1692 value_pointer = ind2_ptr + table2_rec.ind2_off; | |
1693 value_size = n; | |
1694 } | |
1695 //LE32_CPU(table_rec.value); // done later, some may be order invariant | |
1696 } | |
1697 else { | |
1698 DEBUG_WARN (("Trying to read outside buffer, buffer size %#x, offset %#x, data size %#x\n", | |
1699 read_size, ind2_end-ind2_ptr+table2_rec.ind2_off, table2_rec.size)); | |
1700 } | |
1701 fr_ptr += sizeof(table2_rec); | |
1702 } 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
|
1703 DEBUG_WARN(("Missing code for block_type %i\n", block_type)); |
49 | 1704 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
|
1705 pst_free_list(mo_head); |
43 | 1706 DEBUG_RET(); |
1707 return NULL; | |
1708 } | |
203 | 1709 DEBUG_INFO(("reading element %i (type=%#x, ref_type=%#x, value=%#x)\n", |
43 | 1710 x, table_rec.type, table_rec.ref_type, table_rec.value)); |
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 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
|
1713 mo_ptr->elements[x] = (pst_mapi_element*) pst_malloc(sizeof(pst_mapi_element)); |
43 | 1714 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1715 memset(mo_ptr->elements[x], 0, sizeof(pst_mapi_element)); //init it |
43 | 1716 |
1717 // check here to see if the id of the attribute is a mapped one | |
1718 mapptr = pf->x_head; | |
1719 while (mapptr && (mapptr->map < table_rec.type)) mapptr = mapptr->next; | |
1720 if (mapptr && (mapptr->map == table_rec.type)) { | |
1721 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
|
1722 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
|
1723 DEBUG_INFO(("Mapped attrib %#x to %#x\n", table_rec.type, mo_ptr->elements[x]->mapi_id)); |
43 | 1724 } 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
|
1725 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
|
1726 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
|
1727 mo_ptr->elements[x]->extra = mapptr->data; |
43 | 1728 } |
46 | 1729 else { |
94
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
1730 DEBUG_WARN(("Missing assertion failure\n")); |
46 | 1731 // nothing, should be assertion failure here |
1732 } | |
43 | 1733 } else { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1734 mo_ptr->elements[x]->mapi_id = table_rec.type; |
43 | 1735 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1736 mo_ptr->elements[x]->type = 0; // checked later before it is set |
43 | 1737 /* Reference Types |
1738 0x0002 - Signed 16bit value | |
1739 0x0003 - Signed 32bit value | |
1740 0x0004 - 4-byte floating point | |
1741 0x0005 - Floating point double | |
1742 0x0006 - Signed 64-bit int | |
1743 0x0007 - Application Time | |
1744 0x000A - 32-bit error value | |
1745 0x000B - Boolean (non-zero = true) | |
1746 0x000D - Embedded Object | |
1747 0x0014 - 8-byte signed integer (64-bit) | |
1748 0x001E - Null terminated String | |
1749 0x001F - Unicode string | |
1750 0x0040 - Systime - Filetime structure | |
1751 0x0048 - OLE Guid | |
1752 0x0102 - Binary data | |
1753 0x1003 - Array of 32bit values | |
1754 0x1014 - Array of 64bit values | |
1755 0x101E - Array of Strings | |
1756 0x1102 - Array of Binary data | |
1757 */ | |
1758 | |
46 | 1759 if (table_rec.ref_type == (uint16_t)0x0002 || |
1760 table_rec.ref_type == (uint16_t)0x0003 || | |
1761 table_rec.ref_type == (uint16_t)0x000b) { | |
43 | 1762 //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
|
1763 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
|
1764 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
|
1765 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
|
1766 memcpy(mo_ptr->elements[x]->data, &(table_rec.value), sizeof(int32_t)); |
51 | 1767 // are we missing an LE32_CPU() call here? table_rec.value is still |
1768 // in the original order. | |
43 | 1769 |
46 | 1770 } else if (table_rec.ref_type == (uint16_t)0x0005 || |
1771 table_rec.ref_type == (uint16_t)0x000d || | |
1772 table_rec.ref_type == (uint16_t)0x0014 || | |
1773 table_rec.ref_type == (uint16_t)0x001e || | |
1774 table_rec.ref_type == (uint16_t)0x001f || | |
1775 table_rec.ref_type == (uint16_t)0x0040 || | |
1776 table_rec.ref_type == (uint16_t)0x0048 || | |
1777 table_rec.ref_type == (uint16_t)0x0102 || | |
1778 table_rec.ref_type == (uint16_t)0x1003 || | |
1779 table_rec.ref_type == (uint16_t)0x1014 || | |
1780 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
|
1781 table_rec.ref_type == (uint16_t)0x101f || |
46 | 1782 table_rec.ref_type == (uint16_t)0x1102) { |
43 | 1783 //contains index reference to data |
1784 LE32_CPU(table_rec.value); | |
1785 if (value_pointer) { | |
1786 // in a type 2 block, with a value that is more than 4 bytes | |
1787 // 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
|
1788 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
|
1789 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
|
1790 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
|
1791 memcpy(mo_ptr->elements[x]->data, value_pointer, value_size); |
43 | 1792 } |
49 | 1793 else if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, table_rec.value, &block_offset7)) { |
46 | 1794 if ((table_rec.value & 0xf) == (uint32_t)0xf) { |
43 | 1795 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
|
1796 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
|
1797 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
|
1798 mo_ptr->elements[x]->type = table_rec.value; |
43 | 1799 } |
1800 else { | |
1801 if (table_rec.value) { | |
1802 DEBUG_WARN(("failed to get block offset for table_rec.value of %#x\n", table_rec.value)); | |
1803 } | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1804 mo_ptr->count_elements --; //we will be skipping a row |
43 | 1805 continue; |
1806 } | |
1807 } | |
1808 else { | |
50 | 1809 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
|
1810 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
|
1811 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
|
1812 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
|
1813 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
|
1814 mo_ptr->elements[x]->data[value_size] = '\0'; // it might be a string, null terminate it. |
43 | 1815 } |
46 | 1816 if (table_rec.ref_type == (uint16_t)0xd) { |
43 | 1817 // 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
|
1818 type_d_rec = (struct _type_d_rec*) mo_ptr->elements[x]->data; |
43 | 1819 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
|
1820 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
|
1821 if (!mo_ptr->elements[x]->size){ |
43 | 1822 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
|
1823 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
|
1824 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
|
1825 mo_ptr->elements[x]->data = NULL; |
43 | 1826 } |
1827 } | |
46 | 1828 if (table_rec.ref_type == (uint16_t)0x1f) { |
43 | 1829 // 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
|
1830 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
|
1831 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
|
1832 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
|
1833 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
|
1834 if (!utf8buf) utf8buf = pst_vballoc((size_t)1024); |
46 | 1835 |
43 | 1836 //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
|
1837 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
|
1838 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
|
1839 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
|
1840 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
|
1841 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
|
1842 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
|
1843 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
|
1844 } |
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
1845 else { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1846 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
|
1847 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
|
1848 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
|
1849 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
|
1850 } |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1851 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
|
1852 DEBUG_HEXDUMPC(mo_ptr->elements[x]->data, mo_ptr->elements[x]->size, 0x10); |
43 | 1853 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1854 if (mo_ptr->elements[x]->type == 0) mo_ptr->elements[x]->type = table_rec.ref_type; |
43 | 1855 } 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
|
1856 DEBUG_WARN(("ERROR Unknown ref_type %#hx\n", table_rec.ref_type)); |
49 | 1857 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
|
1858 pst_free_list(mo_head); |
43 | 1859 DEBUG_RET(); |
1860 return NULL; | |
1861 } | |
1862 x++; | |
1863 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1864 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 | 1865 ind2_ptr += rec_size; |
1866 } | |
49 | 1867 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1868 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
|
1869 return mo_head; |
16 | 1870 } |
1871 | |
51 | 1872 |
48 | 1873 // This version of free does NULL check first |
1874 #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
|
1875 #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
|
1876 #define SAFE_FREE_BIN(x) SAFE_FREE(x.data) |
16 | 1877 |
1878 // 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
|
1879 #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
|
1880 #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
|
1881 #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
|
1882 #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
|
1883 #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
|
1884 #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
|
1885 |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
1886 // 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
|
1887 #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
|
1888 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
|
1889 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
|
1890 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
|
1891 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1892 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1893 #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
|
1894 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
|
1895 (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
|
1896 (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
|
1897 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
|
1898 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1899 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
|
1900 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
|
1901 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
|
1902 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
|
1903 targ = NULL; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1904 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1905 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1906 |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1907 #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
|
1908 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
|
1909 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
|
1910 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
|
1911 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1912 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
|
1913 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
|
1914 targ = 1; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1915 } 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
|
1916 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
|
1917 targ = 0; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1918 } \ |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1919 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1920 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1921 #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
|
1922 MALLOC_EMAIL(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1923 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
|
1924 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1925 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1926 #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
|
1927 MALLOC_CONTACT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1928 LIST_COPY_BOOL(label, targ) \ |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
1929 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1930 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1931 #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
|
1932 MALLOC_APPOINTMENT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1933 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
|
1934 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1935 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1936 #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
|
1937 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
|
1938 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
|
1939 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
|
1940 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1941 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
|
1942 LE16_CPU(targ); \ |
152 | 1943 } |
1944 | |
1945 #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
|
1946 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
|
1947 DEBUG_INFO((label" - %i %#x\n", (int)targ, (int)targ)); \ |
152 | 1948 } |
1949 | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1950 #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
|
1951 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
|
1952 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
|
1953 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
|
1954 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1955 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
|
1956 LE32_CPU(targ); \ |
152 | 1957 } |
1958 | |
1959 #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
|
1960 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
|
1961 DEBUG_INFO((label" - %i %#x\n", (int)targ, (int)targ)); \ |
152 | 1962 } |
1963 | |
1964 #define LIST_COPY_EMAIL_INT32(label, targ) { \ | |
1965 MALLOC_EMAIL(item); \ | |
1966 LIST_COPY_INT32(label, targ); \ | |
1967 } | |
1968 | |
1969 #define LIST_COPY_APPT_INT32(label, targ) { \ | |
1970 MALLOC_APPOINTMENT(item); \ | |
1971 LIST_COPY_INT32(label, targ); \ | |
1972 } | |
1973 | |
1974 #define LIST_COPY_FOLDER_INT32(label, targ) { \ | |
1975 MALLOC_FOLDER(item); \ | |
1976 LIST_COPY_INT32(label, targ); \ | |
1977 } | |
1978 | |
1979 #define LIST_COPY_STORE_INT32(label, targ) { \ | |
1980 MALLOC_MESSAGESTORE(item); \ | |
1981 LIST_COPY_INT32(label, targ); \ | |
1982 } | |
1983 | |
1984 #define LIST_COPY_ENUM(label, targ, delta, count, ...) { \ | |
1985 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
|
1986 LIST_COPY_INT32_N(targ); \ |
152 | 1987 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
|
1988 DEBUG_INFO((label" - %s [%i]\n", \ |
152 | 1989 (((int)targ < 0) || ((int)targ >= count)) \ |
1990 ? "**invalid" \ | |
1991 : tlabels[(int)targ], (int)targ)); \ | |
1992 } | |
1993 | |
1994 #define LIST_COPY_EMAIL_ENUM(label, targ, delta, count, ...) { \ | |
1995 MALLOC_EMAIL(item); \ | |
1996 LIST_COPY_ENUM(label, targ, delta, count, __VA_ARGS__); \ | |
1997 } | |
1998 | |
1999 #define LIST_COPY_APPT_ENUM(label, targ, delta, count, ...) { \ | |
2000 MALLOC_APPOINTMENT(item); \ | |
2001 LIST_COPY_ENUM(label, targ, delta, count, __VA_ARGS__); \ | |
2002 } | |
2003 | |
2004 #define LIST_COPY_ENUM16(label, targ, delta, count, ...) { \ | |
2005 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
|
2006 LIST_COPY_INT16_N(targ); \ |
152 | 2007 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
|
2008 DEBUG_INFO((label" - %s [%i]\n", \ |
152 | 2009 (((int)targ < 0) || ((int)targ >= count)) \ |
2010 ? "**invalid" \ | |
2011 : tlabels[(int)targ], (int)targ)); \ | |
2012 } | |
2013 | |
2014 #define LIST_COPY_CONTACT_ENUM16(label, targ, delta, count, ...) { \ | |
2015 MALLOC_CONTACT(item); \ | |
2016 LIST_COPY_ENUM16(label, targ, delta, count, __VA_ARGS__); \ | |
2017 } | |
2018 | |
2019 #define LIST_COPY_ENTRYID(label, targ) { \ | |
2020 LIST_COPY(targ, (pst_entryid*)); \ | |
2021 LE32_CPU(targ->u1); \ | |
2022 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
|
2023 DEBUG_INFO((label" u1=%#x, id=%#x\n", targ->u1, targ->id)); \ |
152 | 2024 } |
2025 | |
2026 #define LIST_COPY_EMAIL_ENTRYID(label, targ) { \ | |
2027 MALLOC_EMAIL(item); \ | |
2028 LIST_COPY_ENTRYID(label, targ); \ | |
2029 } | |
2030 | |
2031 #define LIST_COPY_STORE_ENTRYID(label, targ) { \ | |
2032 MALLOC_MESSAGESTORE(item); \ | |
2033 LIST_COPY_ENTRYID(label, targ); \ | |
2034 } | |
2035 | |
2036 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2037 // 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
|
2038 // including the utf8 flag |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2039 #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
|
2040 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
|
2041 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
|
2042 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
|
2043 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2044 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2045 #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
|
2046 MALLOC_EMAIL(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2047 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
|
2048 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2049 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2050 #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
|
2051 MALLOC_CONTACT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2052 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
|
2053 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2054 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2055 #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
|
2056 MALLOC_APPOINTMENT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2057 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
|
2058 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2059 |
152 | 2060 #define LIST_COPY_JOURNAL_STR(label, targ) { \ |
2061 MALLOC_JOURNAL(item); \ | |
2062 LIST_COPY_STR(label, targ); \ | |
2063 } | |
2064 | |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2065 // 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
|
2066 #define LIST_COPY_TIME(label, targ) { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2067 if (list->elements[x]->type != 0x40) { \ |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
2068 DEBUG_WARN(("src not 0x40 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
|
2069 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
|
2070 } \ |
340
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2071 else { \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2072 targ = (FILETIME*) pst_realloc(targ, sizeof(FILETIME)); \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2073 memcpy(targ, list->elements[x]->data, min(sizeof(FILETIME), list->elements[x]->size)); \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2074 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
|
2075 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
|
2076 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
|
2077 } \ |
152 | 2078 } |
2079 | |
2080 #define LIST_COPY_EMAIL_TIME(label, targ) { \ | |
2081 MALLOC_EMAIL(item); \ | |
2082 LIST_COPY_TIME(label, targ); \ | |
2083 } | |
2084 | |
2085 #define LIST_COPY_CONTACT_TIME(label, targ) { \ | |
2086 MALLOC_CONTACT(item); \ | |
2087 LIST_COPY_TIME(label, targ); \ | |
2088 } | |
2089 | |
2090 #define LIST_COPY_APPT_TIME(label, targ) { \ | |
2091 MALLOC_APPOINTMENT(item); \ | |
2092 LIST_COPY_TIME(label, targ); \ | |
2093 } | |
2094 | |
2095 #define LIST_COPY_JOURNAL_TIME(label, targ) { \ | |
2096 MALLOC_JOURNAL(item); \ | |
2097 LIST_COPY_TIME(label, targ); \ | |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2098 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2099 |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
2100 // 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
|
2101 #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
|
2102 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
|
2103 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
|
2104 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
|
2105 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
|
2106 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2107 else { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2108 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
|
2109 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
|
2110 } \ |
16 | 2111 } |
2112 | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2113 #define LIST_COPY_EMAIL_BIN(label, targ) { \ |
152 | 2114 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
|
2115 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
|
2116 DEBUG_INFO((label"\n")); \ |
152 | 2117 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2118 #define LIST_COPY_APPT_BIN(label, targ) { \ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2119 MALLOC_APPOINTMENT(item); \ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2120 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
|
2121 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
|
2122 DEBUG_HEXDUMP(targ.data, targ.size); \ |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2123 } |
152 | 2124 |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
2125 #define NULL_CHECK(x) { if (!x) { DEBUG_WARN(("NULL_CHECK: Null Found\n")); break;} } |
16 | 2126 |
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
|
2127 |
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
|
2128 /** |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2129 * 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
|
2130 * |
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
|
2131 * @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
|
2132 * @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
|
2133 * @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
|
2134 * 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
|
2135 * 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
|
2136 * 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
|
2137 * @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
|
2138 * 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
|
2139 * 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
|
2140 * |
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
|
2141 * @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
|
2142 */ |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
2143 static int pst_process(uint64_t block_id, pst_mapi_object *list, pst_item *item, pst_item_attach *attach) { |
46 | 2144 DEBUG_ENT("pst_process"); |
43 | 2145 if (!item) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2146 DEBUG_WARN(("item cannot be NULL.\n")); |
43 | 2147 DEBUG_RET(); |
2148 return -1; | |
2149 } | |
2150 | |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
2151 item->block_id = block_id; |
43 | 2152 while (list) { |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2153 int32_t x; |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
2154 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
|
2155 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
|
2156 int32_t t; |
267
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2157 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
|
2158 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
|
2159 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2160 switch (list->elements[x]->mapi_id) { |
43 | 2161 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
|
2162 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
|
2163 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
|
2164 // 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
|
2165 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
|
2166 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
|
2167 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
|
2168 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
|
2169 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
|
2170 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
|
2171 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
|
2172 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
|
2173 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
|
2174 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
|
2175 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
|
2176 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
|
2177 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
|
2178 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
|
2179 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
|
2180 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
|
2181 } |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2182 } |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2183 else { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2184 // 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
|
2185 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
|
2186 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
|
2187 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
|
2188 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
|
2189 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
|
2190 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
|
2191 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
|
2192 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
|
2193 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
|
2194 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
|
2195 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
|
2196 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
|
2197 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
|
2198 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
|
2199 *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
|
2200 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
|
2201 *pp = '"'; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2202 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
|
2203 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
|
2204 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
|
2205 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
|
2206 } |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
2207 } |
116
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
2208 } |
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
2209 } |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2210 else { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2211 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
|
2212 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
|
2213 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
|
2214 } |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
2215 } |
49 | 2216 } |
43 | 2217 break; |
2218 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
|
2219 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
|
2220 // 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
|
2221 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
|
2222 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
|
2223 } 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
|
2224 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
|
2225 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
|
2226 } |
43 | 2227 break; |
2228 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
|
2229 DEBUG_INFO(("Extended Attributes Table - NOT PROCESSED\n")); |
43 | 2230 break; |
152 | 2231 case 0x0017: // PR_IMPORTANCE - How important the sender deems it to be |
2232 LIST_COPY_EMAIL_ENUM("Importance Level", item->email->importance, 0, 3, "Low", "Normal", "High"); | |
43 | 2233 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
|
2234 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
|
2235 if ((list->elements[x]->type == 0x1e) || |
168 | 2236 (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
|
2237 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
|
2238 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
|
2239 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
|
2240 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
|
2241 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
|
2242 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
|
2243 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
|
2244 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
|
2245 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
|
2246 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
|
2247 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
|
2248 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
|
2249 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
|
2250 item->type = PST_TYPE_APPOINTMENT; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2251 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
|
2252 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
|
2253 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
|
2254 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
|
2255 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
|
2256 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
|
2257 else |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2258 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
|
2259 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
|
2260 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2261 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
|
2262 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
|
2263 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
|
2264 } |
43 | 2265 break; |
2266 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
|
2267 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
|
2268 // 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
|
2269 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
|
2270 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2271 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
|
2272 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
|
2273 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
|
2274 } |
43 | 2275 break; |
2276 case 0x0026: // PR_PRIORITY | |
152 | 2277 LIST_COPY_EMAIL_ENUM("Priority", item->email->priority, 1, 3, "NonUrgent", "Normal", "Urgent"); |
43 | 2278 break; |
51 | 2279 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
|
2280 LIST_COPY_EMAIL_BOOL("Read Receipt", item->email->read_receipt); |
43 | 2281 break; |
2282 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
|
2283 LIST_COPY_BOOL("Reassignment Prohibited (Private)", item->private_member); |
43 | 2284 break; |
152 | 2285 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
|
2286 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
|
2287 "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
|
2288 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
|
2289 case 0x0032: // PR_REPORT_TIME |
152 | 2290 LIST_COPY_EMAIL_TIME("Report time", item->email->report_time); |
2291 break; | |
2292 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
|
2293 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
|
2294 "None", "Personal", "Private", "Company Confidential"); |
43 | 2295 break; |
2296 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
|
2297 { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2298 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
|
2299 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
|
2300 off = 2; |
43 | 2301 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2302 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
|
2303 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
|
2304 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
|
2305 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
|
2306 list->elements[x]->data -= off; |
43 | 2307 } |
2308 break; | |
2309 case 0x0039: // PR_CLIENT_SUBMIT_TIME Date Email Sent/Created | |
152 | 2310 LIST_COPY_EMAIL_TIME("Date sent", item->email->sent_date); |
43 | 2311 break; |
2312 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
|
2313 LIST_COPY_EMAIL_STR("Sent on behalf of address 1", item->email->outlook_sender); |
43 | 2314 break; |
2315 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
|
2316 DEBUG_INFO(("Recipient Structure 1 -- NOT PROCESSED\n")); |
43 | 2317 break; |
2318 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
|
2319 LIST_COPY_EMAIL_STR("Received By Name 1", item->email->outlook_received_name1); |
43 | 2320 break; |
2321 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
|
2322 DEBUG_INFO(("Sent on behalf of Structure 1 -- NOT PROCESSED\n")); |
43 | 2323 break; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2324 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
|
2325 LIST_COPY_EMAIL_STR("Sent on behalf of", item->email->outlook_sender_name); |
43 | 2326 break; |
2327 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
|
2328 DEBUG_INFO(("Received on behalf of Structure -- NOT PROCESSED\n")); |
43 | 2329 break; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2330 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
|
2331 LIST_COPY_EMAIL_STR("Received on behalf of", item->email->outlook_recipient_name); |
43 | 2332 break; |
2333 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
|
2334 DEBUG_INFO(("Reply-To Structure -- NOT PROCESSED\n")); |
43 | 2335 break; |
2336 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
|
2337 LIST_COPY_EMAIL_STR("Reply-To", item->email->reply_to); |
43 | 2338 break; |
2339 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
|
2340 LIST_COPY_EMAIL_STR("Recipient's Address 1", item->email->outlook_recipient); |
43 | 2341 break; |
2342 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
|
2343 LIST_COPY_EMAIL_STR("Recipient's Address 2", item->email->outlook_recipient2); |
43 | 2344 break; |
2345 case 0x0057: // PR_MESSAGE_TO_ME | |
2346 // 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
|
2347 LIST_COPY_EMAIL_BOOL("My address in TO field", item->email->message_to_me); |
43 | 2348 break; |
2349 case 0x0058: // PR_MESSAGE_CC_ME | |
2350 // 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
|
2351 LIST_COPY_EMAIL_BOOL("My address in CC field", item->email->message_cc_me); |
43 | 2352 break; |
51 | 2353 case 0x0059: // PR_MESSAGE_RECIP_ME |
43 | 2354 // 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
|
2355 LIST_COPY_EMAIL_BOOL("Message addressed to me", item->email->message_recip_me); |
43 | 2356 break; |
2357 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
|
2358 LIST_COPY_BOOL("Response requested", item->response_requested); |
43 | 2359 break; |
2360 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
|
2361 LIST_COPY_EMAIL_STR("Sent on behalf of address type", item->email->sender_access); |
43 | 2362 break; |
2363 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
|
2364 LIST_COPY_EMAIL_STR("Sent on behalf of address", item->email->sender_address); |
43 | 2365 break; |
2366 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
|
2367 LIST_COPY_EMAIL_STR("Processed Subject (Conversation Topic)", item->email->processed_subject); |
43 | 2368 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
|
2369 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
|
2370 LIST_COPY_EMAIL_BIN("Conversation Index", item->email->conversation_index); |
43 | 2371 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
|
2372 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
|
2373 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
|
2374 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
|
2375 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
|
2376 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
|
2377 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
|
2378 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
|
2379 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
|
2380 break; |
43 | 2381 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
|
2382 LIST_COPY_EMAIL_STR("Received by Address type", item->email->recip_access); |
43 | 2383 break; |
2384 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
|
2385 LIST_COPY_EMAIL_STR("Received by Address", item->email->recip_address); |
43 | 2386 break; |
2387 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
|
2388 LIST_COPY_EMAIL_STR("Received on behalf of Address type", item->email->recip2_access); |
43 | 2389 break; |
2390 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
|
2391 LIST_COPY_EMAIL_STR("Received on behalf of Address", item->email->recip2_address); |
43 | 2392 break; |
2393 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
|
2394 LIST_COPY_EMAIL_STR("Internet Header", item->email->header); |
43 | 2395 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
|
2396 case 0x0C04: // PR_NDR_REASON_CODE |
152 | 2397 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
|
2398 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
|
2399 case 0x0C05: // PR_NDR_DIAG_CODE |
152 | 2400 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
|
2401 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
|
2402 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
|
2403 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
|
2404 break; |
43 | 2405 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
|
2406 LIST_COPY_EMAIL_BOOL("Reply Requested", item->email->reply_requested); |
43 | 2407 break; |
2408 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
|
2409 DEBUG_INFO(("Sender Structure 2 -- NOT PROCESSED\n")); |
43 | 2410 break; |
2411 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
|
2412 LIST_COPY_EMAIL_STR("Name of Sender Structure 2", item->email->outlook_sender_name2); |
43 | 2413 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
|
2414 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
|
2415 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
|
2416 break; |
43 | 2417 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
|
2418 LIST_COPY_EMAIL_STR("Name of Sender Address 2 (Sender search key)", item->email->outlook_sender2); |
43 | 2419 break; |
2420 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
|
2421 LIST_COPY_EMAIL_STR("Sender Address type", item->email->sender2_access); |
43 | 2422 break; |
2423 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
|
2424 LIST_COPY_EMAIL_STR("Sender Address", item->email->sender2_address); |
43 | 2425 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
|
2426 case 0x0C20: // PR_NDR_STATUS_CODE |
152 | 2427 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
|
2428 break; |
43 | 2429 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
|
2430 LIST_COPY_EMAIL_BOOL("Delete after submit", item->email->delete_after_submit); |
43 | 2431 break; |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2432 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
|
2433 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
|
2434 break; |
43 | 2435 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
|
2436 LIST_COPY_EMAIL_STR("Display CC Addresses", item->email->cc_address); |
43 | 2437 break; |
2438 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
|
2439 LIST_COPY_EMAIL_STR("Display Sent-To Address", item->email->sentto_address); |
43 | 2440 break; |
2441 case 0x0E06: // PR_MESSAGE_DELIVERY_TIME Date 3 - Email Arrival Date | |
152 | 2442 LIST_COPY_EMAIL_TIME("Date 3 (Delivery Time)", item->email->arrival_date); |
43 | 2443 break; |
2444 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
|
2445 LIST_COPY_EMAIL_INT32("Message Flags", item->flags); |
43 | 2446 break; |
2447 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
|
2448 LIST_COPY_INT32("Message Size", item->message_size); |
43 | 2449 break; |
2450 case 0x0E0A: // PR_SENTMAIL_ENTRYID | |
2451 // folder that this message is sent to after submission | |
152 | 2452 LIST_COPY_EMAIL_ENTRYID("Sentmail EntryID", item->email->sentmail_folder); |
43 | 2453 break; |
308
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2454 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
|
2455 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
|
2456 break; |
43 | 2457 case 0x0E1F: // PR_RTF_IN_SYNC |
2458 // True means that the rtf version is same as text body | |
2459 // False means rtf version is more up-to-date than text body | |
2460 // 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
|
2461 // 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
|
2462 LIST_COPY_EMAIL_BOOL("Compressed RTF in Sync", item->email->rtf_in_sync); |
43 | 2463 break; |
2464 case 0x0E20: // PR_ATTACH_SIZE binary Attachment data in record | |
2465 NULL_CHECK(attach); | |
152 | 2466 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
|
2467 // 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
|
2468 // or id codes from 0x3701 or 0x67f2 |
43 | 2469 break; |
2470 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
|
2471 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
|
2472 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
|
2473 DEBUG_HEXDUMP(item->record_key.data, item->record_key.size); |
43 | 2474 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
|
2475 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
|
2476 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
|
2477 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
|
2478 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
|
2479 LIST_COPY_EMAIL_STR("Report Text", item->email->report_text); |
43 | 2480 break; |
2481 case 0x1006: // PR_RTF_SYNC_BODY_CRC | |
152 | 2482 LIST_COPY_EMAIL_INT32("RTF Sync Body CRC", item->email->rtf_body_crc); |
43 | 2483 break; |
2484 case 0x1007: // PR_RTF_SYNC_BODY_COUNT | |
2485 // a count of the *significant* charcters in the rtf body. Doesn't count | |
2486 // whitespace and other ignorable characters | |
152 | 2487 LIST_COPY_EMAIL_INT32("RTF Sync Body character count", item->email->rtf_body_char_count); |
43 | 2488 break; |
2489 case 0x1008: // PR_RTF_SYNC_BODY_TAG | |
2490 // the first couple of lines of RTF body so that after modification, then beginning can | |
2491 // 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
|
2492 LIST_COPY_EMAIL_STR("RTF Sync body tag", item->email->rtf_body_tag); |
43 | 2493 break; |
152 | 2494 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
|
2495 LIST_COPY_EMAIL_BIN("RTF Compressed body", item->email->rtf_compressed); |
43 | 2496 break; |
2497 case 0x1010: // PR_RTF_SYNC_PREFIX_COUNT | |
2498 // a count of the ignored characters before the first significant character | |
152 | 2499 LIST_COPY_EMAIL_INT32("RTF whitespace prefix count", item->email->rtf_ws_prefix_count); |
43 | 2500 break; |
2501 case 0x1011: // PR_RTF_SYNC_TRAILING_COUNT | |
2502 // a count of the ignored characters after the last significant character | |
152 | 2503 LIST_COPY_EMAIL_INT32("RTF whitespace tailing count", item->email->rtf_ws_trailing_count); |
43 | 2504 break; |
2505 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
|
2506 LIST_COPY_EMAIL_STR("HTML body", item->email->htmlbody); |
43 | 2507 break; |
2508 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
|
2509 LIST_COPY_EMAIL_STR("Message ID", item->email->messageid); |
43 | 2510 break; |
2511 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
|
2512 LIST_COPY_EMAIL_STR("In-Reply-To", item->email->in_reply_to); |
43 | 2513 break; |
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
130
diff
changeset
|
2514 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
|
2515 LIST_COPY_EMAIL_STR("Return Path", item->email->return_path_address); |
43 | 2516 break; |
2517 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
|
2518 LIST_COPY_STR("Display Name", item->file_as); |
43 | 2519 break; |
2520 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
|
2521 LIST_COPY_CONTACT_STR("Address Type", item->contact->address1_transport); |
43 | 2522 break; |
2523 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
|
2524 LIST_COPY_CONTACT_STR("Contact email Address", item->contact->address1); |
43 | 2525 break; |
2526 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
|
2527 LIST_COPY_STR("Comment", item->comment); |
43 | 2528 break; |
2529 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
|
2530 LIST_COPY_TIME("Date 4 (Item Creation Date)", item->create_date); |
43 | 2531 break; |
2532 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
|
2533 LIST_COPY_TIME("Date 5 (Modify Date)", item->modify_date); |
43 | 2534 break; |
2535 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
|
2536 LIST_COPY_EMAIL_STR("Record Search 2", item->email->outlook_search_key); |
43 | 2537 break; |
2538 case 0x35DF: // PR_VALID_FOLDER_MASK | |
152 | 2539 LIST_COPY_STORE_INT32("Valid Folder Mask", item->message_store->valid_mask); |
43 | 2540 break; |
2541 case 0x35E0: // PR_IPM_SUBTREE_ENTRYID Top of Personal Folder Record | |
152 | 2542 LIST_COPY_STORE_ENTRYID("Top of Personal Folder Record", item->message_store->top_of_personal_folder); |
43 | 2543 break; |
51 | 2544 case 0x35E2: // PR_IPM_OUTBOX_ENTRYID |
152 | 2545 LIST_COPY_STORE_ENTRYID("Default Outbox Folder record", item->message_store->default_outbox_folder); |
51 | 2546 break; |
2547 case 0x35E3: // PR_IPM_WASTEBASKET_ENTRYID | |
152 | 2548 LIST_COPY_STORE_ENTRYID("Deleted Items Folder record", item->message_store->deleted_items_folder); |
43 | 2549 break; |
51 | 2550 case 0x35E4: // PR_IPM_SENTMAIL_ENTRYID |
152 | 2551 LIST_COPY_STORE_ENTRYID("Sent Items Folder record", item->message_store->sent_items_folder); |
51 | 2552 break; |
2553 case 0x35E5: // PR_VIEWS_ENTRYID | |
152 | 2554 LIST_COPY_STORE_ENTRYID("User Views Folder record", item->message_store->user_views_folder); |
51 | 2555 break; |
2556 case 0x35E6: // PR_COMMON_VIEWS_ENTRYID | |
152 | 2557 LIST_COPY_STORE_ENTRYID("Common View Folder record", item->message_store->common_view_folder); |
51 | 2558 break; |
2559 case 0x35E7: // PR_FINDER_ENTRYID | |
152 | 2560 LIST_COPY_STORE_ENTRYID("Search Root Folder record", item->message_store->search_root_folder); |
43 | 2561 break; |
2562 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
|
2563 LIST_COPY_FOLDER_INT32("Folder Email Count", item->folder->item_count); |
43 | 2564 break; |
2565 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
|
2566 LIST_COPY_FOLDER_INT32("Unread Email Count", item->folder->unseen_item_count); |
43 | 2567 break; |
2568 case 0x360A: // PR_SUBFOLDERS Has children | |
2569 MALLOC_FOLDER(item); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2570 LIST_COPY_BOOL("Has Subfolders", item->folder->subfolder); |
43 | 2571 break; |
2572 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
|
2573 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
|
2574 if (pst_strincmp("IPF.Note", item->ascii_type, 8) == 0) |
43 | 2575 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
|
2576 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
|
2577 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
|
2578 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
|
2579 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
|
2580 else if (pst_strincmp("IPF.Contact", item->ascii_type, 11) == 0) |
43 | 2581 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
|
2582 else if (pst_strincmp("IPF.Journal", item->ascii_type, 11) == 0) |
43 | 2583 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
|
2584 else if (pst_strincmp("IPF.Appointment", item->ascii_type, 15) == 0) |
43 | 2585 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
|
2586 else if (pst_strincmp("IPF.StickyNote", item->ascii_type, 14) == 0) |
43 | 2587 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
|
2588 else if (pst_strincmp("IPF.Task", item->ascii_type, 8) == 0) |
43 | 2589 item->type = PST_TYPE_TASK; |
2590 else | |
2591 item->type = PST_TYPE_OTHER; | |
2592 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2593 DEBUG_INFO(("Container class %s [%"PRIi32"]\n", item->ascii_type, item->type)); |
43 | 2594 break; |
2595 case 0x3617: // PR_ASSOC_CONTENT_COUNT | |
2596 // associated content are items that are attached to this folder | |
2597 // 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
|
2598 LIST_COPY_FOLDER_INT32("Associated Content count", item->folder->assoc_count); |
43 | 2599 break; |
2600 case 0x3701: // PR_ATTACH_DATA_OBJ binary data of attachment | |
203 | 2601 DEBUG_INFO(("Binary Data [Size %i]\n", list->elements[x]->size)); |
43 | 2602 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
|
2603 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
|
2604 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
|
2605 DEBUG_INFO(("Seen a Reference. The data hasn't been loaded yet. [%#"PRIx64"]\n", attach->id2_val)); |
43 | 2606 } else { |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2607 LIST_COPY_BIN(attach->data); |
43 | 2608 } |
2609 break; | |
2610 case 0x3704: // PR_ATTACH_FILENAME Attachment filename (8.3) | |
2611 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2612 LIST_COPY_STR("Attachment Filename", attach->filename1); |
43 | 2613 break; |
2614 case 0x3705: // PR_ATTACH_METHOD | |
2615 NULL_CHECK(attach); | |
152 | 2616 LIST_COPY_ENUM("Attachment method", attach->method, 0, 7, |
2617 "No Attachment", | |
2618 "Attach By Value", | |
2619 "Attach By Reference", | |
2620 "Attach by Reference Resolve", | |
2621 "Attach by Reference Only", | |
2622 "Embedded Message", | |
2623 "OLE"); | |
43 | 2624 break; |
2625 case 0x3707: // PR_ATTACH_LONG_FILENAME Attachment filename (long?) | |
2626 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2627 LIST_COPY_STR("Attachment Filename long", attach->filename2); |
43 | 2628 break; |
2629 case 0x370B: // PR_RENDERING_POSITION | |
2630 // position in characters that the attachment appears in the plain text body | |
2631 NULL_CHECK(attach); | |
152 | 2632 LIST_COPY_INT32("Attachment Position", attach->position); |
43 | 2633 break; |
2634 case 0x370E: // PR_ATTACH_MIME_TAG Mime type of encoding | |
2635 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2636 LIST_COPY_STR("Attachment mime encoding", attach->mimetype); |
43 | 2637 break; |
2638 case 0x3710: // PR_ATTACH_MIME_SEQUENCE | |
2639 // sequence number for mime parts. Includes body | |
2640 NULL_CHECK(attach); | |
152 | 2641 LIST_COPY_INT32("Attachment Mime Sequence", attach->sequence); |
43 | 2642 break; |
2643 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
|
2644 LIST_COPY_CONTACT_STR("Contact's Account name", item->contact->account_name); |
43 | 2645 break; |
2646 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
|
2647 DEBUG_INFO(("Contact Alternate Recipient - NOT PROCESSED\n")); |
43 | 2648 break; |
2649 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
|
2650 LIST_COPY_CONTACT_STR("Callback telephone number", item->contact->callback_phone); |
43 | 2651 break; |
2652 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
|
2653 LIST_COPY_EMAIL_BOOL("Message Conversion Prohibited", item->email->conversion_prohibited); |
43 | 2654 break; |
2655 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
|
2656 LIST_COPY_CONTACT_STR("Contacts Suffix", item->contact->suffix); |
43 | 2657 break; |
2658 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
|
2659 LIST_COPY_CONTACT_STR("Contacts First Name", item->contact->first_name); |
43 | 2660 break; |
2661 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
|
2662 LIST_COPY_CONTACT_STR("Contacts Government ID Number", item->contact->gov_id); |
43 | 2663 break; |
2664 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
|
2665 LIST_COPY_CONTACT_STR("Business Telephone Number", item->contact->business_phone); |
43 | 2666 break; |
2667 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
|
2668 LIST_COPY_CONTACT_STR("Home Telephone Number", item->contact->home_phone); |
43 | 2669 break; |
2670 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
|
2671 LIST_COPY_CONTACT_STR("Contacts Initials", item->contact->initials); |
43 | 2672 break; |
2673 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
|
2674 LIST_COPY_CONTACT_STR("Keyword", item->contact->keyword); |
43 | 2675 break; |
2676 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
|
2677 LIST_COPY_CONTACT_STR("Contact's Language", item->contact->language); |
43 | 2678 break; |
2679 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
|
2680 LIST_COPY_CONTACT_STR("Contact's Location", item->contact->location); |
43 | 2681 break; |
2682 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
|
2683 LIST_COPY_CONTACT_BOOL("Mail Permission", item->contact->mail_permission); |
43 | 2684 break; |
2685 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
|
2686 LIST_COPY_CONTACT_STR("MHS Common Name", item->contact->common_name); |
43 | 2687 break; |
2688 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
|
2689 LIST_COPY_CONTACT_STR("Organizational ID #", item->contact->org_id); |
43 | 2690 break; |
2691 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
|
2692 LIST_COPY_CONTACT_STR("Contacts Surname", item->contact->surname); |
43 | 2693 break; |
2694 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
|
2695 DEBUG_INFO(("Original Entry ID - NOT PROCESSED\n")); |
43 | 2696 break; |
2697 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
|
2698 DEBUG_INFO(("Original Display Name - NOT PROCESSED\n")); |
43 | 2699 break; |
2700 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
|
2701 DEBUG_INFO(("Original Search Key - NOT PROCESSED\n")); |
43 | 2702 break; |
2703 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
|
2704 LIST_COPY_CONTACT_STR("Default Postal Address", item->contact->def_postal_address); |
43 | 2705 break; |
2706 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
|
2707 LIST_COPY_CONTACT_STR("Company Name", item->contact->company_name); |
43 | 2708 break; |
2709 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
|
2710 LIST_COPY_CONTACT_STR("Job Title", item->contact->job_title); |
43 | 2711 break; |
2712 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
|
2713 LIST_COPY_CONTACT_STR("Department Name", item->contact->department); |
43 | 2714 break; |
2715 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
|
2716 LIST_COPY_CONTACT_STR("Office Location", item->contact->office_loc); |
43 | 2717 break; |
2718 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
|
2719 LIST_COPY_CONTACT_STR("Primary Telephone", item->contact->primary_phone); |
43 | 2720 break; |
2721 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
|
2722 LIST_COPY_CONTACT_STR("Business Phone Number 2", item->contact->business_phone2); |
43 | 2723 break; |
2724 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
|
2725 LIST_COPY_CONTACT_STR("Mobile Phone Number", item->contact->mobile_phone); |
43 | 2726 break; |
2727 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
|
2728 LIST_COPY_CONTACT_STR("Radio Phone Number", item->contact->radio_phone); |
43 | 2729 break; |
2730 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
|
2731 LIST_COPY_CONTACT_STR("Car Phone Number", item->contact->car_phone); |
43 | 2732 break; |
2733 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
|
2734 LIST_COPY_CONTACT_STR("Other Phone Number", item->contact->other_phone); |
43 | 2735 break; |
2736 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
|
2737 LIST_COPY_CONTACT_STR("Transmittable Display Name", item->contact->transmittable_display_name); |
43 | 2738 break; |
2739 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
|
2740 LIST_COPY_CONTACT_STR("Pager Phone Number", item->contact->pager_phone); |
43 | 2741 break; |
2742 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
|
2743 DEBUG_INFO(("User Certificate - NOT PROCESSED\n")); |
43 | 2744 break; |
2745 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
|
2746 LIST_COPY_CONTACT_STR("Primary Fax Number", item->contact->primary_fax); |
43 | 2747 break; |
2748 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
|
2749 LIST_COPY_CONTACT_STR("Business Fax Number", item->contact->business_fax); |
43 | 2750 break; |
2751 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
|
2752 LIST_COPY_CONTACT_STR("Home Fax Number", item->contact->home_fax); |
43 | 2753 break; |
2754 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
|
2755 LIST_COPY_CONTACT_STR("Business Address Country", item->contact->business_country); |
43 | 2756 break; |
2757 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
|
2758 LIST_COPY_CONTACT_STR("Business Address City", item->contact->business_city); |
43 | 2759 break; |
2760 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
|
2761 LIST_COPY_CONTACT_STR("Business Address State", item->contact->business_state); |
43 | 2762 break; |
2763 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
|
2764 LIST_COPY_CONTACT_STR("Business Address Street", item->contact->business_street); |
43 | 2765 break; |
2766 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
|
2767 LIST_COPY_CONTACT_STR("Business Postal Code", item->contact->business_postal_code); |
43 | 2768 break; |
2769 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
|
2770 LIST_COPY_CONTACT_STR("Business PO Box", item->contact->business_po_box); |
43 | 2771 break; |
2772 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
|
2773 LIST_COPY_CONTACT_STR("Telex Number", item->contact->telex); |
43 | 2774 break; |
2775 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
|
2776 LIST_COPY_CONTACT_STR("ISDN Number", item->contact->isdn_phone); |
43 | 2777 break; |
2778 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
|
2779 LIST_COPY_CONTACT_STR("Assistant Phone Number", item->contact->assistant_phone); |
43 | 2780 break; |
2781 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
|
2782 LIST_COPY_CONTACT_STR("Home Phone 2", item->contact->home_phone2); |
43 | 2783 break; |
2784 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
|
2785 LIST_COPY_CONTACT_STR("Assistant's Name", item->contact->assistant_name); |
43 | 2786 break; |
2787 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
|
2788 LIST_COPY_CONTACT_BOOL("Can receive Rich Text", item->contact->rich_text); |
43 | 2789 break; |
2790 case 0x3A41: // PR_WEDDING_ANNIVERSARY | |
152 | 2791 LIST_COPY_CONTACT_TIME("Wedding Anniversary", item->contact->wedding_anniversary); |
43 | 2792 break; |
2793 case 0x3A42: // PR_BIRTHDAY | |
152 | 2794 LIST_COPY_CONTACT_TIME("Birthday", item->contact->birthday); |
43 | 2795 break; |
2796 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
|
2797 LIST_COPY_CONTACT_STR("Hobbies", item->contact->hobbies); |
43 | 2798 break; |
2799 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
|
2800 LIST_COPY_CONTACT_STR("Middle Name", item->contact->middle_name); |
43 | 2801 break; |
2802 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
|
2803 LIST_COPY_CONTACT_STR("Display Name Prefix (Title)", item->contact->display_name_prefix); |
43 | 2804 break; |
2805 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
|
2806 LIST_COPY_CONTACT_STR("Profession", item->contact->profession); |
43 | 2807 break; |
2808 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
|
2809 LIST_COPY_CONTACT_STR("Preferred By Name", item->contact->pref_name); |
43 | 2810 break; |
2811 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
|
2812 LIST_COPY_CONTACT_STR("Spouse's Name", item->contact->spouse_name); |
43 | 2813 break; |
2814 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
|
2815 LIST_COPY_CONTACT_STR("Computer Network Name", item->contact->computer_name); |
43 | 2816 break; |
2817 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
|
2818 LIST_COPY_CONTACT_STR("Customer ID", item->contact->customer_id); |
43 | 2819 break; |
2820 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
|
2821 LIST_COPY_CONTACT_STR("TTY/TDD Phone", item->contact->ttytdd_phone); |
43 | 2822 break; |
2823 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
|
2824 LIST_COPY_CONTACT_STR("Ftp Site", item->contact->ftp_site); |
43 | 2825 break; |
2826 case 0x3A4D: // PR_GENDER | |
152 | 2827 LIST_COPY_CONTACT_ENUM16("Gender", item->contact->gender, 0, 3, "Unspecified", "Female", "Male"); |
43 | 2828 break; |
2829 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
|
2830 LIST_COPY_CONTACT_STR("Manager's Name", item->contact->manager_name); |
43 | 2831 break; |
2832 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
|
2833 LIST_COPY_CONTACT_STR("Nickname", item->contact->nickname); |
43 | 2834 break; |
2835 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
|
2836 LIST_COPY_CONTACT_STR("Personal Home Page", item->contact->personal_homepage); |
43 | 2837 break; |
2838 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
|
2839 LIST_COPY_CONTACT_STR("Business Home Page", item->contact->business_homepage); |
43 | 2840 break; |
2841 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
|
2842 LIST_COPY_CONTACT_STR("Company Main Phone", item->contact->company_main_phone); |
43 | 2843 break; |
2844 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
|
2845 DEBUG_INFO(("Children's Names - NOT PROCESSED\n")); |
43 | 2846 break; |
2847 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
|
2848 LIST_COPY_CONTACT_STR("Home Address City", item->contact->home_city); |
43 | 2849 break; |
2850 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
|
2851 LIST_COPY_CONTACT_STR("Home Address Country", item->contact->home_country); |
43 | 2852 break; |
2853 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
|
2854 LIST_COPY_CONTACT_STR("Home Address Postal Code", item->contact->home_postal_code); |
43 | 2855 break; |
2856 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
|
2857 LIST_COPY_CONTACT_STR("Home Address State or Province", item->contact->home_state); |
43 | 2858 break; |
2859 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
|
2860 LIST_COPY_CONTACT_STR("Home Address Street", item->contact->home_street); |
43 | 2861 break; |
2862 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
|
2863 LIST_COPY_CONTACT_STR("Home Address Post Office Box", item->contact->home_po_box); |
43 | 2864 break; |
2865 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
|
2866 LIST_COPY_CONTACT_STR("Other Address City", item->contact->other_city); |
43 | 2867 break; |
2868 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
|
2869 LIST_COPY_CONTACT_STR("Other Address Country", item->contact->other_country); |
43 | 2870 break; |
2871 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
|
2872 LIST_COPY_CONTACT_STR("Other Address Postal Code", item->contact->other_postal_code); |
43 | 2873 break; |
2874 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
|
2875 LIST_COPY_CONTACT_STR("Other Address State", item->contact->other_state); |
43 | 2876 break; |
2877 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
|
2878 LIST_COPY_CONTACT_STR("Other Address Street", item->contact->other_street); |
43 | 2879 break; |
2880 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
|
2881 LIST_COPY_CONTACT_STR("Other Address Post Office box", item->contact->other_po_box); |
43 | 2882 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
|
2883 case 0x3FDE: // PR_INTERNET_CPID |
152 | 2884 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
|
2885 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
|
2886 case 0x3FFD: // PR_MESSAGE_CODEPAGE |
152 | 2887 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
|
2888 break; |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2889 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
|
2890 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
|
2891 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
|
2892 DEBUG_HEXDUMP(item->predecessor_change.data, item->predecessor_change.size); |
43 | 2893 break; |
267
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2894 case 0x67F2: // ID2 value of the attachment |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2895 NULL_CHECK(attach); |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2896 LIST_COPY_INT32("Attachment ID2 value", ut); |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2897 attach->id2_val = ut; |
43 | 2898 break; |
2899 case 0x67FF: // Extra Property Identifier (Password CheckSum) | |
152 | 2900 LIST_COPY_STORE_INT32("Password checksum", item->message_store->pwd_chksum); |
43 | 2901 break; |
2902 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
|
2903 LIST_COPY_EMAIL_BIN("Secure HTML Body", item->email->encrypted_htmlbody); |
43 | 2904 break; |
2905 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
|
2906 LIST_COPY_EMAIL_BIN("Secure Text Body", item->email->encrypted_body); |
43 | 2907 break; |
2908 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
|
2909 LIST_COPY_STORE_ENTRYID("Top of folders RecID", item->message_store->top_of_folder); |
43 | 2910 break; |
2911 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
|
2912 LIST_COPY_CONTACT_STR("Contact Fullname", item->contact->fullname); |
43 | 2913 break; |
2914 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
|
2915 LIST_COPY_CONTACT_STR("Home Address", item->contact->home_address); |
43 | 2916 break; |
2917 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
|
2918 LIST_COPY_CONTACT_STR("Business Address", item->contact->business_address); |
43 | 2919 break; |
2920 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
|
2921 LIST_COPY_CONTACT_STR("Other Address", item->contact->other_address); |
43 | 2922 break; |
51 | 2923 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
|
2924 LIST_COPY_CONTACT_STR("Work address street", item->contact->work_address_street); |
51 | 2925 break; |
2926 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
|
2927 LIST_COPY_CONTACT_STR("Work address city", item->contact->work_address_city); |
51 | 2928 break; |
2929 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
|
2930 LIST_COPY_CONTACT_STR("Work address state", item->contact->work_address_state); |
51 | 2931 break; |
2932 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
|
2933 LIST_COPY_CONTACT_STR("Work address postalcode", item->contact->work_address_postalcode); |
51 | 2934 break; |
2935 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
|
2936 LIST_COPY_CONTACT_STR("Work address country", item->contact->work_address_country); |
51 | 2937 break; |
2938 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
|
2939 LIST_COPY_CONTACT_STR("Work address postofficebox", item->contact->work_address_postofficebox); |
51 | 2940 break; |
43 | 2941 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
|
2942 LIST_COPY_CONTACT_STR("Email Address 1 Transport", item->contact->address1_transport); |
43 | 2943 break; |
2944 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
|
2945 LIST_COPY_CONTACT_STR("Email Address 1 Address", item->contact->address1); |
43 | 2946 break; |
2947 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
|
2948 LIST_COPY_CONTACT_STR("Email Address 1 Description", item->contact->address1_desc); |
43 | 2949 break; |
2950 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
|
2951 LIST_COPY_CONTACT_STR("Email Address 1 Record", item->contact->address1a); |
43 | 2952 break; |
2953 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
|
2954 LIST_COPY_CONTACT_STR("Email Address 2 Transport", item->contact->address2_transport); |
43 | 2955 break; |
2956 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
|
2957 LIST_COPY_CONTACT_STR("Email Address 2 Address", item->contact->address2); |
43 | 2958 break; |
2959 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
|
2960 LIST_COPY_CONTACT_STR("Email Address 2 Description", item->contact->address2_desc); |
43 | 2961 break; |
2962 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
|
2963 LIST_COPY_CONTACT_STR("Email Address 2 Record", item->contact->address2a); |
43 | 2964 break; |
2965 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
|
2966 LIST_COPY_CONTACT_STR("Email Address 3 Transport", item->contact->address3_transport); |
43 | 2967 break; |
2968 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
|
2969 LIST_COPY_CONTACT_STR("Email Address 3 Address", item->contact->address3); |
43 | 2970 break; |
2971 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
|
2972 LIST_COPY_CONTACT_STR("Email Address 3 Description", item->contact->address3_desc); |
43 | 2973 break; |
2974 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
|
2975 LIST_COPY_CONTACT_STR("Email Address 3 Record", item->contact->address3a); |
43 | 2976 break; |
2977 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
|
2978 LIST_COPY_CONTACT_STR("Internet Free/Busy", item->contact->free_busy_address); |
43 | 2979 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2980 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
|
2981 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
|
2982 "Free", "Tentative", "Busy", "Out Of Office"); |
43 | 2983 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2984 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
|
2985 LIST_COPY_APPT_STR("Appointment Location", item->appointment->location); |
43 | 2986 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2987 case 0x820d: // PR_OUTLOOK_EVENT_START_DATE |
152 | 2988 LIST_COPY_APPT_TIME("Appointment Date Start", item->appointment->start); |
50 | 2989 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
2990 case 0x820e: // PR_OUTLOOK_EVENT_START_END |
152 | 2991 LIST_COPY_APPT_TIME("Appointment Date End", item->appointment->end); |
50 | 2992 break; |
43 | 2993 case 0x8214: // Label for an appointment |
152 | 2994 LIST_COPY_APPT_ENUM("Label for appointment", item->appointment->label, 0, 11, |
2995 "None", | |
2996 "Important", | |
2997 "Business", | |
2998 "Personal", | |
2999 "Vacation", | |
3000 "Must Attend", | |
3001 "Travel Required", | |
3002 "Needs Preparation", | |
3003 "Birthday", | |
3004 "Anniversary", | |
3005 "Phone Call"); | |
43 | 3006 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3007 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
|
3008 LIST_COPY_APPT_BOOL("All day flag", item->appointment->all_day); |
43 | 3009 break; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3010 case 0x8216: // PR_OUTLOOK_EVENT_RECURRENCE_DATA |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3011 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
|
3012 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3013 case 0x8223: // PR_OUTLOOK_EVENT_IS_RECURRING |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3014 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
|
3015 break; |
50 | 3016 case 0x8231: // Recurrence type |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3017 LIST_COPY_APPT_ENUM("Appointment recurrence type ", item->appointment->recurrence_type, 0, 5, |
152 | 3018 "None", |
3019 "Daily", | |
3020 "Weekly", | |
3021 "Monthly", | |
3022 "Yearly"); | |
50 | 3023 break; |
3024 case 0x8232: // Recurrence description | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3025 LIST_COPY_APPT_STR("Appointment recurrence description", item->appointment->recurrence_description); |
50 | 3026 break; |
43 | 3027 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
|
3028 LIST_COPY_APPT_STR("TimeZone of times", item->appointment->timezonestring); |
43 | 3029 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3030 case 0x8235: // PR_OUTLOOK_EVENT_RECURRENCE_START |
152 | 3031 LIST_COPY_APPT_TIME("Recurrence Start Date", item->appointment->recurrence_start); |
50 | 3032 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3033 case 0x8236: // PR_OUTLOOK_EVENT_RECURRENCE_END |
152 | 3034 LIST_COPY_APPT_TIME("Recurrence End Date", item->appointment->recurrence_end); |
50 | 3035 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3036 case 0x8501: // PR_OUTLOOK_COMMON_REMINDER_MINUTES_BEFORE |
152 | 3037 LIST_COPY_APPT_INT32("Alarm minutes", item->appointment->alarm_minutes); |
50 | 3038 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3039 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
|
3040 LIST_COPY_APPT_BOOL("Reminder alarm", item->appointment->alarm); |
50 | 3041 break; |
51 | 3042 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
|
3043 DEBUG_INFO(("Common Start Date - %s\n", pst_fileTimeToAscii((FILETIME*)list->elements[x]->data, time_buffer))); |
43 | 3044 break; |
51 | 3045 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
|
3046 DEBUG_INFO(("Common End Date - %s\n", pst_fileTimeToAscii((FILETIME*)list->elements[x]->data, time_buffer))); |
43 | 3047 break; |
50 | 3048 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
|
3049 LIST_COPY_APPT_STR("Appointment reminder sound filename", item->appointment->alarm_filename); |
50 | 3050 break; |
43 | 3051 case 0x8530: // Followup |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3052 LIST_COPY_CONTACT_STR("Followup String", item->contact->followup); |
43 | 3053 break; |
3054 case 0x8534: // Mileage | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3055 LIST_COPY_CONTACT_STR("Mileage", item->contact->mileage); |
43 | 3056 break; |
3057 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
|
3058 LIST_COPY_CONTACT_STR("Billing Information", item->contact->billing_information); |
43 | 3059 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3060 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
|
3061 LIST_COPY_STR("Outlook Version", item->outlook_version); |
43 | 3062 break; |
3063 case 0x8560: // Appointment Reminder Time | |
152 | 3064 LIST_COPY_APPT_TIME("Appointment Reminder Time", item->appointment->reminder); |
43 | 3065 break; |
3066 case 0x8700: // Journal Type | |
152 | 3067 LIST_COPY_JOURNAL_STR("Journal Entry Type", item->journal->type); |
43 | 3068 break; |
3069 case 0x8706: // Journal Start date/time | |
152 | 3070 LIST_COPY_JOURNAL_TIME("Start Timestamp", item->journal->start); |
43 | 3071 break; |
3072 case 0x8708: // Journal End date/time | |
152 | 3073 LIST_COPY_JOURNAL_TIME("End Timestamp", item->journal->end); |
3074 break; | |
3075 case 0x8712: // Journal Type Description | |
3076 LIST_COPY_JOURNAL_STR("Journal description", item->journal->description); | |
43 | 3077 break; |
3078 default: | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3079 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
|
3080 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
|
3081 *(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
|
3082 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3083 } 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
|
3084 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
|
3085 *(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
|
3086 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3087 } 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
|
3088 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
|
3089 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 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
|
3091 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3092 } 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
|
3093 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
|
3094 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
|
3095 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
|
3096 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3097 } 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
|
3098 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
|
3099 *(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
|
3100 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
|
3101 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3102 } 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
|
3103 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
|
3104 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
|
3105 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
|
3106 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3107 } 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
|
3108 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
|
3109 *(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
|
3110 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3111 } 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
|
3112 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
|
3113 (*((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
|
3114 *((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
|
3115 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3116 } 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
|
3117 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
|
3118 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
|
3119 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
|
3120 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3121 } 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
|
3122 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
|
3123 *(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
|
3124 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
|
3125 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3126 } 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
|
3127 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
|
3128 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
|
3129 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3130 } 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
|
3131 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
|
3132 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
|
3133 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
|
3134 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3135 } 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
|
3136 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
|
3137 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
|
3138 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3139 } 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
|
3140 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
|
3141 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 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
|
3143 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3144 } 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
|
3145 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
|
3146 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 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
|
3148 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3149 } 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
|
3150 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
|
3151 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 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
|
3153 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3154 } 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
|
3155 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
|
3156 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
|
3157 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
|
3158 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3159 } 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
|
3160 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
|
3161 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
|
3162 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
|
3163 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3164 } 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
|
3165 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
|
3166 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
|
3167 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
|
3168 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3169 } 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
|
3170 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
|
3171 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
|
3172 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
51 | 3173 |
43 | 3174 } 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
|
3175 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
|
3176 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
|
3177 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
43 | 3178 } |
51 | 3179 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3180 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
|
3181 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
|
3182 list->elements[x]->data = NULL; |
43 | 3183 } |
3184 } | |
3185 } | |
3186 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
|
3187 if (attach) attach = attach->next; |
43 | 3188 } |
3189 DEBUG_RET(); | |
3190 return 0; | |
16 | 3191 } |
3192 | |
3193 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3194 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
|
3195 pst_mapi_object *l; |
46 | 3196 DEBUG_ENT("pst_free_list"); |
43 | 3197 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
|
3198 if (list->elements) { |
43 | 3199 int32_t x; |
3200 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
|
3201 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
|
3202 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
|
3203 free(list->elements[x]); |
43 | 3204 } |
3205 } | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3206 free(list->elements); |
43 | 3207 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3208 l = list->next; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3209 free (list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3210 list = l; |
43 | 3211 } |
3212 DEBUG_RET(); | |
16 | 3213 } |
3214 | |
3215 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3216 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
|
3217 pst_id2_tree *t; |
46 | 3218 DEBUG_ENT("pst_free_id2"); |
43 | 3219 while (head) { |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3220 pst_free_id2(head->child); |
43 | 3221 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
|
3222 free(head); |
43 | 3223 head = t; |
3224 } | |
3225 DEBUG_RET(); | |
16 | 3226 } |
3227 | |
3228 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3229 static void pst_free_id (pst_index_ll *head) { |
43 | 3230 pst_index_ll *t; |
46 | 3231 DEBUG_ENT("pst_free_id"); |
43 | 3232 while (head) { |
3233 t = head->next; | |
3234 free(head); | |
3235 head = t; | |
3236 } | |
3237 DEBUG_RET(); | |
16 | 3238 } |
3239 | |
3240 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3241 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
|
3242 pst_desc_tree *t; |
46 | 3243 DEBUG_ENT("pst_free_desc"); |
43 | 3244 while (head) { |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3245 pst_free_desc(head->child); |
43 | 3246 t = head->next; |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3247 free(head); |
43 | 3248 head = t; |
3249 } | |
3250 DEBUG_RET(); | |
16 | 3251 } |
3252 | |
3253 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3254 static void pst_free_xattrib(pst_x_attrib_ll *x) { |
43 | 3255 pst_x_attrib_ll *t; |
46 | 3256 DEBUG_ENT("pst_free_xattrib"); |
43 | 3257 while (x) { |
3258 if (x->data) free(x->data); | |
3259 t = x->next; | |
3260 free(x); | |
3261 x = t; | |
3262 } | |
3263 DEBUG_RET(); | |
16 | 3264 } |
3265 | |
3266 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3267 static pst_id2_tree * pst_build_id2(pst_file *pf, pst_index_ll* list) { |
43 | 3268 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
|
3269 pst_id2_tree *head = NULL, *tail = NULL; |
46 | 3270 uint16_t x = 0; |
3271 char *b_ptr = NULL; | |
43 | 3272 char *buf = NULL; |
3273 pst_id2_assoc id2_rec; | |
3274 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
|
3275 pst_id2_tree *i2_ptr = NULL; |
46 | 3276 DEBUG_ENT("pst_build_id2"); |
43 | 3277 |
51 | 3278 if (pst_read_block_size(pf, list->offset, list->size, &buf) < list->size) { |
43 | 3279 //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
|
3280 DEBUG_WARN(("block read error occured. offset = %#"PRIx64", size = %#"PRIx64"\n", list->offset, list->size)); |
43 | 3281 if (buf) free(buf); |
3282 DEBUG_RET(); | |
3283 return NULL; | |
3284 } | |
3285 DEBUG_HEXDUMPC(buf, list->size, 16); | |
3286 | |
3287 memcpy(&block_head, buf, sizeof(block_head)); | |
3288 LE16_CPU(block_head.type); | |
3289 LE16_CPU(block_head.count); | |
3290 | |
46 | 3291 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
|
3292 DEBUG_WARN(("Unknown constant [%#hx] at start of id2 values [offset %#"PRIx64"].\n", block_head.type, list->offset)); |
43 | 3293 if (buf) free(buf); |
3294 DEBUG_RET(); | |
3295 return NULL; | |
3296 } | |
3297 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3298 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
|
3299 list->i_id, block_head.count, list->offset)); |
43 | 3300 x = 0; |
46 | 3301 b_ptr = buf + ((pf->do_read64) ? 0x08 : 0x04); |
43 | 3302 while (x < block_head.count) { |
46 | 3303 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
|
3304 DEBUG_INFO(("id2 = %#x, id = %#"PRIx64", child id = %#"PRIx64"\n", id2_rec.id2, id2_rec.id, id2_rec.child_id)); |
46 | 3305 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
|
3306 DEBUG_WARN(("%#"PRIx64" - Not Found\n", id2_rec.id)); |
43 | 3307 } else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3308 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
|
3309 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
|
3310 // 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
|
3311 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
|
3312 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
|
3313 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
|
3314 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
|
3315 i2_ptr->next = NULL; |
43 | 3316 if (!head) head = i2_ptr; |
3317 if (tail) tail->next = i2_ptr; | |
3318 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
|
3319 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
|
3320 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
|
3321 DEBUG_WARN(("child id [%#"PRIx64"] not found\n", id2_rec.child_id)); |
43 | 3322 } |
3323 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
|
3324 i2_ptr->child = pst_build_id2(pf, i_ptr); |
43 | 3325 } |
3326 } | |
3327 } | |
3328 x++; | |
3329 } | |
3330 if (buf) free (buf); | |
3331 DEBUG_RET(); | |
3332 return head; | |
16 | 3333 } |
3334 | |
3335 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3336 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
|
3337 while (attach) { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3338 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
|
3339 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
|
3340 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
|
3341 SAFE_FREE_STR(attach->mimetype); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3342 SAFE_FREE_BIN(attach->data); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3343 pst_free_id2(attach->id2_head); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3344 t = attach->next; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3345 free(attach); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3346 attach = t; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3347 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3348 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3349 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3350 |
46 | 3351 void pst_freeItem(pst_item *item) { |
43 | 3352 pst_item_extra_field *et; |
3353 | |
46 | 3354 DEBUG_ENT("pst_freeItem"); |
43 | 3355 if (item) { |
3356 if (item->email) { | |
3357 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
|
3358 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
|
3359 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
|
3360 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
|
3361 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
|
3362 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
|
3363 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
|
3364 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
|
3365 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
|
3366 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
|
3367 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
|
3368 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
|
3369 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
|
3370 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
|
3371 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
|
3372 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
|
3373 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
|
3374 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
|
3375 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
|
3376 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
|
3377 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
|
3378 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
|
3379 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
|
3380 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
|
3381 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
|
3382 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
|
3383 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
|
3384 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
|
3385 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
|
3386 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
|
3387 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
|
3388 SAFE_FREE_STR(item->email->sender2_address); |
43 | 3389 SAFE_FREE(item->email->sent_date); |
3390 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
|
3391 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
|
3392 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
|
3393 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
|
3394 SAFE_FREE_STR(item->email->supplementary_info); |
328 | 3395 SAFE_FREE_STR(item->email->outlook_received_name1); |
3396 SAFE_FREE_STR(item->email->outlook_sender_name2); | |
3397 SAFE_FREE_STR(item->email->outlook_normalized_subject); | |
3398 SAFE_FREE_STR(item->email->outlook_search_key); | |
43 | 3399 free(item->email); |
3400 } | |
3401 if (item->folder) { | |
3402 free(item->folder); | |
3403 } | |
3404 if (item->message_store) { | |
51 | 3405 SAFE_FREE(item->message_store->top_of_personal_folder); |
3406 SAFE_FREE(item->message_store->default_outbox_folder); | |
43 | 3407 SAFE_FREE(item->message_store->deleted_items_folder); |
51 | 3408 SAFE_FREE(item->message_store->sent_items_folder); |
3409 SAFE_FREE(item->message_store->user_views_folder); | |
3410 SAFE_FREE(item->message_store->common_view_folder); | |
43 | 3411 SAFE_FREE(item->message_store->search_root_folder); |
3412 SAFE_FREE(item->message_store->top_of_folder); | |
3413 free(item->message_store); | |
3414 } | |
3415 if (item->contact) { | |
151
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->account_name); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3417 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
|
3418 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
|
3419 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
|
3420 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
|
3421 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
|
3422 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
|
3423 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
|
3424 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
|
3425 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
|
3426 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
|
3427 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
|
3428 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
|
3429 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
|
3430 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
|
3431 SAFE_FREE_STR(item->contact->billing_information); |
43 | 3432 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
|
3433 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
|
3434 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
|
3435 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
|
3436 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
|
3437 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
|
3438 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
|
3439 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
|
3440 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
|
3441 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
|
3442 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
|
3443 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
|
3444 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
|
3445 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
|
3446 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
|
3447 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
|
3448 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
|
3449 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
|
3450 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
|
3451 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
|
3452 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
|
3453 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
|
3454 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
|
3455 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
|
3456 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
|
3457 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
|
3458 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
|
3459 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
|
3460 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
|
3461 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
|
3462 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
|
3463 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
|
3464 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
|
3465 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
|
3466 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
|
3467 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
|
3468 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
|
3469 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
|
3470 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
|
3471 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
|
3472 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
|
3473 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
|
3474 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
|
3475 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
|
3476 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
|
3477 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
|
3478 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
|
3479 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
|
3480 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
|
3481 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
|
3482 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
|
3483 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
|
3484 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
|
3485 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
|
3486 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
|
3487 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
|
3488 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
|
3489 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
|
3490 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
|
3491 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
|
3492 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
|
3493 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
|
3494 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
|
3495 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
|
3496 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
|
3497 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
|
3498 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
|
3499 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
|
3500 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
|
3501 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
|
3502 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
|
3503 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
|
3504 SAFE_FREE_STR(item->contact->ttytdd_phone); |
43 | 3505 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
|
3506 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
|
3507 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
|
3508 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
|
3509 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
|
3510 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
|
3511 SAFE_FREE_STR(item->contact->work_address_postofficebox); |
43 | 3512 free(item->contact); |
3513 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3514 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3515 pst_free_attach(item->attach); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3516 |
43 | 3517 while (item->extra_fields) { |
3518 SAFE_FREE(item->extra_fields->field_name); | |
3519 SAFE_FREE(item->extra_fields->value); | |
3520 et = item->extra_fields->next; | |
3521 free(item->extra_fields); | |
3522 item->extra_fields = et; | |
3523 } | |
3524 if (item->journal) { | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3525 SAFE_FREE(item->journal->start); |
43 | 3526 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
|
3527 SAFE_FREE_STR(item->journal->type); |
43 | 3528 free(item->journal); |
3529 } | |
3530 if (item->appointment) { | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3531 SAFE_FREE(item->appointment->start); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3532 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
|
3533 SAFE_FREE_STR(item->appointment->location); |
43 | 3534 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
|
3535 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
|
3536 SAFE_FREE_STR(item->appointment->timezonestring); |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3537 SAFE_FREE_STR(item->appointment->recurrence_description); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3538 SAFE_FREE_BIN(item->appointment->recurrence_data); |
50 | 3539 SAFE_FREE(item->appointment->recurrence_start); |
3540 SAFE_FREE(item->appointment->recurrence_end); | |
43 | 3541 free(item->appointment); |
3542 } | |
3543 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
|
3544 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
|
3545 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
|
3546 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
|
3547 SAFE_FREE_STR(item->comment); |
43 | 3548 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
|
3549 SAFE_FREE_STR(item->file_as); |
43 | 3550 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
|
3551 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
|
3552 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
|
3553 SAFE_FREE_BIN(item->predecessor_change); |
43 | 3554 free(item); |
3555 } | |
3556 DEBUG_RET(); | |
16 | 3557 } |
3558 | |
3559 | |
35 | 3560 /** |
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
|
3561 * 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
|
3562 * 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
|
3563 * 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
|
3564 * 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
|
3565 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3566 static int pst_getBlockOffsetPointer(pst_file *pf, pst_id2_tree *i2_head, pst_subblocks *subblocks, uint32_t offset, pst_block_offset_pointer *p) { |
46 | 3567 size_t size; |
43 | 3568 pst_block_offset block_offset; |
46 | 3569 DEBUG_ENT("pst_getBlockOffsetPointer"); |
43 | 3570 if (p->needfree) free(p->from); |
49 | 3571 p->from = NULL; |
3572 p->to = NULL; | |
43 | 3573 p->needfree = 0; |
3574 if (!offset) { | |
49 | 3575 // no data |
43 | 3576 p->from = p->to = NULL; |
3577 } | |
46 | 3578 else if ((offset & 0xf) == (uint32_t)0xf) { |
49 | 3579 // external index reference |
43 | 3580 DEBUG_WARN(("Found id2 %#x value. Will follow it\n", offset)); |
46 | 3581 size = pst_ff_getID2block(pf, offset, i2_head, &(p->from)); |
43 | 3582 if (size) { |
3583 p->to = p->from + size; | |
3584 p->needfree = 1; | |
3585 } | |
3586 else { | |
50 | 3587 if (p->from) { |
3588 DEBUG_WARN(("size zero but non-null pointer\n")); | |
3589 free(p->from); | |
3590 } | |
43 | 3591 p->from = p->to = NULL; |
3592 } | |
3593 } | |
3594 else { | |
49 | 3595 // internal index reference |
3596 size_t subindex = offset >> 16; | |
3597 size_t suboffset = offset & 0xffff; | |
3598 if (subindex < subblocks->subblock_count) { | |
3599 if (pst_getBlockOffset(subblocks->subs[subindex].buf, | |
3600 subblocks->subs[subindex].read_size, | |
3601 subblocks->subs[subindex].i_offset, | |
3602 suboffset, &block_offset)) { | |
3603 p->from = subblocks->subs[subindex].buf + block_offset.from; | |
3604 p->to = subblocks->subs[subindex].buf + block_offset.to; | |
3605 } | |
3606 } | |
43 | 3607 } |
3608 DEBUG_RET(); | |
3609 return (p->from) ? 0 : 1; | |
35 | 3610 } |
3611 | |
3612 | |
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
|
3613 /** */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3614 static int pst_getBlockOffset(char *buf, size_t read_size, uint32_t i_offset, uint32_t offset, pst_block_offset *p) { |
46 | 3615 uint32_t low = offset & 0xf; |
3616 uint32_t of1 = offset >> 4; | |
3617 DEBUG_ENT("pst_getBlockOffset"); | |
43 | 3618 if (!p || !buf || !i_offset || low || (i_offset+2+of1+sizeof(*p) > read_size)) { |
3619 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)); | |
3620 DEBUG_RET(); | |
49 | 3621 return 0; |
43 | 3622 } |
3623 memcpy(&(p->from), &(buf[(i_offset+2)+of1]), sizeof(p->from)); | |
3624 memcpy(&(p->to), &(buf[(i_offset+2)+of1+sizeof(p->from)]), sizeof(p->to)); | |
3625 LE16_CPU(p->from); | |
3626 LE16_CPU(p->to); | |
3627 DEBUG_WARN(("get block offset finds from=%i(%#x), to=%i(%#x)\n", p->from, p->from, p->to, p->to)); | |
3628 if (p->from > p->to) { | |
203 | 3629 DEBUG_WARN(("get block offset from > to\n")); |
52 | 3630 DEBUG_RET(); |
49 | 3631 return 0; |
43 | 3632 } |
3633 DEBUG_RET(); | |
49 | 3634 return 1; |
16 | 3635 } |
3636 | |
3637 | |
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
|
3638 /** */ |
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
|
3639 pst_index_ll* pst_getID(pst_file* pf, uint64_t i_id) { |
69 | 3640 pst_index_ll *ptr; |
46 | 3641 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
|
3642 if (i_id == 0) { |
43 | 3643 DEBUG_RET(); |
3644 return NULL; | |
3645 } | |
3646 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3647 //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
|
3648 //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
|
3649 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
|
3650 |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3651 DEBUG_INFO(("Trying to find %#"PRIx64"\n", i_id)); |
69 | 3652 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
|
3653 while (ptr && (ptr->i_id != i_id)) { |
43 | 3654 ptr = ptr->next; |
3655 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3656 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
|
3657 else {DEBUG_INFO(("ERROR: Value %#"PRIx64" not found\n", i_id)); } |
43 | 3658 DEBUG_RET(); |
3659 return ptr; | |
16 | 3660 } |
3661 | |
3662 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3663 static pst_id2_tree *pst_getID2(pst_id2_tree *head, uint64_t id2) { |
46 | 3664 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
|
3665 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
|
3666 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
|
3667 while (ptr) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3668 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
|
3669 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
|
3670 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
|
3671 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
|
3672 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
|
3673 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
|
3674 } |
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
|
3675 } |
43 | 3676 ptr = ptr->next; |
3677 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3678 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
|
3679 DEBUG_INFO(("Found value %#"PRIx64"\n", ptr->id->i_id)); |
43 | 3680 DEBUG_RET(); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3681 return ptr; |
43 | 3682 } |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3683 DEBUG_INFO(("ERROR Not Found\n")); |
43 | 3684 DEBUG_RET(); |
3685 return NULL; | |
16 | 3686 } |
3687 | |
3688 | |
35 | 3689 /** |
3690 * find the id in the descriptor tree rooted at pf->d_head | |
3691 * | |
43 | 3692 * @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
|
3693 * @param d_id the id we are looking for |
35 | 3694 * |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3695 * @return pointer to the pst_desc_tree node in the descriptor tree |
35 | 3696 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3697 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
|
3698 pst_desc_tree *ptr = pf->d_head; |
46 | 3699 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
|
3700 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
|
3701 //DEBUG_INFO(("Looking for %#"PRIx64" at node %#"PRIx64" with parent %#"PRIx64"\n", id, ptr->d_id, ptr->parent_d_id)); |
43 | 3702 if (ptr->child) { |
3703 ptr = ptr->child; | |
3704 continue; | |
3705 } | |
3706 while (!ptr->next && ptr->parent) { | |
3707 ptr = ptr->parent; | |
3708 } | |
3709 ptr = ptr->next; | |
3710 } | |
3711 DEBUG_RET(); | |
3712 return ptr; // will be NULL or record we are looking for | |
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_printDptr(pst_file *pf, pst_desc_tree *ptr) { |
46 | 3717 DEBUG_ENT("pst_printDptr"); |
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" [%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
|
3720 (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
|
3721 (ptr->assoc_tree ? ptr->assoc_tree->i_id : (uint64_t)0))); |
43 | 3722 if (ptr->child) { |
51 | 3723 pst_printDptr(pf, ptr->child); |
43 | 3724 } |
3725 ptr = ptr->next; | |
3726 } | |
3727 DEBUG_RET(); | |
16 | 3728 } |
3729 | |
3730 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3731 static void pst_printID2ptr(pst_id2_tree *ptr) { |
46 | 3732 DEBUG_ENT("pst_printID2ptr"); |
43 | 3733 while (ptr) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3734 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
|
3735 if (ptr->child) pst_printID2ptr(ptr->child); |
43 | 3736 ptr = ptr->next; |
3737 } | |
3738 DEBUG_RET(); | |
16 | 3739 } |
3740 | |
3741 | |
52 | 3742 /** |
3743 * Read a block of data from file into memory | |
3744 * @param pf PST file | |
3745 * @param offset offset in the pst file of the data | |
3746 * @param size size of the block to be read | |
3747 * @param buf reference to pointer to buffer. If this pointer | |
3748 is non-NULL, it will first be free()d | |
3749 * @return size of block read into memory | |
3750 */ | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3751 static size_t pst_read_block_size(pst_file *pf, int64_t offset, size_t size, char **buf) { |
51 | 3752 size_t rsize; |
46 | 3753 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
|
3754 DEBUG_INFO(("Reading block from %#"PRIx64", %x bytes\n", offset, size)); |
43 | 3755 |
3756 if (*buf) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3757 DEBUG_INFO(("Freeing old memory\n")); |
43 | 3758 free(*buf); |
3759 } | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
3760 *buf = (char*) pst_malloc(size); |
52 | 3761 |
3762 rsize = pst_getAtPos(pf, offset, *buf, size); | |
43 | 3763 if (rsize != size) { |
52 | 3764 DEBUG_WARN(("Didn't read all the data. fread returned less [%i instead of %i]\n", rsize, size)); |
43 | 3765 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
|
3766 DEBUG_WARN(("We tried to read past the end of the file at [offset %#"PRIx64", size %#x]\n", offset, size)); |
43 | 3767 } else if (ferror(pf->fp)) { |
3768 DEBUG_WARN(("Error is set on file stream.\n")); | |
3769 } else { | |
3770 DEBUG_WARN(("I can't tell why it failed\n")); | |
3771 } | |
3772 } | |
3773 | |
3774 DEBUG_RET(); | |
52 | 3775 return rsize; |
16 | 3776 } |
3777 | |
3778 | |
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
|
3779 /** 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
|
3780 * @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
|
3781 * @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
|
3782 * @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
|
3783 * @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
|
3784 @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
|
3785 @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
|
3786 @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
|
3787 * @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
|
3788 */ |
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
|
3789 static int pst_decrypt(uint64_t i_id, char *buf, size_t size, unsigned char type) { |
43 | 3790 size_t x = 0; |
3791 unsigned char y; | |
46 | 3792 DEBUG_ENT("pst_decrypt"); |
43 | 3793 if (!buf) { |
3794 DEBUG_RET(); | |
3795 return -1; | |
3796 } | |
3797 | |
3798 if (type == PST_COMP_ENCRYPT) { | |
3799 x = 0; | |
3800 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
|
3801 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
|
3802 buf[x] = (char)comp_enc[y]; // transpose from encrypt array |
43 | 3803 x++; |
3804 } | |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3805 |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3806 } 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
|
3807 // 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
|
3808 // http://www.passcape.com/outlook_passwords.htm |
188 | 3809 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
|
3810 x = 0; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3811 while (x < size) { |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3812 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
|
3813 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
|
3814 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
|
3815 y += losalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3816 y = comp_high1[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3817 y += hisalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3818 y = comp_high2[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3819 y -= hisalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3820 y = comp_enc[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3821 y -= losalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3822 buf[x] = (char)y; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3823 x++; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3824 salt++; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3825 } |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3826 |
43 | 3827 } 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
|
3828 DEBUG_WARN(("Unknown encryption: %i. Cannot decrypt\n", type)); |
43 | 3829 DEBUG_RET(); |
3830 return -1; | |
3831 } | |
3832 DEBUG_RET(); | |
3833 return 0; | |
16 | 3834 } |
3835 | |
3836 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3837 static uint64_t pst_getIntAt(pst_file *pf, char *buf) { |
46 | 3838 uint64_t buf64; |
3839 uint32_t buf32; | |
3840 if (pf->do_read64) { | |
43 | 3841 memcpy(&buf64, buf, sizeof(buf64)); |
3842 LE64_CPU(buf64); | |
3843 return buf64; | |
3844 } | |
3845 else { | |
3846 memcpy(&buf32, buf, sizeof(buf32)); | |
3847 LE32_CPU(buf32); | |
3848 return buf32; | |
3849 } | |
3850 } | |
3851 | |
3852 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3853 static uint64_t pst_getIntAtPos(pst_file *pf, int64_t pos ) { |
46 | 3854 uint64_t buf64; |
3855 uint32_t buf32; | |
3856 if (pf->do_read64) { | |
52 | 3857 (void)pst_getAtPos(pf, pos, &buf64, sizeof(buf64)); |
43 | 3858 LE64_CPU(buf64); |
3859 return buf64; | |
3860 } | |
3861 else { | |
52 | 3862 (void)pst_getAtPos(pf, pos, &buf32, sizeof(buf32)); |
43 | 3863 LE32_CPU(buf32); |
3864 return buf32; | |
3865 } | |
16 | 3866 } |
3867 | |
52 | 3868 /** |
3869 * Read part of the pst file. | |
3870 * | |
3871 * @param pf PST file structure | |
3872 * @param pos offset of the data in the pst file | |
3873 * @param buf buffer to contain the data | |
3874 * @param size size of the buffer and the amount of data to be read | |
3875 * @return actual read size, 0 if seek error | |
3876 */ | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3877 static size_t pst_getAtPos(pst_file *pf, int64_t pos, void* buf, size_t size) { |
52 | 3878 size_t rc; |
46 | 3879 DEBUG_ENT("pst_getAtPos"); |
52 | 3880 // pst_block_recorder **t = &pf->block_head; |
3881 // pst_block_recorder *p = pf->block_head; | |
3882 // while (p && ((p->offset+p->size) <= pos)) { | |
3883 // t = &p->next; | |
3884 // p = p->next; | |
3885 // } | |
3886 // if (p && (p->offset <= pos) && (pos < (p->offset+p->size))) { | |
3887 // // bump the count | |
3888 // p->readcount++; | |
3889 // } else { | |
3890 // // add a new block | |
3891 // 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
|
3892 // p = (pst_block_recorder*)pst_malloc(sizeof(*p)); |
52 | 3893 // *t = p; |
3894 // p->next = tail; | |
3895 // p->offset = pos; | |
3896 // p->size = size; | |
3897 // p->readcount = 1; | |
3898 // } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3899 // DEBUG_INFO(("pst file old offset %#"PRIx64" old size %#x read count %i offset %#"PRIx64" size %#x\n", |
52 | 3900 // p->offset, p->size, p->readcount, pos, size)); |
3901 | |
75
987aa872294e
Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents:
73
diff
changeset
|
3902 if (fseeko(pf->fp, pos, SEEK_SET) == -1) { |
43 | 3903 DEBUG_RET(); |
52 | 3904 return 0; |
43 | 3905 } |
52 | 3906 rc = fread(buf, (size_t)1, size, pf->fp); |
43 | 3907 DEBUG_RET(); |
52 | 3908 return rc; |
16 | 3909 } |
3910 | |
3911 | |
50 | 3912 /** |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
3913 * Get an ID block from file using pst_ff_getIDblock() and decrypt if necessary |
52 | 3914 * @param pf PST file structure |
188 | 3915 * @param i_id ID of block to retrieve |
3916 * @param buf reference to pointer to buffer that will contain the data block. | |
3917 * If this pointer is non-NULL, it will first be free()d. | |
3918 * @return Size of block read into memory | |
50 | 3919 */ |
188 | 3920 size_t pst_ff_getIDblock_dec(pst_file *pf, uint64_t i_id, char **buf) { |
43 | 3921 size_t r; |
188 | 3922 int noenc = (int)(i_id & 2); // disable encryption |
46 | 3923 DEBUG_ENT("pst_ff_getIDblock_dec"); |
233
1d50ff3c5091
better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents:
231
diff
changeset
|
3924 DEBUG_INFO(("for id %#"PRIx64"\n", i_id)); |
188 | 3925 r = pst_ff_getIDblock(pf, i_id, buf); |
46 | 3926 if ((pf->encryption) && !(noenc)) { |
188 | 3927 (void)pst_decrypt(i_id, *buf, r, pf->encryption); |
43 | 3928 } |
52 | 3929 DEBUG_HEXDUMPC(*buf, r, 16); |
43 | 3930 DEBUG_RET(); |
3931 return r; | |
3932 } | |
3933 | |
3934 | |
50 | 3935 /** |
3936 * Read a block of data from file into memory | |
188 | 3937 * @param pf PST file structure |
3938 * @param i_id ID of block to read | |
3939 * @param buf reference to pointer to buffer that will contain the data block. | |
3940 * If this pointer is non-NULL, it will first be free()d. | |
52 | 3941 * @return size of block read into memory |
50 | 3942 */ |
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
|
3943 static size_t pst_ff_getIDblock(pst_file *pf, uint64_t i_id, char** buf) { |
43 | 3944 pst_index_ll *rec; |
52 | 3945 size_t rsize; |
46 | 3946 DEBUG_ENT("pst_ff_getIDblock"); |
188 | 3947 rec = pst_getID(pf, i_id); |
52 | 3948 if (!rec) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3949 DEBUG_INFO(("Cannot find ID %#"PRIx64"\n", i_id)); |
43 | 3950 DEBUG_RET(); |
3951 return 0; | |
3952 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3953 DEBUG_INFO(("id = %#"PRIx64", record size = %#x, offset = %#x\n", i_id, rec->size, rec->offset)); |
52 | 3954 rsize = pst_read_block_size(pf, rec->offset, rec->size, buf); |
43 | 3955 DEBUG_RET(); |
3956 return rsize; | |
16 | 3957 } |
3958 | |
3959 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3960 static size_t pst_ff_getID2block(pst_file *pf, uint64_t id2, pst_id2_tree *id2_head, char** buf) { |
50 | 3961 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
|
3962 pst_id2_tree* ptr; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3963 pst_holder h = {buf, NULL, 0, 0, 0}; |
46 | 3964 DEBUG_ENT("pst_ff_getID2block"); |
3965 ptr = pst_getID2(id2_head, id2); | |
43 | 3966 |
3967 if (!ptr) { | |
233
1d50ff3c5091
better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents:
231
diff
changeset
|
3968 DEBUG_WARN(("Cannot find id2 value %#"PRIx64"\n", id2)); |
43 | 3969 DEBUG_RET(); |
3970 return 0; | |
3971 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3972 ret = pst_ff_getID2data(pf, ptr->id, &h); |
43 | 3973 DEBUG_RET(); |
50 | 3974 return ret; |
16 | 3975 } |
3976 | |
3977 | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3978 /** 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
|
3979 * 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
|
3980 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3981 * @param pf PST file structure |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3982 * @param ptr |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3983 * @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
|
3984 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3985 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3986 static size_t pst_ff_getID2data(pst_file *pf, pst_index_ll *ptr, pst_holder *h) { |
46 | 3987 size_t ret; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3988 char *b = NULL; |
46 | 3989 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
|
3990 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
|
3991 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
|
3992 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
|
3993 free(b); |
43 | 3994 } else { |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3995 // 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
|
3996 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
|
3997 ret = pst_ff_compile_ID(pf, ptr->i_id, h, (size_t)0); |
43 | 3998 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
3999 ret = pst_finish_cleanup_holder(h, ret); |
43 | 4000 DEBUG_RET(); |
4001 return ret; | |
16 | 4002 } |
4003 | |
4004 | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4005 /** 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
|
4006 * specified by the pst_holder. |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4007 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4008 * @param pf PST file structure |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4009 * @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
|
4010 * @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
|
4011 * @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
|
4012 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4013 */ |
188 | 4014 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
|
4015 size_t z, a; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4016 uint16_t count, y; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4017 char *buf3 = NULL; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4018 char *buf2 = NULL; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4019 char *b_ptr; |
50 | 4020 pst_block_hdr block_hdr; |
4021 pst_table3_rec table3_rec; //for type 3 (0x0101) blocks | |
43 | 4022 |
46 | 4023 DEBUG_ENT("pst_ff_compile_ID"); |
188 | 4024 a = pst_ff_getIDblock(pf, i_id, &buf3); |
43 | 4025 if (!a) { |
4026 if (buf3) free(buf3); | |
52 | 4027 DEBUG_RET(); |
43 | 4028 return 0; |
4029 } | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
4030 DEBUG_HEXDUMPC(buf3, a, 16); |
50 | 4031 memcpy(&block_hdr, buf3, sizeof(block_hdr)); |
4032 LE16_CPU(block_hdr.index_offset); | |
4033 LE16_CPU(block_hdr.type); | |
4034 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
|
4035 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#x)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
50 | 4036 |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4037 count = block_hdr.type; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4038 b_ptr = buf3 + 8; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4039 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4040 // 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
|
4041 // 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
|
4042 // total size of the data. |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4043 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
|
4044 for (y=0; y<count; y++) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4045 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
|
4046 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
|
4047 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4048 free(buf3); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4049 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4050 return size; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4051 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4052 |
50 | 4053 if (block_hdr.index_offset != (uint16_t)0x0101) { //type 3 |
4054 DEBUG_WARN(("WARNING: not a type 0x0101 buffer, Treating as normal buffer\n")); | |
188 | 4055 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
|
4056 size = pst_append_holder(h, size, &buf3, a); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4057 free(buf3); |
43 | 4058 DEBUG_RET(); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4059 return size; |
43 | 4060 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4061 |
50 | 4062 for (y=0; y<count; y++) { |
4063 b_ptr += pst_decode_type3(pf, &table3_rec, b_ptr); | |
4064 z = pst_ff_getIDblock_dec(pf, table3_rec.id, &buf2); | |
4065 if (!z) { | |
4066 DEBUG_WARN(("call to getIDblock returned zero %i\n", z)); | |
4067 if (buf2) free(buf2); | |
4068 free(buf3); | |
52 | 4069 DEBUG_RET(); |
50 | 4070 return z; |
4071 } | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4072 size = pst_append_holder(h, size, &buf2, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4073 } |
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 free(buf3); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4076 if (buf2) free(buf2); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4077 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4078 return size; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4079 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4080 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4081 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4082 /** 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
|
4083 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4084 * @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
|
4085 * @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
|
4086 * @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
|
4087 * @param z number of bytes in buf |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4088 * @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
|
4089 */ |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4090 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
|
4091 char *t; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4092 DEBUG_ENT("pst_append_holder"); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4093 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4094 // raw append to a buffer |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4095 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
|
4096 *(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
|
4097 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
|
4098 memcpy(*(h->buf)+size, *buf, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4099 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4100 // base64 encoding to a file |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4101 } else if ((h->base64 == 1) && h->fp) { |
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 if (h->base64_extra) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4104 // 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
|
4105 *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
|
4106 memmove(*buf+h->base64_extra, *buf, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4107 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
|
4108 z += h->base64_extra; |
43 | 4109 } |
230
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 // 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
|
4112 h->base64_extra = z % 3; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4113 if (h->base64_extra) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4114 z -= h->base64_extra; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4115 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
|
4116 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4117 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4118 // encode this chunk |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4119 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
|
4120 if (t) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4121 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
|
4122 (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
|
4123 free(t); // caught by valgrind |
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 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4126 // raw append to a file |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4127 } else if (h->fp) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4128 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
|
4129 (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
|
4130 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4131 // null output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4132 } else { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4133 // h-> does not specify any output |
43 | 4134 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4135 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4136 return size+z; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4137 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4138 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4139 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4140 /** 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
|
4141 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4142 * @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
|
4143 * @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
|
4144 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4145 */ |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4146 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
|
4147 char *t; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4148 DEBUG_ENT("pst_finish_cleanup_holder"); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4149 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
|
4150 // need to encode any bytes left over |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4151 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
|
4152 if (t) { |
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4153 (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
|
4154 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
|
4155 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4156 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
|
4157 } |
43 | 4158 DEBUG_RET(); |
4159 return size; | |
16 | 4160 } |
4161 | |
4162 | |
328 | 4163 /** compare strings case-insensitive. |
4164 * @return -1 if a < b, 0 if a==b, 1 if a > b | |
4165 */ | |
4166 int pst_stricmp(char *a, char *b) { | |
43 | 4167 while(*a != '\0' && *b != '\0' && toupper(*a)==toupper(*b)) { |
4168 a++; b++; | |
4169 } | |
4170 if (toupper(*a) == toupper(*b)) | |
4171 return 0; | |
4172 else if (toupper(*a) < toupper(*b)) | |
4173 return -1; | |
4174 else | |
4175 return 1; | |
16 | 4176 } |
4177 | |
4178 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4179 static int pst_strincmp(char *a, char *b, size_t x) { |
43 | 4180 // compare upto x chars in string a and b case-insensitively |
4181 // returns -1 if a < b, 0 if a==b, 1 if a > b | |
46 | 4182 size_t y = 0; |
43 | 4183 while (*a != '\0' && *b != '\0' && y < x && toupper(*a)==toupper(*b)) { |
4184 a++; b++; y++; | |
4185 } | |
4186 // if we have reached the end of either string, or a and b still match | |
4187 if (*a == '\0' || *b == '\0' || toupper(*a)==toupper(*b)) | |
4188 return 0; | |
4189 else if (toupper(*a) < toupper(*b)) | |
4190 return -1; | |
4191 else | |
4192 return 1; | |
16 | 4193 } |
4194 | |
4195 | |
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
|
4196 size_t pst_fwrite(const void* ptr, size_t size, size_t nmemb, FILE *stream) { |
43 | 4197 size_t r; |
4198 if (ptr) | |
4199 r = fwrite(ptr, size, nmemb, stream); | |
4200 else { | |
4201 r = 0; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
4202 DEBUG_ENT("pst_fwrite"); |
43 | 4203 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
|
4204 DEBUG_RET(); |
43 | 4205 } |
4206 return r; | |
16 | 4207 } |
4208 | |
4209 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4210 static char* pst_wide_to_single(char *wt, size_t size) { |
43 | 4211 // returns the first byte of each wide char. the size is the number of bytes in source |
4212 char *x, *y; | |
46 | 4213 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
|
4214 x = pst_malloc((size/2)+1); |
43 | 4215 y = x; |
4216 while (size != 0 && *wt != '\0') { | |
4217 *y = *wt; | |
4218 wt+=2; | |
4219 size -= 2; | |
4220 y++; | |
4221 } | |
4222 *y = '\0'; | |
4223 DEBUG_RET(); | |
4224 return x; | |
16 | 4225 } |
4226 | |
43 | 4227 |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4228 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
|
4229 //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
|
4230 //static size_t buflen = 0; |
43 | 4231 char *ret, *a, *b; |
47 | 4232 size_t x = 0; |
4233 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
|
4234 if (!str) return NULL; |
43 | 4235 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
|
4236 // 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
|
4237 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
|
4238 + 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
|
4239 + 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
|
4240 + 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
|
4241 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
|
4242 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
|
4243 // there isn't any extra space required |
43 | 4244 ret = str; |
4245 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
|
4246 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
|
4247 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
|
4248 *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
|
4249 *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
|
4250 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4251 a = str; |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4252 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
|
4253 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
|
4254 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
|
4255 case ',' : |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4256 case '\\': |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4257 case ';' : |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4258 *(b++) = '\\'; |
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 = *a; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4260 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4261 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
|
4262 *(b++) = '\\'; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4263 *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
|
4264 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4265 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
|
4266 b--; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4267 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4268 default: |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4269 *b=*a; |
48 | 4270 } |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4271 b++; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4272 a++; |
43 | 4273 } |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4274 *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
|
4275 ret = *buf; |
43 | 4276 } |
4277 DEBUG_RET(); | |
4278 return ret; | |
4279 } | |
4280 | |
4281 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4282 static int pst_chr_count(char *str, char x) { |
43 | 4283 int r = 0; |
46 | 4284 while (*str) { |
4285 if (*str == x) r++; | |
43 | 4286 str++; |
4287 } | |
4288 return r; | |
4289 } | |
4290 | |
4291 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4292 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
|
4293 struct tm stm; |
43 | 4294 DEBUG_ENT("rfc2425_datetime_format"); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4295 pst_fileTimeToStructTM(ft, &stm); |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4296 if (strftime(result, buflen, "%Y-%m-%dT%H:%M:%SZ", &stm)==0) { |
43 | 4297 DEBUG_INFO(("Problem occured formatting date\n")); |
4298 } | |
4299 DEBUG_RET(); | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4300 return result; |
43 | 4301 } |
4302 | |
4303 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4304 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
|
4305 struct tm stm; |
43 | 4306 DEBUG_ENT("rfc2445_datetime_format"); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4307 pst_fileTimeToStructTM(ft, &stm); |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4308 if (strftime(result, buflen, "%Y%m%dT%H%M%SZ", &stm)==0) { |
43 | 4309 DEBUG_INFO(("Problem occured formatting date\n")); |
4310 } | |
4311 DEBUG_RET(); | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4312 return result; |
43 | 4313 } |
4314 | |
4315 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4316 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
|
4317 struct tm stm; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4318 time_t t = time(NULL); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4319 DEBUG_ENT("rfc2445_datetime_format_now"); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4320 gmtime_r(&t, &stm); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4321 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
|
4322 DEBUG_INFO(("Problem occured formatting date\n")); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4323 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4324 DEBUG_RET(); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4325 return result; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4326 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4327 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4328 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4329 /** 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
|
4330 * |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4331 * @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
|
4332 * @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
|
4333 * @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
|
4334 * @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
|
4335 * equivalent iconv character set |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4336 */ |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4337 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
|
4338 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
|
4339 switch (cp) { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4340 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
|
4341 case 936 : return "gb2313"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4342 case 950 : return "big5"; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4343 case 1200 : return "ucs-2le"; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4344 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
|
4345 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
|
4346 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
|
4347 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
|
4348 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
|
4349 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
|
4350 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
|
4351 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
|
4352 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
|
4353 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
|
4354 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
|
4355 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
|
4356 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
|
4357 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
|
4358 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
|
4359 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
|
4360 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
|
4361 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
|
4362 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
|
4363 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
|
4364 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
|
4365 case 50221 : return "csiso2022jp"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4366 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
|
4367 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
|
4368 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
|
4369 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
|
4370 default : |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4371 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
|
4372 return result; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4373 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4374 return NULL; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4375 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4376 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4377 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4378 /** 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
|
4379 * the charset for pst_string elements that are not already in utf8 encoding. |
271 | 4380 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4381 * @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
|
4382 * @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
|
4383 * @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
|
4384 * @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
|
4385 */ |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4386 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
|
4387 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
|
4388 (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
|
4389 (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
|
4390 (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
|
4391 "iso-8859-1"; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4392 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4393 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4394 |
257
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4395 /** 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
|
4396 * |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4397 * @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
|
4398 */ |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4399 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
|
4400 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
|
4401 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
|
4402 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
|
4403 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
|
4404 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4405 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4406 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
|
4407 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
|
4408 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
|
4409 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
|
4410 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
|
4411 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
|
4412 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
|
4413 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
|
4414 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
|
4415 *(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
|
4416 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
|
4417 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
|
4418 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4419 else { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4420 *(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
|
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 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4423 y++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4424 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4425 *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
|
4426 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
|
4427 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
|
4428 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4429 |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4430 |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4431 /** 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
|
4432 * |
271 | 4433 * @param item pointer to the containing mapi item |
4434 * @param str pointer to the mapi string of interest | |
4435 * @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
|
4436 */ |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4437 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
|
4438 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
|
4439 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
|
4440 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
|
4441 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
|
4442 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
|
4443 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
|
4444 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
|
4445 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4446 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4447 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
|
4448 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
|
4449 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
|
4450 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
|
4451 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
|
4452 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
|
4453 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
|
4454 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4455 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
|
4456 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
|
4457 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
|
4458 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
|
4459 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
|
4460 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
|
4461 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4462 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4463 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4464 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4465 /** 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
|
4466 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4467 * @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
|
4468 * @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
|
4469 */ |
193 | 4470 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
|
4471 if (!str->str) return; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4472 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
|
4473 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4474 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4475 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4476 /** 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
|
4477 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4478 * @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
|
4479 * @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
|
4480 */ |
193 | 4481 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
|
4482 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
|
4483 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
|
4484 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
|
4485 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
|
4486 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
|
4487 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
|
4488 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4489 if (!str->str) { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4490 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
|
4491 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
|
4492 DEBUG_RET(); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4493 return; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4494 } |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4495 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
|
4496 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
|
4497 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
|
4498 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
|
4499 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
|
4500 } |
182
b65e8d0a088a
more cleanup on external names in the shared object file
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
4501 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
|
4502 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
|
4503 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
|
4504 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
|
4505 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
|
4506 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4507 else { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4508 free(str->str); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4509 str->str = newer->b; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4510 str->is_utf8 = 1; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4511 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4512 free(newer); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4513 DEBUG_RET(); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4514 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4515 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4516 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4517 /** 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
|
4518 * @param appt pointer to appointment structure |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4519 * @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
|
4520 */ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4521 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
|
4522 { |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4523 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
|
4524 int m[4] = {3,4,4,5}; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4525 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
|
4526 memset(r, 0, sizeof(pst_recurrence)); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4527 size_t s = appt->recurrence_data.size; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4528 size_t i = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4529 char* p = appt->recurrence_data.data; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4530 if (p) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4531 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
|
4532 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
|
4533 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
|
4534 if (r->sub_type <= 3) { |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4535 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
|
4536 int j = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4537 for (j=0; j<n; j++) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4538 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
|
4539 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4540 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4541 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
|
4542 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
|
4543 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
|
4544 switch (r->type) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4545 case 0: // daily |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4546 if (r->sub_type == 0) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4547 // simple daily |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4548 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
|
4549 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4550 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4551 // daily every weekday, subset of weekly |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4552 r->interval = 1; |
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 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4555 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4556 case 1: // weekly |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4557 r->interval = r->parm2; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4558 r->bydaymask = r->parm4; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4559 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4560 case 2: // monthly |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4561 r->interval = r->parm2; |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4562 if (r->sub_type == 2) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4563 // monthly on day d |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4564 r->dayofmonth = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4565 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4566 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4567 // monthly on 2nd tuesday |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4568 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4569 r->position = r->parm5; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4570 } |
198
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 case 3: // yearly |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4573 r->interval = 1; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4574 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
|
4575 if (r->sub_type == 2) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4576 // yearly on day d of month m |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4577 r->dayofmonth = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4578 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4579 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4580 // yearly on 2nd tuesday of month m |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4581 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4582 r->position = r->parm5; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4583 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4584 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4585 default: |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4586 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4587 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4588 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4589 return r; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4590 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4591 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4592 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4593 /** Free a recurrence structure. |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4594 * @param r input pointer to be freed |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4595 */ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4596 void pst_free_recurrence(pst_recurrence* r) |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4597 { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4598 if (r) free(r); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4599 } |