Mercurial > libpst
annotate src/libpst.c @ 379:bbd198da4033
Alfredo Esteban - add -l and -f options to lspst
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Thu, 07 Dec 2017 08:51:09 -0800 |
parents | 0ccc746c8079 |
children | 2379a4d8d9c7 |
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" |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
9 #include "zlib.h" |
122
bdb38b434c0a
more changes from Fridrich Strba to avoid installing our config.h
Carl Byington <carl@five-ten-sg.com>
parents:
120
diff
changeset
|
10 |
130
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
11 |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
12 // 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
|
13 // 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
|
14 #ifdef _MSC_VER |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
15 #pragma pack(push, 1) |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
16 #endif |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
17 #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
|
18 #pragma pack(1) |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
19 #endif |
e35fd42bac05
more cleanup of include files
Carl Byington <carl@five-ten-sg.com>
parents:
129
diff
changeset
|
20 |
43 | 21 #define ASSERT(x) { if(!(x)) raise( SIGSEGV ); } |
16 | 22 |
43 | 23 #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
|
24 #define INDEX_TYPE32A 0x0F // unknown, but assumed to be similar for now |
43 | 25 #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
|
26 #define INDEX_TYPE64A 0x15 // http://sourceforge.net/projects/libpff/ |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
27 #define INDEX_TYPE4K 0x24 |
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
|
28 #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
|
29 |
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 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
|
31 #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
|
32 #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
|
33 #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
|
34 #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
|
35 #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
|
36 |
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 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
|
38 #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
|
39 #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
|
40 #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
|
41 #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
|
42 #define ENC_TYPE64 (int64_t)0x201 |
46 | 43 |
44 #define FILE_SIZE_POINTER ((pf->do_read64) ? FILE_SIZE_POINTER64 : FILE_SIZE_POINTER32) | |
45 #define INDEX_POINTER ((pf->do_read64) ? INDEX_POINTER64 : INDEX_POINTER32) | |
46 #define INDEX_BACK ((pf->do_read64) ? INDEX_BACK64 : INDEX_BACK32) | |
47 #define SECOND_POINTER ((pf->do_read64) ? SECOND_POINTER64 : SECOND_POINTER32) | |
48 #define SECOND_BACK ((pf->do_read64) ? SECOND_BACK64 : SECOND_BACK32) | |
52 | 49 #define ENC_TYPE ((pf->do_read64) ? ENC_TYPE64 : ENC_TYPE32) |
16 | 50 |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
51 |
16 | 52 #define PST_SIGNATURE 0x4E444221 |
53 | |
46 | 54 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
55 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
|
56 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
|
57 uint16_t to; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
58 } pst_block_offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
59 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
60 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
61 typedef struct pst_block_offset_pointer { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
62 char *from; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
63 char *to; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
64 int needfree; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
65 } pst_block_offset_pointer; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
66 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
67 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
68 typedef struct pst_holder { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
69 char **buf; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
70 FILE *fp; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
71 int base64; // bool, are we encoding into base64 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
72 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
|
73 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
|
74 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
|
75 } pst_holder; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
76 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
77 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
78 typedef struct pst_subblock { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
79 char *buf; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
80 size_t read_size; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
81 size_t i_offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
82 } pst_subblock; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
83 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
84 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
85 typedef struct pst_subblocks { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
86 size_t subblock_count; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
87 pst_subblock *subs; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
88 } pst_subblocks; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
89 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
90 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
91 typedef struct pst_mapi_element { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
92 uint32_t mapi_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
93 char *data; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
94 uint32_t type; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
95 size_t size; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
96 char *extra; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
97 } pst_mapi_element; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
98 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
99 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
100 typedef struct pst_mapi_object { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
101 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
|
102 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
|
103 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
|
104 struct pst_mapi_element **elements; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
105 struct pst_mapi_object *next; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
106 } pst_mapi_object; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
107 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
108 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
109 typedef struct pst_desc32 { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
110 uint32_t d_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
111 uint32_t desc_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
112 uint32_t tree_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
113 uint32_t parent_d_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
114 } pst_desc32; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
115 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
116 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
117 typedef struct pst_index32 { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
118 uint32_t id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
119 uint32_t offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
120 uint16_t size; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
121 int16_t u1; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
122 } pst_index32; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
123 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
124 |
46 | 125 struct pst_table_ptr_struct32{ |
126 uint32_t start; | |
127 uint32_t u1; | |
128 uint32_t offset; | |
43 | 129 }; |
50 | 130 |
131 | |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
132 typedef struct pst_desc { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
133 uint64_t d_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
134 uint64_t desc_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
135 uint64_t tree_id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
136 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
|
137 uint32_t u1; // padding |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
138 } pst_desc; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
139 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
140 |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
141 typedef struct pst_index64 { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
142 uint64_t id; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
143 uint64_t offset; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
144 uint16_t size; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
145 int16_t u0; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
146 int32_t u1; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
147 } pst_index64; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
148 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
149 typedef struct pst_index { |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
150 uint64_t id; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
151 uint64_t offset; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
152 uint16_t size; |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
153 uint16_t inflated_size; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
154 int16_t u0; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
155 int32_t u1; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
156 } pst_index; |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
157 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
158 |
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
159 struct pst_table_ptr_struct{ |
46 | 160 uint64_t start; |
161 uint64_t u1; | |
162 uint64_t offset; | |
16 | 163 }; |
164 | |
50 | 165 |
46 | 166 typedef struct pst_block_header { |
167 uint16_t type; | |
168 uint16_t count; | |
16 | 169 } pst_block_header; |
170 | |
50 | 171 |
46 | 172 typedef struct pst_id2_assoc32 { |
43 | 173 uint32_t id2; |
174 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
|
175 uint32_t child_id; |
46 | 176 } pst_id2_assoc32; |
177 | |
50 | 178 |
46 | 179 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
|
180 uint32_t id2; // only 32 bit here |
48 | 181 uint16_t unknown1; |
182 uint16_t unknown2; | |
46 | 183 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
|
184 uint64_t child_id; |
16 | 185 } pst_id2_assoc; |
186 | |
50 | 187 |
48 | 188 typedef struct pst_table3_rec32 { |
189 uint32_t id; | |
190 } pst_table3_rec32; //for type 3 (0x0101) blocks | |
191 | |
50 | 192 |
48 | 193 typedef struct pst_table3_rec { |
194 uint64_t id; | |
195 } pst_table3_rec; //for type 3 (0x0101) blocks | |
196 | |
197 | |
50 | 198 typedef struct pst_block_hdr { |
199 uint16_t index_offset; | |
200 uint16_t type; | |
201 uint32_t offset; | |
202 } pst_block_hdr; | |
203 | |
204 | |
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
|
205 /** 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
|
206 * 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
|
207 * 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
|
208 */ |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
209 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
|
210 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
|
211 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
|
212 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
|
213 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
|
214 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
|
215 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
|
216 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
|
217 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
|
218 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
|
219 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
|
220 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
|
221 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
|
222 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
|
223 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
|
224 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
|
225 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
|
226 }; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
227 |
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
|
228 /** 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
|
229 */ |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
230 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
|
231 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
|
232 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
|
233 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
|
234 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
|
235 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
|
236 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
|
237 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
|
238 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
|
239 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
|
240 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
|
241 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
|
242 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
|
243 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
|
244 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
|
245 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
|
246 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
|
247 }; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
248 |
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
|
249 /** 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
|
250 */ |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
251 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
|
252 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
|
253 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
|
254 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
|
255 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
|
256 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
|
257 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
|
258 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
|
259 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
|
260 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
|
261 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
|
262 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
|
263 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
|
264 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
|
265 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
|
266 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
|
267 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
|
268 }; |
43 | 269 |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
270 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
|
271 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
|
272 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
|
273 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
|
274 static int pst_chr_count(char *str, char x); |
188 | 275 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
|
276 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
|
277 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
|
278 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
|
279 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
|
280 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
|
281 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
|
282 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
|
283 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
|
284 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
|
285 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
|
286 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
|
287 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
|
288 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
|
289 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
|
290 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
|
291 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
|
292 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
|
293 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
|
294 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
|
295 static int pst_process(uint64_t block_id, pst_mapi_object *list, pst_item *item, pst_item_attach *attach); |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
296 static size_t pst_read_block_size(pst_file *pf, int64_t offset, size_t size, size_t inflated_size, char **buf); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
297 static size_t pst_read_raw_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
|
298 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
|
299 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
|
300 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
|
301 |
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
302 |
325 | 303 static char *pst_getcwd(void) { |
304 char *cwd; | |
305 #ifdef HAVE_GET_CURRENT_DIR_NAME | |
306 cwd = get_current_dir_name(); | |
307 #else | |
308 cwd = pst_malloc(PATH_MAX+1); | |
309 getcwd(cwd, PATH_MAX+1); | |
310 #endif | |
311 return cwd; | |
312 } | |
313 | |
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
|
314 |
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
|
315 int pst_open(pst_file *pf, const char *name, const char *charset) { |
46 | 316 int32_t sig; |
43 | 317 |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
318 pst_unicode_init(); |
45 | 319 |
43 | 320 DEBUG_ENT("pst_open"); |
321 | |
322 if (!pf) { | |
323 WARN (("cannot be passed a NULL pst_file\n")); | |
324 DEBUG_RET(); | |
325 return -1; | |
326 } | |
46 | 327 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
|
328 pf->charset = charset; |
16 | 329 |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
330 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
|
331 perror("Error opening PST file"); |
43 | 332 DEBUG_RET(); |
333 return -1; | |
334 } | |
335 | |
336 // Check pst file magic | |
52 | 337 if (pst_getAtPos(pf, 0, &sig, sizeof(sig)) != sizeof(sig)) { |
46 | 338 (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
|
339 DEBUG_WARN(("cannot read signature from PST file. Closing with error\n")); |
43 | 340 DEBUG_RET(); |
341 return -1; | |
342 } | |
343 LE32_CPU(sig); | |
344 DEBUG_INFO(("sig = %X\n", sig)); | |
46 | 345 if (sig != (int32_t)PST_SIGNATURE) { |
346 (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
|
347 DEBUG_WARN(("not a PST file that I know. Closing with error\n")); |
43 | 348 DEBUG_RET(); |
349 return -1; | |
350 } | |
351 | |
352 // read index type | |
52 | 353 (void)pst_getAtPos(pf, INDEX_TYPE_OFFSET, &(pf->ind_type), sizeof(pf->ind_type)); |
43 | 354 DEBUG_INFO(("index_type = %i\n", pf->ind_type)); |
48 | 355 switch (pf->ind_type) { |
356 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
|
357 case INDEX_TYPE32A : |
48 | 358 pf->do_read64 = 0; |
359 break; | |
360 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
|
361 case INDEX_TYPE64A : |
48 | 362 pf->do_read64 = 1; |
363 break; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
364 case INDEX_TYPE4K : |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
365 pf->do_read64 = 2; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
366 break; |
48 | 367 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
|
368 (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
|
369 DEBUG_WARN(("unknown .pst format, possibly newer than Outlook 2003 PST file?\n")); |
43 | 370 DEBUG_RET(); |
371 return -1; | |
372 } | |
373 | |
374 // read encryption setting | |
52 | 375 (void)pst_getAtPos(pf, ENC_TYPE, &(pf->encryption), sizeof(pf->encryption)); |
43 | 376 DEBUG_INFO(("encrypt = %i\n", pf->encryption)); |
377 | |
46 | 378 pf->index2_back = pst_getIntAtPos(pf, SECOND_BACK); |
379 pf->index2 = pst_getIntAtPos(pf, SECOND_POINTER); | |
380 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
|
381 DEBUG_INFO(("Pointer2 is %#"PRIx64", back pointer2 is %#"PRIx64"\n", pf->index2, pf->index2_back)); |
46 | 382 |
383 pf->index1_back = pst_getIntAtPos(pf, INDEX_BACK); | |
384 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
|
385 DEBUG_INFO(("Pointer1 is %#"PRIx64", back pointer2 is %#"PRIx64"\n", pf->index1, pf->index1_back)); |
43 | 386 |
387 DEBUG_RET(); | |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
388 |
325 | 389 pf->cwd = pst_getcwd(); |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
390 pf->fname = strdup(name); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
391 return 0; |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
392 } |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
393 |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
394 |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
395 int pst_reopen(pst_file *pf) { |
325 | 396 char *cwd; |
397 cwd = pst_getcwd(); | |
398 if (cwd == NULL) return -1; | |
399 if (chdir(pf->cwd)) goto err; | |
400 if (!freopen(pf->fname, "rb", pf->fp)) goto err; | |
401 if (chdir(cwd)) goto err; | |
402 free(cwd); | |
43 | 403 return 0; |
325 | 404 err: |
405 free(cwd); | |
406 return -1; | |
16 | 407 } |
408 | |
409 | |
46 | 410 int pst_close(pst_file *pf) { |
43 | 411 DEBUG_ENT("pst_close"); |
412 if (!pf->fp) { | |
413 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
|
414 return 0; |
43 | 415 } |
416 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
|
417 DEBUG_WARN(("fclose returned non-zero value\n")); |
43 | 418 } |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
419 // free the paths |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
420 free(pf->cwd); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
421 free(pf->fname); |
360 | 422 // we must free the id array and the desc tree |
423 free(pf->i_table); | |
201
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
424 pst_free_desc(pf->d_head); |
3850a3b11745
fixes for parallel readpst
Carl Byington <carl@five-ten-sg.com>
parents:
199
diff
changeset
|
425 pst_free_xattrib(pf->x_head); |
43 | 426 DEBUG_RET(); |
427 return 0; | |
16 | 428 } |
429 | |
430 | |
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
|
431 /** |
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 * 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
|
433 * |
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 * @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
|
435 * @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
|
436 * @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
|
437 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
438 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
|
439 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
|
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 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
|
442 //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
|
443 // 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
|
444 // (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
|
445 // (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
|
446 // (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
|
447 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
|
448 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
|
449 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
|
450 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
|
451 *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
|
452 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
|
453 } |
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 |
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 |
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 * 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
|
458 * |
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 * @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
|
460 * @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
|
461 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
462 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
|
463 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
|
464 { |
104
39ba19372732
many fixes in pst2ldif by Robert Harris
Carl Byington <carl@five-ten-sg.com>
parents:
103
diff
changeset
|
465 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
|
466 // 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
|
467 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
|
468 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
|
469 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
|
470 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
|
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 // 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
|
473 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
|
474 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
|
475 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
|
476 // 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
|
477 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
|
478 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
|
479 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
|
480 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
|
481 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
|
482 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
|
483 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
|
484 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
|
485 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
|
486 } |
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 { |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
488 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
|
489 } |
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 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
491 |
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 // 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
|
493 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
|
494 // 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
|
495 //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
|
496 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
|
497 } |
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
|
498 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
|
499 // 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
|
500 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
|
501 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
|
502 } else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
503 //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
|
504 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
|
505 if (parent) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
506 //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
|
507 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
|
508 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
|
509 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
|
510 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
511 else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
512 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
|
513 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
|
514 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
515 } |
104
39ba19372732
many fixes in pst2ldif by Robert Harris
Carl Byington <carl@five-ten-sg.com>
parents:
103
diff
changeset
|
516 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
|
517 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
518 |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
519 |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
520 /** |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
521 * 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
|
522 * 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
|
523 * |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
524 * @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
|
525 * @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
|
526 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
527 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
|
528 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
|
529 { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
530 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
|
531 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
|
532 me->id2 = head->id2; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
533 me->id = head->id; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
534 me->child = deep_copy(head->child); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
535 me->next = deep_copy(head->next); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
536 return me; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
537 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
538 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
539 |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
540 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
|
541 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
|
542 uint32_t topid; |
43 | 543 DEBUG_ENT("pst_getTopOfFolders"); |
544 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
|
545 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
|
546 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
|
547 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
|
548 } |
0af0bbe166e1
create dummy top-of-folder descriptor if needed for corrupt pst files
Carl Byington <carl@five-ten-sg.com>
parents:
102
diff
changeset
|
549 if (!root->message_store->top_of_personal_folder) { |
43 | 550 // this is the OST way |
551 // 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
|
552 topid = 0x2142; |
43 | 553 } 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
|
554 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
|
555 } |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
556 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
|
557 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
|
558 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
|
559 // 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
|
560 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
|
561 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
|
562 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
|
563 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
|
564 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
|
565 record_descriptor(pf, topnode); // add to the global tree |
43 | 566 } |
567 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
|
568 return topnode; |
16 | 569 } |
570 | |
571 | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
572 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
|
573 pst_index_ll *ptr; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
574 pst_binary rc; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
575 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
|
576 rc.size = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
577 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
|
578 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
|
579 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
|
580 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
|
581 if (ptr) { |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
582 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
|
583 } else { |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
584 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
|
585 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
586 } else { |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
587 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
|
588 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
|
589 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
|
590 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
591 DEBUG_RET(); |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
592 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
|
593 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
594 |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
595 |
46 | 596 size_t pst_attach_to_file(pst_file *pf, pst_item_attach *attach, FILE* fp) { |
43 | 597 pst_index_ll *ptr; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
598 pst_holder h = {NULL, fp, 0, 0, 0}; |
93 | 599 size_t size = 0; |
43 | 600 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
|
601 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
|
602 ptr = pst_getID(pf, attach->i_id); |
43 | 603 if (ptr) { |
46 | 604 size = pst_ff_getID2data(pf, ptr, &h); |
43 | 605 } else { |
606 DEBUG_WARN(("Couldn't find ID pointer. Cannot save attachment to file\n")); | |
607 } | |
608 } else { | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
609 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
|
610 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
|
611 // 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
|
612 (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
|
613 } |
43 | 614 } |
615 DEBUG_RET(); | |
46 | 616 return size; |
16 | 617 } |
618 | |
619 | |
46 | 620 size_t pst_attach_to_file_base64(pst_file *pf, pst_item_attach *attach, FILE* fp) { |
43 | 621 pst_index_ll *ptr; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
622 pst_holder h = {NULL, fp, 1, 0, 0}; |
93 | 623 size_t size = 0; |
43 | 624 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
|
625 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
|
626 ptr = pst_getID(pf, attach->i_id); |
43 | 627 if (ptr) { |
46 | 628 size = pst_ff_getID2data(pf, ptr, &h); |
43 | 629 } else { |
93 | 630 DEBUG_WARN(("Couldn't find ID pointer. Cannot save attachment to Base64\n")); |
43 | 631 } |
632 } 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
|
633 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
|
634 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
|
635 // 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
|
636 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
|
637 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
|
638 (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
|
639 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
|
640 } |
43 | 641 } |
642 } | |
643 DEBUG_RET(); | |
46 | 644 return size; |
16 | 645 } |
646 | |
647 | |
46 | 648 int pst_load_index (pst_file *pf) { |
649 int x; | |
43 | 650 DEBUG_ENT("pst_load_index"); |
651 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
|
652 DEBUG_WARN(("Cannot load index for a NULL pst_file\n")); |
43 | 653 DEBUG_RET(); |
654 return -1; | |
655 } | |
656 | |
46 | 657 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
|
658 DEBUG_INFO(("build id ptr returns %i\n", x)); |
43 | 659 |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
660 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
|
661 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
|
662 |
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
663 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
|
664 |
43 | 665 DEBUG_RET(); |
666 return 0; | |
16 | 667 } |
668 | |
669 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
670 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
|
671 pst_desc_tree* r = NULL; |
43 | 672 DEBUG_ENT("pst_getNextDptr"); |
673 if (d) { | |
674 if ((r = d->child) == NULL) { | |
675 while (!d->next && d->parent) d = d->parent; | |
676 r = d->next; | |
677 } | |
678 } | |
679 DEBUG_RET(); | |
680 return r; | |
16 | 681 } |
682 | |
683 | |
46 | 684 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
|
685 uint32_t extended; |
43 | 686 uint16_t type; |
687 uint16_t map; | |
16 | 688 } pst_x_attrib; |
689 | |
690 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
691 /** 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
|
692 @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
|
693 */ |
46 | 694 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
|
695 // 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
|
696 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
|
697 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
|
698 pst_id2_tree *id2_head = NULL; |
52 | 699 char *buffer=NULL, *headerbuffer=NULL; |
46 | 700 size_t bsize=0, hsize=0, bptr=0; |
43 | 701 pst_x_attrib xattrib; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
702 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
|
703 pst_x_attrib_ll *ptr, *p_head=NULL; |
43 | 704 |
705 DEBUG_ENT("pst_loadExtendedAttributes"); | |
52 | 706 p = pst_getDptr(pf, (uint64_t)0x61); |
707 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
|
708 DEBUG_WARN(("Cannot find d_id 0x61 for loading the Extended Attributes\n")); |
43 | 709 DEBUG_RET(); |
710 return 0; | |
711 } | |
712 | |
713 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
|
714 DEBUG_WARN(("descriptor is NULL for d_id 0x61. Cannot load Extended Attributes\n")); |
43 | 715 DEBUG_RET(); |
716 return 0; | |
717 } | |
718 | |
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
|
719 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
|
720 id2_head = pst_build_id2(pf, p->assoc_tree); |
51 | 721 pst_printID2ptr(id2_head); |
43 | 722 } 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
|
723 DEBUG_WARN(("Have not been able to fetch any id2 values for d_id 0x61. Brace yourself!\n")); |
43 | 724 } |
725 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
726 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
|
727 if (!list) { |
43 | 728 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
|
729 pst_free_id2(id2_head); |
43 | 730 DEBUG_RET(); |
731 return 0; | |
732 } | |
733 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
734 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
|
735 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
|
736 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
|
737 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
|
738 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
|
739 } |
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
740 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
|
741 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
|
742 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
|
743 } 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
|
744 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
|
745 hsize = list->elements[x]->size; |
46 | 746 } else { |
747 // leave them null | |
43 | 748 } |
749 } | |
750 | |
751 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
|
752 pst_free_list(list); |
43 | 753 DEBUG_WARN(("No extended attributes buffer found. Not processing\n")); |
754 DEBUG_RET(); | |
755 return 0; | |
756 } | |
757 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
758 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
|
759 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
|
760 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
|
761 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
|
762 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
|
763 ptr = (pst_x_attrib_ll*) pst_malloc(sizeof(*ptr)); |
46 | 764 memset(ptr, 0, sizeof(*ptr)); |
765 ptr->map = xattrib.map+0x8000; | |
43 | 766 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
|
767 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
|
768 xattrib.extended, xattrib.type, xattrib.map)); |
43 | 769 if (xattrib.type & 0x0001) { // if the Bit 1 is set |
770 // pointer to Unicode field in buffer | |
771 if (xattrib.extended < hsize) { | |
772 char *wt; | |
773 // copy the size of the header. It is 32 bit int | |
774 memcpy(&tint, &(headerbuffer[xattrib.extended]), sizeof(tint)); | |
775 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
|
776 wt = (char*) pst_malloc((size_t)(tint+2)); // plus 2 for a uni-code zero |
46 | 777 memset(wt, 0, (size_t)(tint+2)); |
778 memcpy(wt, &(headerbuffer[xattrib.extended+sizeof(tint)]), (size_t)tint); | |
47 | 779 ptr->data = pst_wide_to_single(wt, (size_t)tint); |
43 | 780 free(wt); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
781 DEBUG_INFO(("Mapped attribute %#"PRIx32" to %s\n", ptr->map, ptr->data)); |
43 | 782 } else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
783 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
|
784 err = 1; |
43 | 785 } |
786 ptr->mytype = PST_MAP_HEADER; | |
787 } else { | |
788 // 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
|
789 ptr->data = (uint32_t*)pst_malloc(sizeof(uint32_t)); |
46 | 790 memset(ptr->data, 0, sizeof(uint32_t)); |
791 *((uint32_t*)ptr->data) = xattrib.extended; | |
43 | 792 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
|
793 DEBUG_INFO(("Mapped attribute %#"PRIx32" to %#"PRIx32"\n", ptr->map, *((uint32_t*)ptr->data))); |
43 | 794 } |
795 | |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
796 if (!err) { |
43 | 797 // 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
|
798 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
|
799 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
|
800 while (p_sh && (ptr->map > p_sh->map)) { |
43 | 801 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
|
802 p_sh = p_sh->next; |
43 | 803 } |
804 if (!p_sh2) { | |
805 // needs to go before first item | |
806 ptr->next = p_head; | |
807 p_head = ptr; | |
808 } else { | |
809 // it will go after p_sh2 | |
810 ptr->next = p_sh2->next; | |
811 p_sh2->next = ptr; | |
812 } | |
813 } else { | |
814 free(ptr); | |
815 } | |
816 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
817 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
|
818 pst_free_list(list); |
43 | 819 pf->x_head = p_head; |
820 DEBUG_RET(); | |
821 return 1; | |
16 | 822 } |
823 | |
52 | 824 |
44 | 825 #define ITEM_COUNT_OFFSET32 0x1f0 // count byte |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
826 #define MAX_COUNT_OFFSET32 0x1f1 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
827 #define ENTRY_SIZE_OFFSET32 0x1f2 |
44 | 828 #define LEVEL_INDICATOR_OFFSET32 0x1f3 // node or leaf |
829 #define BACKLINK_OFFSET32 0x1f8 // backlink u1 value | |
830 | |
831 #define ITEM_COUNT_OFFSET64 0x1e8 // count byte | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
832 #define MAX_COUNT_OFFSET64 0x1e9 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
833 #define ENTRY_SIZE_OFFSET64 0x1ea // node or leaf |
44 | 834 #define LEVEL_INDICATOR_OFFSET64 0x1eb // node or leaf |
835 #define BACKLINK_OFFSET64 0x1f8 // backlink u1 value | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
836 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
837 #define ITEM_COUNT_OFFSET4K 0xfd8 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
838 #define MAX_COUNT_OFFSET4K 0xfda |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
839 #define ENTRY_SIZE_OFFSET4K 0xfdc |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
840 #define LEVEL_INDICATOR_OFFSET4K 0xfdd |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
841 #define BACKLINK_OFFSET4K 0xff0 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
842 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
843 #define BLOCK_SIZE (size_t)((pf->do_read64 == 2) ? 4096 : 512) // index blocks |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
844 #define DESC_BLOCK_SIZE (size_t)((pf->do_read64 == 2) ? 4096 : 512) // descriptor blocks |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
845 #define ITEM_COUNT_OFFSET (size_t)((pf->do_read64) ? (pf->do_read64 == 2 ? ITEM_COUNT_OFFSET4K : ITEM_COUNT_OFFSET64) : ITEM_COUNT_OFFSET32) |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
846 #define LEVEL_INDICATOR_OFFSET (size_t)((pf->do_read64) ? (pf->do_read64 == 2 ? LEVEL_INDICATOR_OFFSET4K : LEVEL_INDICATOR_OFFSET64) : LEVEL_INDICATOR_OFFSET32) |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
847 #define BACKLINK_OFFSET (size_t)((pf->do_read64) ? (pf->do_read64 == 2 ? BACKLINK_OFFSET4K : BACKLINK_OFFSET64) : BACKLINK_OFFSET32) |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
848 #define ENTRY_SIZE_OFFSET (size_t)((pf->do_read64) ? (pf->do_read64 == 2 ? ENTRY_SIZE_OFFSET4K : ENTRY_SIZE_OFFSET64) : ENTRY_SIZE_OFFSET32) |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
849 #define MAX_COUNT_OFFSET (size_t)((pf->do_read64) ? (pf->do_read64 == 2 ? MAX_COUNT_OFFSET4K : MAX_COUNT_OFFSET64) : MAX_COUNT_OFFSET32) |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
850 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
851 #define read_twobyte(BUF, OFF) (int32_t) ((((unsigned)BUF[OFF + 1] & 0xFF)) << 8) | ((unsigned)BUF[OFF] & 0xFF); |
46 | 852 |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
853 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
|
854 static size_t pst_decode_desc(pst_file *pf, pst_desc *desc, char *buf) { |
46 | 855 size_t r; |
856 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
|
857 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
|
858 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
|
859 memcpy(desc, buf, sizeof(pst_desc)); |
43 | 860 LE64_CPU(desc->d_id); |
861 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
|
862 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
|
863 LE32_CPU(desc->parent_d_id); |
43 | 864 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
|
865 r = sizeof(pst_desc); |
43 | 866 } |
867 else { | |
868 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
|
869 DEBUG_INFO(("Decoding desc32\n")); |
43 | 870 DEBUG_HEXDUMPC(buf, sizeof(pst_desc32), 0x10); |
871 memcpy(&d32, buf, sizeof(pst_desc32)); | |
872 LE32_CPU(d32.d_id); | |
873 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
|
874 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
|
875 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
|
876 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
|
877 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
|
878 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
|
879 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
|
880 desc->u1 = 0; |
43 | 881 r = sizeof(pst_desc32); |
882 } | |
883 return r; | |
884 } | |
885 | |
886 | |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
887 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
|
888 static size_t pst_decode_table(pst_file *pf, struct pst_table_ptr_struct *table, char *buf) { |
46 | 889 size_t r; |
890 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
|
891 DEBUG_INFO(("Decoding table64\n")); |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
892 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
|
893 memcpy(table, buf, sizeof(struct pst_table_ptr_struct)); |
43 | 894 LE64_CPU(table->start); |
895 LE64_CPU(table->u1); | |
896 LE64_CPU(table->offset); | |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
897 r =sizeof(struct pst_table_ptr_struct); |
43 | 898 } |
899 else { | |
46 | 900 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
|
901 DEBUG_INFO(("Decoding table32\n")); |
46 | 902 DEBUG_HEXDUMPC(buf, sizeof( struct pst_table_ptr_struct32), 0x10); |
903 memcpy(&t32, buf, sizeof(struct pst_table_ptr_struct32)); | |
43 | 904 LE32_CPU(t32.start); |
905 LE32_CPU(t32.u1); | |
906 LE32_CPU(t32.offset); | |
907 table->start = t32.start; | |
908 table->u1 = t32.u1; | |
909 table->offset = t32.offset; | |
46 | 910 r = sizeof(struct pst_table_ptr_struct32); |
43 | 911 } |
912 return r; | |
913 } | |
914 | |
915 | |
46 | 916 static size_t pst_decode_index(pst_file *pf, pst_index *index, char *buf); |
917 static size_t pst_decode_index(pst_file *pf, pst_index *index, char *buf) { | |
918 size_t r; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
919 if (pf->do_read64 == 2) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
920 DEBUG_INFO(("Decoding index4k\n")); |
43 | 921 DEBUG_HEXDUMPC(buf, sizeof(pst_index), 0x10); |
922 memcpy(index, buf, sizeof(pst_index)); | |
923 LE64_CPU(index->id); | |
924 LE64_CPU(index->offset); | |
925 LE16_CPU(index->size); | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
926 LE16_CPU(index->inflated_size); |
43 | 927 LE16_CPU(index->u0); |
149
f9773b6368e0
improve documentation of .pst format.
Carl Byington <carl@five-ten-sg.com>
parents:
148
diff
changeset
|
928 LE32_CPU(index->u1); |
43 | 929 r = sizeof(pst_index); |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
930 } else if (pf->do_read64 == 1) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
931 pst_index64 index64; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
932 DEBUG_INFO(("Decoding index64\n")); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
933 DEBUG_HEXDUMPC(buf, sizeof(pst_index64), 0x10); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
934 memcpy(&index64, buf, sizeof(pst_index64)); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
935 LE64_CPU(index64.id); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
936 LE64_CPU(index64.offset); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
937 LE16_CPU(index64.size); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
938 LE16_CPU(index64.u0); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
939 LE32_CPU(index64.u1); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
940 index->id = index64.id; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
941 index->offset = index64.offset; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
942 index->size = index64.size; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
943 index->inflated_size = index64.size; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
944 index->u0 = index64.u0; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
945 index->u1 = index64.u1; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
946 r = sizeof(pst_index64); |
43 | 947 } else { |
948 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
|
949 DEBUG_INFO(("Decoding index32\n")); |
43 | 950 DEBUG_HEXDUMPC(buf, sizeof(pst_index32), 0x10); |
951 memcpy(&index32, buf, sizeof(pst_index32)); | |
46 | 952 LE32_CPU(index32.id); |
953 LE32_CPU(index32.offset); | |
954 LE16_CPU(index32.size); | |
955 LE16_CPU(index32.u1); | |
43 | 956 index->id = index32.id; |
957 index->offset = index32.offset; | |
958 index->size = index32.size; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
959 index->inflated_size = index32.size; |
149
f9773b6368e0
improve documentation of .pst format.
Carl Byington <carl@five-ten-sg.com>
parents:
148
diff
changeset
|
960 index->u0 = 0; |
43 | 961 index->u1 = index32.u1; |
962 r = sizeof(pst_index32); | |
963 } | |
964 return r; | |
965 } | |
966 | |
967 | |
46 | 968 static size_t pst_decode_assoc(pst_file *pf, pst_id2_assoc *assoc, char *buf); |
969 static size_t pst_decode_assoc(pst_file *pf, pst_id2_assoc *assoc, char *buf) { | |
970 size_t r; | |
971 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
|
972 DEBUG_INFO(("Decoding assoc64\n")); |
46 | 973 DEBUG_HEXDUMPC(buf, sizeof(pst_id2_assoc), 0x10); |
974 memcpy(assoc, buf, sizeof(pst_id2_assoc)); | |
48 | 975 LE32_CPU(assoc->id2); |
46 | 976 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
|
977 LE64_CPU(assoc->child_id); |
46 | 978 r = sizeof(pst_id2_assoc); |
979 } else { | |
980 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
|
981 DEBUG_INFO(("Decoding assoc32\n")); |
46 | 982 DEBUG_HEXDUMPC(buf, sizeof(pst_id2_assoc32), 0x10); |
983 memcpy(&assoc32, buf, sizeof(pst_id2_assoc32)); | |
984 LE32_CPU(assoc32.id2); | |
985 LE32_CPU(assoc32.id); | |
160
252ad66d3d6e
fix ppc64 compile error
Carl Byington <carl@five-ten-sg.com>
parents:
154
diff
changeset
|
986 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
|
987 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
|
988 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
|
989 assoc->child_id = assoc32.child_id; |
46 | 990 r = sizeof(pst_id2_assoc32); |
991 } | |
992 return r; | |
993 } | |
994 | |
995 | |
48 | 996 static size_t pst_decode_type3(pst_file *pf, pst_table3_rec *table3_rec, char *buf); |
997 static size_t pst_decode_type3(pst_file *pf, pst_table3_rec *table3_rec, char *buf) { | |
998 size_t r; | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
999 DEBUG_ENT("pst_decode_type3"); |
48 | 1000 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
|
1001 DEBUG_INFO(("Decoding table3 64\n")); |
48 | 1002 DEBUG_HEXDUMPC(buf, sizeof(pst_table3_rec), 0x10); |
1003 memcpy(table3_rec, buf, sizeof(pst_table3_rec)); | |
1004 LE64_CPU(table3_rec->id); | |
1005 r = sizeof(pst_table3_rec); | |
1006 } else { | |
1007 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
|
1008 DEBUG_INFO(("Decoding table3 32\n")); |
48 | 1009 DEBUG_HEXDUMPC(buf, sizeof(pst_table3_rec32), 0x10); |
1010 memcpy(&table3_rec32, buf, sizeof(pst_table3_rec32)); | |
1011 LE32_CPU(table3_rec32.id); | |
1012 table3_rec->id = table3_rec32.id; | |
1013 r = sizeof(pst_table3_rec32); | |
1014 } | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
1015 DEBUG_RET(); |
48 | 1016 return r; |
1017 } | |
1018 | |
1019 | |
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
|
1020 /** 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
|
1021 * 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
|
1022 * (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
|
1023 * 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
|
1024 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
1025 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
|
1026 struct pst_table_ptr_struct table, table2; |
43 | 1027 pst_index_ll *i_ptr=NULL; |
1028 pst_index index; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1029 int32_t x, item_count, count_max; |
43 | 1030 uint64_t old = start_val; |
1031 char *buf = NULL, *bptr; | |
1032 | |
46 | 1033 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
|
1034 DEBUG_INFO(("offset %#"PRIx64" depth %i linku1 %#"PRIx64" start %#"PRIx64" end %#"PRIx64"\n", offset, depth, linku1, start_val, end_val)); |
43 | 1035 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
|
1036 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 | 1037 DEBUG_RET(); |
1038 return -1; | |
1039 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1040 DEBUG_INFO(("Reading index block\n")); |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1041 if (pst_read_block_size(pf, offset, BLOCK_SIZE, BLOCK_SIZE, &buf) < BLOCK_SIZE) { |
43 | 1042 DEBUG_WARN(("Failed to read %i bytes\n", BLOCK_SIZE)); |
1043 if (buf) free(buf); | |
1044 DEBUG_RET(); | |
1045 return -1; | |
1046 } | |
1047 bptr = buf; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1048 DEBUG_HEXDUMPC(buf, BLOCK_SIZE, 0x10); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1049 if (pf->do_read64 == 2) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1050 item_count = read_twobyte(buf, ITEM_COUNT_OFFSET); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1051 count_max = read_twobyte(buf, MAX_COUNT_OFFSET); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1052 } else { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1053 item_count = (int32_t)(unsigned)(buf[ITEM_COUNT_OFFSET]); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1054 count_max = (int32_t)(unsigned)(buf[MAX_COUNT_OFFSET]); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1055 } |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1056 if (item_count > count_max) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1057 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, count_max)); |
43 | 1058 if (buf) free(buf); |
1059 DEBUG_RET(); | |
1060 return -1; | |
1061 } | |
46 | 1062 index.id = pst_getIntAt(pf, buf+BACKLINK_OFFSET); |
43 | 1063 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
|
1064 DEBUG_WARN(("Backlink %#"PRIx64" in this node does not match required %#"PRIx64"\n", index.id, linku1)); |
43 | 1065 if (buf) free(buf); |
1066 DEBUG_RET(); | |
1067 return -1; | |
1068 } | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1069 int entry_size = (int32_t)(unsigned)(buf[ENTRY_SIZE_OFFSET]); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1070 DEBUG_INFO(("count %#"PRIx64" max %#"PRIx64" size %#"PRIx64"\n", item_count, count_max, entry_size)); |
43 | 1071 if (buf[LEVEL_INDICATOR_OFFSET] == '\0') { |
1072 // this node contains leaf pointers | |
1073 x = 0; | |
1074 while (x < item_count) { | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1075 pst_decode_index(pf, &index, bptr); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1076 bptr += entry_size; |
43 | 1077 x++; |
1078 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
|
1079 DEBUG_INFO(("[%i]%i Item [id = %#"PRIx64", offset = %#"PRIx64", u1 = %#x, size = %i(%#x)]\n", |
43 | 1080 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
|
1081 // if (index.id & 0x02) DEBUG_INFO(("two-bit set!!\n")); |
43 | 1082 if ((index.id >= end_val) || (index.id < old)) { |
1083 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); | |
1084 if (buf) free(buf); | |
1085 DEBUG_RET(); | |
1086 return -1; | |
1087 } | |
1088 old = index.id; | |
360 | 1089 if (pf->i_count == pf->i_capacity) { |
1090 pf->i_capacity += (pf->i_capacity >> 1) + 16; // arbitrary growth rate | |
1091 pf->i_table = pst_realloc(pf->i_table, pf->i_capacity * sizeof(pst_index_ll)); | |
1092 } | |
1093 i_ptr = &pf->i_table[pf->i_count++]; | |
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
|
1094 i_ptr->i_id = index.id; |
43 | 1095 i_ptr->offset = index.offset; |
1096 i_ptr->u1 = index.u1; | |
1097 i_ptr->size = index.size; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1098 i_ptr->inflated_size = index.inflated_size; |
43 | 1099 } |
1100 } else { | |
1101 // this node contains node pointers | |
1102 x = 0; | |
1103 while (x < item_count) { | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1104 pst_decode_table(pf, &table, bptr); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1105 bptr += entry_size; |
43 | 1106 x++; |
1107 if (table.start == 0) break; | |
1108 if (x < item_count) { | |
46 | 1109 (void)pst_decode_table(pf, &table2, bptr); |
43 | 1110 } |
1111 else { | |
1112 table2.start = end_val; | |
1113 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1114 DEBUG_INFO(("[%i] %i Index Table [start id = %#"PRIx64", u1 = %#"PRIx64", offset = %#"PRIx64", end id = %#"PRIx64"]\n", |
43 | 1115 depth, x, table.start, table.u1, table.offset, table2.start)); |
1116 if ((table.start >= end_val) || (table.start < old)) { | |
1117 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); | |
1118 if (buf) free(buf); | |
1119 DEBUG_RET(); | |
1120 return -1; | |
1121 } | |
1122 old = table.start; | |
46 | 1123 (void)pst_build_id_ptr(pf, table.offset, depth+1, table.u1, table.start, table2.start); |
43 | 1124 } |
1125 } | |
1126 if (buf) free (buf); | |
1127 DEBUG_RET(); | |
1128 return 0; | |
16 | 1129 } |
1130 | |
1131 | |
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
|
1132 /** 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
|
1133 * 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
|
1134 * 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
|
1135 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
1136 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
|
1137 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
|
1138 pst_desc desc_rec; |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1139 int32_t item_count, count_max; |
48 | 1140 uint64_t old = start_val; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1141 int x; |
43 | 1142 char *buf = NULL, *bptr; |
1143 | |
46 | 1144 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
|
1145 DEBUG_INFO(("offset %#"PRIx64" depth %i linku1 %#"PRIx64" start %#"PRIx64" end %#"PRIx64"\n", offset, depth, linku1, start_val, end_val)); |
43 | 1146 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
|
1147 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 | 1148 DEBUG_RET(); |
1149 return -1; | |
1150 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1151 DEBUG_INFO(("Reading desc block\n")); |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1152 if (pst_read_block_size(pf, offset, DESC_BLOCK_SIZE, DESC_BLOCK_SIZE, &buf) < DESC_BLOCK_SIZE) { |
43 | 1153 DEBUG_WARN(("Failed to read %i bytes\n", DESC_BLOCK_SIZE)); |
1154 if (buf) free(buf); | |
1155 DEBUG_RET(); | |
1156 return -1; | |
1157 } | |
1158 bptr = buf; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1159 if (pf->do_read64 == 2) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1160 item_count = read_twobyte(buf, ITEM_COUNT_OFFSET); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1161 count_max = read_twobyte(buf, MAX_COUNT_OFFSET); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1162 } else { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1163 item_count = (int32_t)(unsigned)(buf[ITEM_COUNT_OFFSET]); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1164 count_max = (int32_t)(unsigned)(buf[MAX_COUNT_OFFSET]); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1165 } |
46 | 1166 desc_rec.d_id = pst_getIntAt(pf, buf+BACKLINK_OFFSET); |
43 | 1167 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
|
1168 DEBUG_WARN(("Backlink %#"PRIx64" in this node does not match required %#"PRIx64"\n", desc_rec.d_id, linku1)); |
43 | 1169 if (buf) free(buf); |
1170 DEBUG_RET(); | |
1171 return -1; | |
1172 } | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1173 int32_t entry_size = (int32_t)(unsigned)(buf[ENTRY_SIZE_OFFSET]); |
43 | 1174 if (buf[LEVEL_INDICATOR_OFFSET] == '\0') { |
1175 // this node contains leaf pointers | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1176 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, entry_size); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1177 if (item_count > count_max) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1178 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, count_max)); |
43 | 1179 if (buf) free(buf); |
1180 DEBUG_RET(); | |
1181 return -1; | |
1182 } | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1183 for (x=0; x<item_count; x++) { |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1184 pst_decode_desc(pf, &desc_rec, bptr); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1185 bptr += entry_size; |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1186 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
|
1187 depth, x, desc_rec.d_id, desc_rec.desc_id, desc_rec.tree_id, desc_rec.parent_d_id)); |
43 | 1188 if ((desc_rec.d_id >= end_val) || (desc_rec.d_id < old)) { |
1189 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); | |
1190 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, 16); | |
1191 if (buf) free(buf); | |
1192 DEBUG_RET(); | |
1193 return -1; | |
1194 } | |
1195 old = desc_rec.d_id; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1196 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
|
1197 { |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1198 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
|
1199 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
|
1200 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
|
1201 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
|
1202 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
|
1203 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
|
1204 } |
43 | 1205 } |
1206 } else { | |
1207 // this node contains node pointers | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1208 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, entry_size); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1209 if (item_count > count_max) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1210 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, count_max)); |
43 | 1211 if (buf) free(buf); |
1212 DEBUG_RET(); | |
1213 return -1; | |
1214 } | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1215 for (x=0; x<item_count; x++) { |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1216 pst_decode_table(pf, &table, bptr); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
1217 bptr += entry_size; |
43 | 1218 if (table.start == 0) break; |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1219 if (x < (item_count-1)) { |
46 | 1220 (void)pst_decode_table(pf, &table2, bptr); |
43 | 1221 } |
1222 else { | |
1223 table2.start = end_val; | |
1224 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1225 DEBUG_INFO(("[%i] %i Descriptor Table [start id = %#"PRIx64", u1 = %#"PRIx64", offset = %#"PRIx64", end id = %#"PRIx64"]\n", |
43 | 1226 depth, x, table.start, table.u1, table.offset, table2.start)); |
1227 if ((table.start >= end_val) || (table.start < old)) { | |
1228 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); | |
1229 if (buf) free(buf); | |
1230 DEBUG_RET(); | |
1231 return -1; | |
1232 } | |
1233 old = table.start; | |
102
8c4482be0b4c
remove unreachable code
Carl Byington <carl@five-ten-sg.com>
parents:
101
diff
changeset
|
1234 (void)pst_build_desc_ptr(pf, table.offset, depth+1, table.u1, table.start, table2.start); |
43 | 1235 } |
1236 } | |
1237 if (buf) free(buf); | |
1238 DEBUG_RET(); | |
1239 return 0; | |
16 | 1240 } |
1241 | |
1242 | |
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
|
1243 /** 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
|
1244 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1245 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
|
1246 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
|
1247 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
|
1248 pst_id2_tree *id2_ptr = NULL; |
43 | 1249 pst_item *item = NULL; |
1250 pst_item_attach *attach = NULL; | |
46 | 1251 int32_t x; |
1252 DEBUG_ENT("pst_parse_item"); | |
43 | 1253 if (!d_ptr) { |
1254 DEBUG_WARN(("you cannot pass me a NULL! I don't want it!\n")); | |
1255 DEBUG_RET(); | |
1256 return NULL; | |
1257 } | |
1258 | |
1259 if (!d_ptr->desc) { | |
1260 DEBUG_WARN(("why is d_ptr->desc == NULL? I don't want to do anything else with this record\n")); | |
1261 DEBUG_RET(); | |
1262 return NULL; | |
1263 } | |
1264 | |
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
|
1265 if (d_ptr->assoc_tree) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1266 if (m_head) { |
203 | 1267 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
|
1268 m_head = NULL; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1269 } |
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
|
1270 id2_head = pst_build_id2(pf, d_ptr->assoc_tree); |
43 | 1271 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1272 pst_printID2ptr(id2_head); |
43 | 1273 |
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
|
1274 list = pst_parse_block(pf, d_ptr->desc->i_id, id2_head); |
43 | 1275 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
|
1276 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
|
1277 if (!m_head) pst_free_id2(id2_head); |
43 | 1278 DEBUG_RET(); |
1279 return NULL; | |
1280 } | |
1281 | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
1282 item = (pst_item*) pst_malloc(sizeof(pst_item)); |
43 | 1283 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
|
1284 item->pf = pf; |
43 | 1285 |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1286 if (pst_process(d_ptr->desc->i_id, list, item, NULL)) { |
46 | 1287 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
|
1288 pst_freeItem(item); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1289 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1290 if (!m_head) pst_free_id2(id2_head); |
43 | 1291 DEBUG_RET(); |
1292 return NULL; | |
1293 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1294 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1295 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1296 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
|
1297 // 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
|
1298 DEBUG_INFO(("DSN/MDN processing\n")); |
370
8700cc322c0c
Jeffrey Morlan - pst_getID2 must not recurse into children
Carl Byington <carl@five-ten-sg.com>
parents:
360
diff
changeset
|
1299 list = pst_parse_block(pf, id2_ptr->id->i_id, id2_ptr->child); |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1300 if (list) { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1301 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
|
1302 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
|
1303 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
|
1304 attach->next = item->attach; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1305 item->attach = attach; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1306 } |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1307 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
|
1308 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
|
1309 pst_freeItem(item); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1310 pst_free_list(list); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1311 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
|
1312 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1313 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1314 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1315 pst_free_list(list); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1316 } 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
|
1317 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
|
1318 // 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
|
1319 // DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1320 // 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
|
1321 } |
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
|
1322 } |
46 | 1323 |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1324 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
|
1325 DEBUG_INFO(("ATTACHMENT processing attachment\n")); |
370
8700cc322c0c
Jeffrey Morlan - pst_getID2 must not recurse into children
Carl Byington <carl@five-ten-sg.com>
parents:
360
diff
changeset
|
1326 list = pst_parse_block(pf, id2_ptr->id->i_id, id2_ptr->child); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1327 if (!list) { |
345
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1328 if (item->flags & PST_FLAG_HAS_ATTACHMENT) { |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1329 // Only report an error if we expected to see an attachment table and didn't. |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1330 DEBUG_WARN(("ERROR error processing main attachment record\n")); |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1331 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1332 if (!m_head) pst_free_id2(id2_head); |
43 | 1333 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
|
1334 return item; |
43 | 1335 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1336 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
|
1337 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
|
1338 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
|
1339 attach->next = item->attach; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1340 item->attach = attach; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1341 } |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
1342 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
|
1343 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
|
1344 pst_freeItem(item); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1345 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1346 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
|
1347 DEBUG_RET(); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1348 return NULL; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1349 } |
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 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1352 // 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
|
1353 // 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
|
1354 // 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
|
1355 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
|
1356 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
|
1357 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
|
1358 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
|
1359 // 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
|
1360 // 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
|
1361 // 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
|
1362 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
|
1363 if (!list) { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1364 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
|
1365 continue; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1366 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1367 if (list->count_objects > 1) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1368 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
|
1369 } |
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
|
1370 // 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
|
1371 // 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
|
1372 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
|
1373 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
|
1374 pst_free_list(list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1375 continue; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1376 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1377 pst_free_list(list); |
345
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1378 // As per 2.4.6.2 in the spec, the attachment data is stored as a child of the |
a8577226f7a9
fixes from AJ Shankar for attachment processing and body encodings that contain embedded null chars
Carl Byington <carl@five-ten-sg.com>
parents:
342
diff
changeset
|
1379 // attachment object, so we pass in id2_ptr as the head to search from. |
370
8700cc322c0c
Jeffrey Morlan - pst_getID2 must not recurse into children
Carl Byington <carl@five-ten-sg.com>
parents:
360
diff
changeset
|
1380 id2_ptr = pst_getID2(id2_ptr->child, attach->id2_val); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1381 if (id2_ptr) { |
260
156cf548c764
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
257
diff
changeset
|
1382 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
|
1383 // 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
|
1384 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
|
1385 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
|
1386 } else { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1387 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
|
1388 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1389 } else { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1390 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
|
1391 attach->id2_val = 0; // suppress this missing attachment |
43 | 1392 } |
1393 } | |
1394 } | |
1395 | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
1396 if (!m_head) pst_free_id2(id2_head); |
43 | 1397 DEBUG_RET(); |
1398 return item; | |
16 | 1399 } |
1400 | |
1401 | |
49 | 1402 static void freeall(pst_subblocks *subs, pst_block_offset_pointer *p1, |
1403 pst_block_offset_pointer *p2, | |
1404 pst_block_offset_pointer *p3, | |
1405 pst_block_offset_pointer *p4, | |
1406 pst_block_offset_pointer *p5, | |
1407 pst_block_offset_pointer *p6, | |
1408 pst_block_offset_pointer *p7); | |
1409 static void freeall(pst_subblocks *subs, pst_block_offset_pointer *p1, | |
1410 pst_block_offset_pointer *p2, | |
1411 pst_block_offset_pointer *p3, | |
1412 pst_block_offset_pointer *p4, | |
1413 pst_block_offset_pointer *p5, | |
1414 pst_block_offset_pointer *p6, | |
1415 pst_block_offset_pointer *p7) { | |
1416 size_t i; | |
1417 for (i=0; i<subs->subblock_count; i++) { | |
1418 if (subs->subs[i].buf) free(subs->subs[i].buf); | |
1419 } | |
1420 free(subs->subs); | |
43 | 1421 if (p1->needfree) free(p1->from); |
1422 if (p2->needfree) free(p2->from); | |
1423 if (p3->needfree) free(p3->from); | |
1424 if (p4->needfree) free(p4->from); | |
1425 if (p5->needfree) free(p5->from); | |
1426 if (p6->needfree) free(p6->from); | |
1427 if (p7->needfree) free(p7->from); | |
35 | 1428 } |
1429 | |
1430 | |
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
|
1431 /** 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
|
1432 * 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
|
1433 * |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1434 * @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
|
1435 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
1436 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
|
1437 pst_mapi_object *mo_head = NULL; |
52 | 1438 char *buf = NULL; |
1439 size_t read_size = 0; | |
49 | 1440 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
|
1441 pst_mapi_object *mo_ptr = NULL; |
43 | 1442 pst_block_offset_pointer block_offset1; |
1443 pst_block_offset_pointer block_offset2; | |
1444 pst_block_offset_pointer block_offset3; | |
1445 pst_block_offset_pointer block_offset4; | |
1446 pst_block_offset_pointer block_offset5; | |
1447 pst_block_offset_pointer block_offset6; | |
1448 pst_block_offset_pointer block_offset7; | |
46 | 1449 int32_t x; |
203 | 1450 int32_t num_mapi_objects; |
1451 int32_t count_mapi_objects; | |
1452 int32_t num_mapi_elements; | |
1453 int32_t count_mapi_elements; | |
47 | 1454 int block_type; |
43 | 1455 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
|
1456 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
|
1457 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
|
1458 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
|
1459 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
|
1460 char* ind2_ptr = NULL; |
359 | 1461 char* ind2_block_start = NULL; |
1462 size_t ind2_max_block_size = pf->do_read64 ? 0x1FF0 : 0x1FF4; | |
43 | 1463 pst_x_attrib_ll *mapptr; |
50 | 1464 pst_block_hdr block_hdr; |
1465 pst_table3_rec table3_rec; //for type 3 (0x0101) blocks | |
48 | 1466 |
43 | 1467 struct { |
1468 unsigned char seven_c; | |
1469 unsigned char item_count; | |
1470 uint16_t u1; | |
1471 uint16_t u2; | |
1472 uint16_t u3; | |
1473 uint16_t rec_size; | |
1474 uint32_t b_five_offset; | |
1475 uint32_t ind2_offset; | |
1476 uint16_t u7; | |
1477 uint16_t u8; | |
1478 } seven_c_blk; | |
48 | 1479 |
43 | 1480 struct _type_d_rec { |
1481 uint32_t id; | |
1482 uint32_t u1; | |
1483 } * type_d_rec; | |
1484 | |
48 | 1485 struct { |
1486 uint16_t type; | |
1487 uint16_t ref_type; | |
1488 uint32_t value; | |
1489 } table_rec; //for type 1 (0xBCEC) blocks | |
1490 | |
1491 struct { | |
1492 uint16_t ref_type; | |
1493 uint16_t type; | |
1494 uint16_t ind2_off; | |
1495 uint8_t size; | |
1496 uint8_t slot; | |
1497 } table2_rec; //for type 2 (0x7CEC) blocks | |
1498 | |
46 | 1499 DEBUG_ENT("pst_parse_block"); |
1500 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
|
1501 DEBUG_WARN(("Error reading block id %#"PRIx64"\n", block_id)); |
43 | 1502 if (buf) free (buf); |
1503 DEBUG_RET(); | |
1504 return NULL; | |
1505 } | |
1506 | |
1507 block_offset1.needfree = 0; | |
1508 block_offset2.needfree = 0; | |
1509 block_offset3.needfree = 0; | |
1510 block_offset4.needfree = 0; | |
1511 block_offset5.needfree = 0; | |
1512 block_offset6.needfree = 0; | |
1513 block_offset7.needfree = 0; | |
1514 | |
1515 memcpy(&block_hdr, buf, sizeof(block_hdr)); | |
1516 LE16_CPU(block_hdr.index_offset); | |
1517 LE16_CPU(block_hdr.type); | |
1518 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
|
1519 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#hx)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
43 | 1520 |
49 | 1521 if (block_hdr.index_offset == (uint16_t)0x0101) { //type 3 |
50 | 1522 size_t i; |
1523 char *b_ptr = buf + 8; | |
49 | 1524 subblocks.subblock_count = block_hdr.type; |
1525 subblocks.subs = malloc(sizeof(pst_subblock) * subblocks.subblock_count); | |
1526 for (i=0; i<subblocks.subblock_count; i++) { | |
1527 b_ptr += pst_decode_type3(pf, &table3_rec, b_ptr); | |
1528 subblocks.subs[i].buf = NULL; | |
1529 subblocks.subs[i].read_size = pst_ff_getIDblock_dec(pf, table3_rec.id, &subblocks.subs[i].buf); | |
1530 if (subblocks.subs[i].buf) { | |
1531 memcpy(&block_hdr, subblocks.subs[i].buf, sizeof(block_hdr)); | |
1532 LE16_CPU(block_hdr.index_offset); | |
1533 subblocks.subs[i].i_offset = block_hdr.index_offset; | |
1534 } | |
1535 else { | |
1536 subblocks.subs[i].read_size = 0; | |
1537 subblocks.subs[i].i_offset = 0; | |
1538 } | |
1539 } | |
1540 free(buf); | |
1541 memcpy(&block_hdr, subblocks.subs[0].buf, sizeof(block_hdr)); | |
1542 LE16_CPU(block_hdr.index_offset); | |
1543 LE16_CPU(block_hdr.type); | |
1544 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
|
1545 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#hx)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
49 | 1546 } |
1547 else { | |
1548 // setup the subblock descriptors, but we only have one block | |
50 | 1549 subblocks.subblock_count = (size_t)1; |
49 | 1550 subblocks.subs = malloc(sizeof(pst_subblock)); |
1551 subblocks.subs[0].buf = buf; | |
1552 subblocks.subs[0].read_size = read_size; | |
1553 subblocks.subs[0].i_offset = block_hdr.index_offset; | |
1554 } | |
43 | 1555 |
46 | 1556 if (block_hdr.type == (uint16_t)0xBCEC) { //type 1 |
43 | 1557 block_type = 1; |
1558 | |
49 | 1559 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
|
1560 DEBUG_WARN(("internal error (bc.b5 offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id)); |
49 | 1561 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1562 DEBUG_RET(); |
1563 return NULL; | |
1564 } | |
1565 memcpy(&table_rec, block_offset1.from, sizeof(table_rec)); | |
1566 LE16_CPU(table_rec.type); | |
1567 LE16_CPU(table_rec.ref_type); | |
1568 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
|
1569 DEBUG_INFO(("table_rec (type=%#hx, ref_type=%#hx, value=%#x)\n", table_rec.type, table_rec.ref_type, table_rec.value)); |
43 | 1570 |
75
987aa872294e
Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents:
73
diff
changeset
|
1571 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
|
1572 DEBUG_WARN(("Unknown second block constant - %#hx %#hx for id %#"PRIx64"\n", table_rec.type, table_rec.ref_type, block_id)); |
49 | 1573 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1574 DEBUG_RET(); |
1575 return NULL; | |
1576 } | |
1577 | |
49 | 1578 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
|
1579 DEBUG_WARN(("internal error (bc.b5.desc offset #x) in reading block id %#"PRIx64"\n", table_rec.value, block_id)); |
49 | 1580 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1581 DEBUG_RET(); |
1582 return NULL; | |
1583 } | |
1584 list_start = block_offset2.from; | |
1585 to_ptr = block_offset2.to; | |
203 | 1586 num_mapi_elements = (to_ptr - list_start)/sizeof(table_rec); |
1587 num_mapi_objects = 1; // only going to be one object in these blocks | |
43 | 1588 } |
46 | 1589 else if (block_hdr.type == (uint16_t)0x7CEC) { //type 2 |
43 | 1590 block_type = 2; |
1591 | |
49 | 1592 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
|
1593 DEBUG_WARN(("internal error (7c.7c offset %#x) in reading block id %#"PRIx64"\n", block_hdr.offset, block_id)); |
49 | 1594 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1595 DEBUG_RET(); |
1596 return NULL; | |
1597 } | |
1598 fr_ptr = block_offset3.from; //now got pointer to "7C block" | |
1599 memset(&seven_c_blk, 0, sizeof(seven_c_blk)); | |
1600 memcpy(&seven_c_blk, fr_ptr, sizeof(seven_c_blk)); | |
1601 LE16_CPU(seven_c_blk.u1); | |
1602 LE16_CPU(seven_c_blk.u2); | |
1603 LE16_CPU(seven_c_blk.u3); | |
1604 LE16_CPU(seven_c_blk.rec_size); | |
1605 LE32_CPU(seven_c_blk.b_five_offset); | |
1606 LE32_CPU(seven_c_blk.ind2_offset); | |
1607 LE16_CPU(seven_c_blk.u7); | |
1608 LE16_CPU(seven_c_blk.u8); | |
1609 | |
1610 list_start = fr_ptr + sizeof(seven_c_blk); // the list of item numbers start after this record | |
1611 | |
1612 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
|
1613 DEBUG_WARN(("Error. There isn't a 7C where I want to see 7C!\n")); |
49 | 1614 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1615 DEBUG_RET(); |
1616 return NULL; | |
1617 } | |
1618 | |
1619 rec_size = seven_c_blk.rec_size; | |
203 | 1620 num_mapi_elements = (int32_t)(unsigned)seven_c_blk.item_count; |
43 | 1621 |
49 | 1622 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
|
1623 DEBUG_WARN(("internal error (7c.b5 offset %#x) in reading block id %#"PRIx64"\n", seven_c_blk.b_five_offset, block_id)); |
49 | 1624 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1625 DEBUG_RET(); |
1626 return NULL; | |
1627 } | |
1628 memcpy(&table_rec, block_offset4.from, sizeof(table_rec)); | |
1629 LE16_CPU(table_rec.type); | |
1630 LE16_CPU(table_rec.ref_type); | |
1631 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
|
1632 DEBUG_INFO(("table_rec (type=%#hx, ref_type=%#hx, value=%#x)\n", table_rec.type, table_rec.ref_type, table_rec.value)); |
43 | 1633 |
46 | 1634 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
|
1635 DEBUG_WARN(("Unknown second block constant - %#hx for id %#"PRIx64"\n", table_rec.type, block_id)); |
49 | 1636 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1637 DEBUG_RET(); |
1638 return NULL; | |
1639 } | |
1640 | |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1641 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
|
1642 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
|
1643 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
|
1644 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
|
1645 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1646 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1647 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1648 |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1649 // 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
|
1650 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
|
1651 |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1652 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
|
1653 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
|
1654 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
|
1655 DEBUG_RET(); |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1656 return NULL; |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1657 } |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1658 ind2_ptr = block_offset6.from; |
359 | 1659 ind2_block_start = ind2_ptr; |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1660 ind2_end = block_offset6.to; |
43 | 1661 } |
231
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1662 else { |
fe64279df92b
patches from Chris White, Roberto Polli, Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
230
diff
changeset
|
1663 num_mapi_objects = 0; |
43 | 1664 } |
203 | 1665 DEBUG_INFO(("7cec block index2 pointer %#x and end %#x\n", ind2_ptr, ind2_end)); |
43 | 1666 } |
49 | 1667 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
|
1668 DEBUG_WARN(("ERROR: Unknown block constant - %#hx for id %#"PRIx64"\n", block_hdr.type, block_id)); |
49 | 1669 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1670 DEBUG_RET(); |
1671 return NULL; | |
1672 } | |
1673 | |
203 | 1674 DEBUG_INFO(("found %i mapi objects each with %i mapi elements\n", num_mapi_objects, num_mapi_elements)); |
1675 for (count_mapi_objects=0; count_mapi_objects<num_mapi_objects; count_mapi_objects++) { | |
1676 // 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
|
1677 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
|
1678 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
|
1679 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
|
1680 mo_head = mo_ptr; |
203 | 1681 // allocate the array of mapi elements |
1682 mo_ptr->elements = (pst_mapi_element**) pst_malloc(sizeof(pst_mapi_element)*num_mapi_elements); | |
1683 mo_ptr->count_elements = num_mapi_elements; | |
1684 mo_ptr->orig_count = num_mapi_elements; | |
1685 mo_ptr->count_objects = (int32_t)num_mapi_objects; // each record will have a record of the total number of records | |
1686 for (x=0; x<num_mapi_elements; x++) mo_ptr->elements[x] = NULL; | |
1687 | |
1688 DEBUG_INFO(("going to read %i mapi elements for mapi object %i\n", num_mapi_elements, count_mapi_objects)); | |
1689 | |
1690 fr_ptr = list_start; // initialize fr_ptr to the start of the list. | |
1691 x = 0; // x almost tracks count_mapi_elements, but see 'continue' statement below | |
1692 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
|
1693 char* value_pointer = NULL; // needed for block type 2 with values larger than 4 bytes |
46 | 1694 size_t value_size = 0; |
47 | 1695 if (block_type == 1) { |
43 | 1696 memcpy(&table_rec, fr_ptr, sizeof(table_rec)); |
1697 LE16_CPU(table_rec.type); | |
1698 LE16_CPU(table_rec.ref_type); | |
1699 //LE32_CPU(table_rec.value); // done later, some may be order invariant | |
1700 fr_ptr += sizeof(table_rec); | |
47 | 1701 } else if (block_type == 2) { |
43 | 1702 // we will copy the table2_rec values into a table_rec record so that we can keep the rest of the code |
1703 memcpy(&table2_rec, fr_ptr, sizeof(table2_rec)); | |
1704 LE16_CPU(table2_rec.ref_type); | |
1705 LE16_CPU(table2_rec.type); | |
1706 LE16_CPU(table2_rec.ind2_off); | |
203 | 1707 DEBUG_INFO(("reading element %i (type=%#x, ref_type=%#x, offset=%#x, size=%#x)\n", |
1708 x, table2_rec.type, table2_rec.ref_type, table2_rec.ind2_off, table2_rec.size)); | |
43 | 1709 |
1710 // table_rec and table2_rec are arranged differently, so assign the values across | |
1711 table_rec.type = table2_rec.type; | |
1712 table_rec.ref_type = table2_rec.ref_type; | |
1713 table_rec.value = 0; | |
50 | 1714 if ((ind2_end - ind2_ptr) >= (int)(table2_rec.ind2_off + table2_rec.size)) { |
46 | 1715 size_t n = table2_rec.size; |
1716 size_t m = sizeof(table_rec.value); | |
43 | 1717 if (n <= m) { |
1718 memcpy(&table_rec.value, ind2_ptr + table2_rec.ind2_off, n); | |
1719 } | |
1720 else { | |
1721 value_pointer = ind2_ptr + table2_rec.ind2_off; | |
1722 value_size = n; | |
1723 } | |
1724 //LE32_CPU(table_rec.value); // done later, some may be order invariant | |
1725 } | |
1726 else { | |
1727 DEBUG_WARN (("Trying to read outside buffer, buffer size %#x, offset %#x, data size %#x\n", | |
1728 read_size, ind2_end-ind2_ptr+table2_rec.ind2_off, table2_rec.size)); | |
1729 } | |
1730 fr_ptr += sizeof(table2_rec); | |
1731 } 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
|
1732 DEBUG_WARN(("Missing code for block_type %i\n", block_type)); |
49 | 1733 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
|
1734 pst_free_list(mo_head); |
43 | 1735 DEBUG_RET(); |
1736 return NULL; | |
1737 } | |
203 | 1738 DEBUG_INFO(("reading element %i (type=%#x, ref_type=%#x, value=%#x)\n", |
43 | 1739 x, table_rec.type, table_rec.ref_type, table_rec.value)); |
1740 | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1741 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
|
1742 mo_ptr->elements[x] = (pst_mapi_element*) pst_malloc(sizeof(pst_mapi_element)); |
43 | 1743 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1744 memset(mo_ptr->elements[x], 0, sizeof(pst_mapi_element)); //init it |
43 | 1745 |
1746 // check here to see if the id of the attribute is a mapped one | |
1747 mapptr = pf->x_head; | |
1748 while (mapptr && (mapptr->map < table_rec.type)) mapptr = mapptr->next; | |
1749 if (mapptr && (mapptr->map == table_rec.type)) { | |
1750 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
|
1751 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
|
1752 DEBUG_INFO(("Mapped attrib %#x to %#x\n", table_rec.type, mo_ptr->elements[x]->mapi_id)); |
43 | 1753 } 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
|
1754 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
|
1755 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
|
1756 mo_ptr->elements[x]->extra = mapptr->data; |
43 | 1757 } |
46 | 1758 else { |
94
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
1759 DEBUG_WARN(("Missing assertion failure\n")); |
46 | 1760 // nothing, should be assertion failure here |
1761 } | |
43 | 1762 } else { |
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]->mapi_id = table_rec.type; |
43 | 1764 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1765 mo_ptr->elements[x]->type = 0; // checked later before it is set |
43 | 1766 /* Reference Types |
1767 0x0002 - Signed 16bit value | |
1768 0x0003 - Signed 32bit value | |
1769 0x0004 - 4-byte floating point | |
1770 0x0005 - Floating point double | |
1771 0x0006 - Signed 64-bit int | |
1772 0x0007 - Application Time | |
1773 0x000A - 32-bit error value | |
1774 0x000B - Boolean (non-zero = true) | |
1775 0x000D - Embedded Object | |
1776 0x0014 - 8-byte signed integer (64-bit) | |
1777 0x001E - Null terminated String | |
1778 0x001F - Unicode string | |
1779 0x0040 - Systime - Filetime structure | |
1780 0x0048 - OLE Guid | |
1781 0x0102 - Binary data | |
1782 0x1003 - Array of 32bit values | |
1783 0x1014 - Array of 64bit values | |
1784 0x101E - Array of Strings | |
1785 0x1102 - Array of Binary data | |
1786 */ | |
1787 | |
46 | 1788 if (table_rec.ref_type == (uint16_t)0x0002 || |
1789 table_rec.ref_type == (uint16_t)0x0003 || | |
1790 table_rec.ref_type == (uint16_t)0x000b) { | |
43 | 1791 //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
|
1792 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
|
1793 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
|
1794 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
|
1795 memcpy(mo_ptr->elements[x]->data, &(table_rec.value), sizeof(int32_t)); |
51 | 1796 // are we missing an LE32_CPU() call here? table_rec.value is still |
1797 // in the original order. | |
43 | 1798 |
46 | 1799 } else if (table_rec.ref_type == (uint16_t)0x0005 || |
1800 table_rec.ref_type == (uint16_t)0x000d || | |
1801 table_rec.ref_type == (uint16_t)0x0014 || | |
1802 table_rec.ref_type == (uint16_t)0x001e || | |
1803 table_rec.ref_type == (uint16_t)0x001f || | |
1804 table_rec.ref_type == (uint16_t)0x0040 || | |
1805 table_rec.ref_type == (uint16_t)0x0048 || | |
1806 table_rec.ref_type == (uint16_t)0x0102 || | |
1807 table_rec.ref_type == (uint16_t)0x1003 || | |
1808 table_rec.ref_type == (uint16_t)0x1014 || | |
1809 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
|
1810 table_rec.ref_type == (uint16_t)0x101f || |
46 | 1811 table_rec.ref_type == (uint16_t)0x1102) { |
43 | 1812 //contains index reference to data |
1813 LE32_CPU(table_rec.value); | |
1814 if (value_pointer) { | |
1815 // in a type 2 block, with a value that is more than 4 bytes | |
1816 // 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
|
1817 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
|
1818 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
|
1819 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
|
1820 memcpy(mo_ptr->elements[x]->data, value_pointer, value_size); |
43 | 1821 } |
49 | 1822 else if (pst_getBlockOffsetPointer(pf, i2_head, &subblocks, table_rec.value, &block_offset7)) { |
46 | 1823 if ((table_rec.value & 0xf) == (uint32_t)0xf) { |
43 | 1824 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
|
1825 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
|
1826 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
|
1827 mo_ptr->elements[x]->type = table_rec.value; |
43 | 1828 } |
1829 else { | |
1830 if (table_rec.value) { | |
1831 DEBUG_WARN(("failed to get block offset for table_rec.value of %#x\n", table_rec.value)); | |
1832 } | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1833 mo_ptr->count_elements --; //we will be skipping a row |
43 | 1834 continue; |
1835 } | |
1836 } | |
1837 else { | |
50 | 1838 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
|
1839 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
|
1840 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
|
1841 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
|
1842 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
|
1843 mo_ptr->elements[x]->data[value_size] = '\0'; // it might be a string, null terminate it. |
43 | 1844 } |
46 | 1845 if (table_rec.ref_type == (uint16_t)0xd) { |
43 | 1846 // 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
|
1847 type_d_rec = (struct _type_d_rec*) mo_ptr->elements[x]->data; |
43 | 1848 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
|
1849 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
|
1850 if (!mo_ptr->elements[x]->size){ |
43 | 1851 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
|
1852 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
|
1853 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
|
1854 mo_ptr->elements[x]->data = NULL; |
43 | 1855 } |
1856 } | |
46 | 1857 if (table_rec.ref_type == (uint16_t)0x1f) { |
43 | 1858 // 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
|
1859 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
|
1860 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
|
1861 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
|
1862 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
|
1863 if (!utf8buf) utf8buf = pst_vballoc((size_t)1024); |
46 | 1864 |
43 | 1865 //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
|
1866 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
|
1867 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
|
1868 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
|
1869 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
|
1870 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
|
1871 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
|
1872 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
|
1873 } |
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
1874 else { |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1875 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
|
1876 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
|
1877 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
|
1878 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
|
1879 } |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1880 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
|
1881 DEBUG_HEXDUMPC(mo_ptr->elements[x]->data, mo_ptr->elements[x]->size, 0x10); |
43 | 1882 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
1883 if (mo_ptr->elements[x]->type == 0) mo_ptr->elements[x]->type = table_rec.ref_type; |
43 | 1884 } 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
|
1885 DEBUG_WARN(("ERROR Unknown ref_type %#hx\n", table_rec.ref_type)); |
43 | 1886 } |
1887 x++; | |
1888 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
1889 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 | 1890 ind2_ptr += rec_size; |
359 | 1891 // ind2 rows do not get split between blocks. See PST spec, 2.3.4.4 "Row Matrix". |
1892 if (ind2_ptr + rec_size > ind2_block_start + ind2_max_block_size) { | |
1893 ind2_block_start += ind2_max_block_size; | |
1894 DEBUG_INFO(("advancing ind2_ptr to next block. Was %#x, Now %#x\n", ind2_ptr, ind2_block_start)); | |
1895 ind2_ptr = ind2_block_start; | |
1896 } | |
43 | 1897 } |
49 | 1898 freeall(&subblocks, &block_offset1, &block_offset2, &block_offset3, &block_offset4, &block_offset5, &block_offset6, &block_offset7); |
43 | 1899 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
|
1900 return mo_head; |
16 | 1901 } |
1902 | |
51 | 1903 |
48 | 1904 // This version of free does NULL check first |
1905 #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
|
1906 #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
|
1907 #define SAFE_FREE_BIN(x) SAFE_FREE(x.data) |
16 | 1908 |
1909 // 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
|
1910 #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
|
1911 #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
|
1912 #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
|
1913 #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
|
1914 #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
|
1915 #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
|
1916 |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
1917 // 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
|
1918 #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
|
1919 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
|
1920 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
|
1921 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
|
1922 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1923 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1924 #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
|
1925 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
|
1926 (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
|
1927 (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
|
1928 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
|
1929 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1930 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
|
1931 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
|
1932 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
|
1933 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
|
1934 targ = NULL; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1935 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1936 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1937 |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1938 #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
|
1939 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
|
1940 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
|
1941 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
|
1942 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1943 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
|
1944 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
|
1945 targ = 1; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1946 } 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
|
1947 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
|
1948 targ = 0; \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1949 } \ |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1950 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1951 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1952 #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
|
1953 MALLOC_EMAIL(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1954 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
|
1955 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1956 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1957 #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
|
1958 MALLOC_CONTACT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1959 LIST_COPY_BOOL(label, targ) \ |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
1960 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1961 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1962 #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
|
1963 MALLOC_APPOINTMENT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1964 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
|
1965 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
1966 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1967 #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
|
1968 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
|
1969 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
|
1970 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
|
1971 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1972 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
|
1973 LE16_CPU(targ); \ |
152 | 1974 } |
1975 | |
1976 #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
|
1977 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
|
1978 DEBUG_INFO((label" - %i %#x\n", (int)targ, (int)targ)); \ |
152 | 1979 } |
1980 | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1981 #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
|
1982 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
|
1983 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
|
1984 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
|
1985 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
1986 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
|
1987 LE32_CPU(targ); \ |
152 | 1988 } |
1989 | |
1990 #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
|
1991 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
|
1992 DEBUG_INFO((label" - %i %#x\n", (int)targ, (int)targ)); \ |
152 | 1993 } |
1994 | |
1995 #define LIST_COPY_EMAIL_INT32(label, targ) { \ | |
1996 MALLOC_EMAIL(item); \ | |
1997 LIST_COPY_INT32(label, targ); \ | |
1998 } | |
1999 | |
2000 #define LIST_COPY_APPT_INT32(label, targ) { \ | |
2001 MALLOC_APPOINTMENT(item); \ | |
2002 LIST_COPY_INT32(label, targ); \ | |
2003 } | |
2004 | |
2005 #define LIST_COPY_FOLDER_INT32(label, targ) { \ | |
2006 MALLOC_FOLDER(item); \ | |
2007 LIST_COPY_INT32(label, targ); \ | |
2008 } | |
2009 | |
2010 #define LIST_COPY_STORE_INT32(label, targ) { \ | |
2011 MALLOC_MESSAGESTORE(item); \ | |
2012 LIST_COPY_INT32(label, targ); \ | |
2013 } | |
2014 | |
2015 #define LIST_COPY_ENUM(label, targ, delta, count, ...) { \ | |
2016 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
|
2017 LIST_COPY_INT32_N(targ); \ |
152 | 2018 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
|
2019 DEBUG_INFO((label" - %s [%i]\n", \ |
152 | 2020 (((int)targ < 0) || ((int)targ >= count)) \ |
2021 ? "**invalid" \ | |
2022 : tlabels[(int)targ], (int)targ)); \ | |
2023 } | |
2024 | |
2025 #define LIST_COPY_EMAIL_ENUM(label, targ, delta, count, ...) { \ | |
2026 MALLOC_EMAIL(item); \ | |
2027 LIST_COPY_ENUM(label, targ, delta, count, __VA_ARGS__); \ | |
2028 } | |
2029 | |
2030 #define LIST_COPY_APPT_ENUM(label, targ, delta, count, ...) { \ | |
2031 MALLOC_APPOINTMENT(item); \ | |
2032 LIST_COPY_ENUM(label, targ, delta, count, __VA_ARGS__); \ | |
2033 } | |
2034 | |
2035 #define LIST_COPY_ENUM16(label, targ, delta, count, ...) { \ | |
2036 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
|
2037 LIST_COPY_INT16_N(targ); \ |
152 | 2038 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
|
2039 DEBUG_INFO((label" - %s [%i]\n", \ |
152 | 2040 (((int)targ < 0) || ((int)targ >= count)) \ |
2041 ? "**invalid" \ | |
2042 : tlabels[(int)targ], (int)targ)); \ | |
2043 } | |
2044 | |
2045 #define LIST_COPY_CONTACT_ENUM16(label, targ, delta, count, ...) { \ | |
2046 MALLOC_CONTACT(item); \ | |
2047 LIST_COPY_ENUM16(label, targ, delta, count, __VA_ARGS__); \ | |
2048 } | |
2049 | |
2050 #define LIST_COPY_ENTRYID(label, targ) { \ | |
2051 LIST_COPY(targ, (pst_entryid*)); \ | |
2052 LE32_CPU(targ->u1); \ | |
2053 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
|
2054 DEBUG_INFO((label" u1=%#x, id=%#x\n", targ->u1, targ->id)); \ |
152 | 2055 } |
2056 | |
2057 #define LIST_COPY_EMAIL_ENTRYID(label, targ) { \ | |
2058 MALLOC_EMAIL(item); \ | |
2059 LIST_COPY_ENTRYID(label, targ); \ | |
2060 } | |
2061 | |
2062 #define LIST_COPY_STORE_ENTRYID(label, targ) { \ | |
2063 MALLOC_MESSAGESTORE(item); \ | |
2064 LIST_COPY_ENTRYID(label, targ); \ | |
2065 } | |
2066 | |
2067 | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2068 // 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
|
2069 // including the utf8 flag |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2070 #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
|
2071 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
|
2072 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
|
2073 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
|
2074 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2075 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2076 #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
|
2077 MALLOC_EMAIL(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2078 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
|
2079 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2080 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2081 #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
|
2082 MALLOC_CONTACT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2083 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
|
2084 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2085 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2086 #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
|
2087 MALLOC_APPOINTMENT(item); \ |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2088 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
|
2089 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2090 |
152 | 2091 #define LIST_COPY_JOURNAL_STR(label, targ) { \ |
2092 MALLOC_JOURNAL(item); \ | |
2093 LIST_COPY_STR(label, targ); \ | |
2094 } | |
2095 | |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2096 // 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
|
2097 #define LIST_COPY_TIME(label, targ) { \ |
341
c638905665bc
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
340
diff
changeset
|
2098 if ((list->elements[x]->type != 0x40) || \ |
342
5d0dc4db45b3
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
341
diff
changeset
|
2099 (list->elements[x]->size != sizeof(FILETIME))) { \ |
341
c638905665bc
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
340
diff
changeset
|
2100 DEBUG_WARN(("src not 0x40 or wrong length for filetime dst\n")); \ |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2101 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
|
2102 } \ |
340
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2103 else { \ |
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2104 targ = (FILETIME*) pst_realloc(targ, sizeof(FILETIME)); \ |
341
c638905665bc
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
340
diff
changeset
|
2105 memcpy(targ, list->elements[x]->data, sizeof(FILETIME)); \ |
340
0f3185217313
Daniel Gryniewicz found buffer overrun in LIST_COPY_TIME
Carl Byington <carl@five-ten-sg.com>
parents:
328
diff
changeset
|
2106 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
|
2107 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
|
2108 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
|
2109 } \ |
152 | 2110 } |
2111 | |
2112 #define LIST_COPY_EMAIL_TIME(label, targ) { \ | |
2113 MALLOC_EMAIL(item); \ | |
2114 LIST_COPY_TIME(label, targ); \ | |
2115 } | |
2116 | |
2117 #define LIST_COPY_CONTACT_TIME(label, targ) { \ | |
2118 MALLOC_CONTACT(item); \ | |
2119 LIST_COPY_TIME(label, targ); \ | |
2120 } | |
2121 | |
2122 #define LIST_COPY_APPT_TIME(label, targ) { \ | |
2123 MALLOC_APPOINTMENT(item); \ | |
2124 LIST_COPY_TIME(label, targ); \ | |
2125 } | |
2126 | |
2127 #define LIST_COPY_JOURNAL_TIME(label, targ) { \ | |
2128 MALLOC_JOURNAL(item); \ | |
2129 LIST_COPY_TIME(label, targ); \ | |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2130 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2131 |
41
183ae993b9ad
security fix for potential buffer overrun in lz decompress
carl
parents:
40
diff
changeset
|
2132 // 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
|
2133 #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
|
2134 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
|
2135 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
|
2136 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
|
2137 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
|
2138 } \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2139 else { \ |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2140 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
|
2141 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
|
2142 } \ |
16 | 2143 } |
2144 | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2145 #define LIST_COPY_EMAIL_BIN(label, targ) { \ |
152 | 2146 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
|
2147 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
|
2148 DEBUG_INFO((label"\n")); \ |
152 | 2149 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2150 #define LIST_COPY_APPT_BIN(label, targ) { \ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2151 MALLOC_APPOINTMENT(item); \ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2152 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
|
2153 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
|
2154 DEBUG_HEXDUMP(targ.data, targ.size); \ |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2155 } |
152 | 2156 |
195
320cfcba8058
add python module interface to the shared library for easy scripting.
Carl Byington <carl@five-ten-sg.com>
parents:
193
diff
changeset
|
2157 #define NULL_CHECK(x) { if (!x) { DEBUG_WARN(("NULL_CHECK: Null Found\n")); break;} } |
16 | 2158 |
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
|
2159 |
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
|
2160 /** |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2161 * 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
|
2162 * |
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
|
2163 * @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
|
2164 * @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
|
2165 * @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
|
2166 * 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
|
2167 * 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
|
2168 * 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
|
2169 * @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
|
2170 * 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
|
2171 * 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
|
2172 * |
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
|
2173 * @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
|
2174 */ |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
2175 static int pst_process(uint64_t block_id, pst_mapi_object *list, pst_item *item, pst_item_attach *attach) { |
46 | 2176 DEBUG_ENT("pst_process"); |
43 | 2177 if (!item) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2178 DEBUG_WARN(("item cannot be NULL.\n")); |
43 | 2179 DEBUG_RET(); |
2180 return -1; | |
2181 } | |
2182 | |
297
8b3a827b71f4
add alarm reminders to calendar events
Carl Byington <carl@five-ten-sg.com>
parents:
289
diff
changeset
|
2183 item->block_id = block_id; |
43 | 2184 while (list) { |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2185 int32_t x; |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
2186 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
|
2187 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
|
2188 int32_t t; |
267
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2189 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
|
2190 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
|
2191 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2192 switch (list->elements[x]->mapi_id) { |
43 | 2193 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
|
2194 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
|
2195 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
|
2196 // 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
|
2197 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
|
2198 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
|
2199 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
|
2200 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
|
2201 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
|
2202 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
|
2203 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
|
2204 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
|
2205 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
|
2206 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
|
2207 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
|
2208 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
|
2209 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
|
2210 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
|
2211 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
|
2212 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
|
2213 } |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2214 } |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2215 else { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2216 // 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
|
2217 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
|
2218 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
|
2219 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
|
2220 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
|
2221 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
|
2222 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
|
2223 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
|
2224 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
|
2225 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
|
2226 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
|
2227 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
|
2228 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
|
2229 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
|
2230 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
|
2231 *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
|
2232 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
|
2233 *pp = '"'; |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2234 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
|
2235 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
|
2236 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
|
2237 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
|
2238 } |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
2239 } |
116
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
2240 } |
ed2a260bbb98
improve handling of content-type charset values in mime parts
Carl Byington <carl@five-ten-sg.com>
parents:
114
diff
changeset
|
2241 } |
242
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2242 else { |
67b24d6a45d6
patch from Hugo DesRosiers to export categories and notes into vcards.
Carl Byington <carl@five-ten-sg.com>
parents:
233
diff
changeset
|
2243 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
|
2244 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
|
2245 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
|
2246 } |
170
0e1e048716e4
fix bug where we failed to pickup the last extended attribute.
Carl Byington <carl@five-ten-sg.com>
parents:
168
diff
changeset
|
2247 } |
49 | 2248 } |
43 | 2249 break; |
2250 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
|
2251 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
|
2252 // 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
|
2253 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
|
2254 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
|
2255 } 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
|
2256 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
|
2257 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
|
2258 } |
43 | 2259 break; |
2260 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
|
2261 DEBUG_INFO(("Extended Attributes Table - NOT PROCESSED\n")); |
43 | 2262 break; |
152 | 2263 case 0x0017: // PR_IMPORTANCE - How important the sender deems it to be |
2264 LIST_COPY_EMAIL_ENUM("Importance Level", item->email->importance, 0, 3, "Low", "Normal", "High"); | |
43 | 2265 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
|
2266 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
|
2267 if ((list->elements[x]->type == 0x1e) || |
168 | 2268 (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
|
2269 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
|
2270 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
|
2271 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
|
2272 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
|
2273 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
|
2274 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
|
2275 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
|
2276 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
|
2277 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
|
2278 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
|
2279 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
|
2280 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
|
2281 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
|
2282 item->type = PST_TYPE_APPOINTMENT; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
2283 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
|
2284 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
|
2285 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
|
2286 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
|
2287 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
|
2288 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
|
2289 else |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2290 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
|
2291 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
|
2292 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2293 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
|
2294 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
|
2295 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
|
2296 } |
43 | 2297 break; |
2298 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
|
2299 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
|
2300 // 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
|
2301 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
|
2302 } |
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2303 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
|
2304 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
|
2305 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
|
2306 } |
43 | 2307 break; |
2308 case 0x0026: // PR_PRIORITY | |
152 | 2309 LIST_COPY_EMAIL_ENUM("Priority", item->email->priority, 1, 3, "NonUrgent", "Normal", "Urgent"); |
43 | 2310 break; |
51 | 2311 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
|
2312 LIST_COPY_EMAIL_BOOL("Read Receipt", item->email->read_receipt); |
43 | 2313 break; |
2314 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
|
2315 LIST_COPY_BOOL("Reassignment Prohibited (Private)", item->private_member); |
43 | 2316 break; |
152 | 2317 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
|
2318 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
|
2319 "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
|
2320 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
|
2321 case 0x0032: // PR_REPORT_TIME |
152 | 2322 LIST_COPY_EMAIL_TIME("Report time", item->email->report_time); |
2323 break; | |
2324 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
|
2325 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
|
2326 "None", "Personal", "Private", "Company Confidential"); |
43 | 2327 break; |
2328 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
|
2329 { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2330 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
|
2331 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
|
2332 off = 2; |
43 | 2333 } |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
2334 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
|
2335 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
|
2336 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
|
2337 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
|
2338 list->elements[x]->data -= off; |
43 | 2339 } |
2340 break; | |
2341 case 0x0039: // PR_CLIENT_SUBMIT_TIME Date Email Sent/Created | |
152 | 2342 LIST_COPY_EMAIL_TIME("Date sent", item->email->sent_date); |
43 | 2343 break; |
2344 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
|
2345 LIST_COPY_EMAIL_STR("Sent on behalf of address 1", item->email->outlook_sender); |
43 | 2346 break; |
2347 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
|
2348 DEBUG_INFO(("Recipient Structure 1 -- NOT PROCESSED\n")); |
43 | 2349 break; |
2350 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
|
2351 LIST_COPY_EMAIL_STR("Received By Name 1", item->email->outlook_received_name1); |
43 | 2352 break; |
2353 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
|
2354 DEBUG_INFO(("Sent on behalf of Structure 1 -- NOT PROCESSED\n")); |
43 | 2355 break; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2356 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
|
2357 LIST_COPY_EMAIL_STR("Sent on behalf of", item->email->outlook_sender_name); |
43 | 2358 break; |
2359 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
|
2360 DEBUG_INFO(("Received on behalf of Structure -- NOT PROCESSED\n")); |
43 | 2361 break; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2362 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
|
2363 LIST_COPY_EMAIL_STR("Received on behalf of", item->email->outlook_recipient_name); |
43 | 2364 break; |
2365 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
|
2366 DEBUG_INFO(("Reply-To Structure -- NOT PROCESSED\n")); |
43 | 2367 break; |
2368 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
|
2369 LIST_COPY_EMAIL_STR("Reply-To", item->email->reply_to); |
43 | 2370 break; |
2371 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
|
2372 LIST_COPY_EMAIL_STR("Recipient's Address 1", item->email->outlook_recipient); |
43 | 2373 break; |
2374 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
|
2375 LIST_COPY_EMAIL_STR("Recipient's Address 2", item->email->outlook_recipient2); |
43 | 2376 break; |
2377 case 0x0057: // PR_MESSAGE_TO_ME | |
2378 // 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
|
2379 LIST_COPY_EMAIL_BOOL("My address in TO field", item->email->message_to_me); |
43 | 2380 break; |
2381 case 0x0058: // PR_MESSAGE_CC_ME | |
2382 // 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
|
2383 LIST_COPY_EMAIL_BOOL("My address in CC field", item->email->message_cc_me); |
43 | 2384 break; |
51 | 2385 case 0x0059: // PR_MESSAGE_RECIP_ME |
43 | 2386 // 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
|
2387 LIST_COPY_EMAIL_BOOL("Message addressed to me", item->email->message_recip_me); |
43 | 2388 break; |
2389 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
|
2390 LIST_COPY_BOOL("Response requested", item->response_requested); |
43 | 2391 break; |
2392 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
|
2393 LIST_COPY_EMAIL_STR("Sent on behalf of address type", item->email->sender_access); |
43 | 2394 break; |
2395 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
|
2396 LIST_COPY_EMAIL_STR("Sent on behalf of address", item->email->sender_address); |
43 | 2397 break; |
2398 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
|
2399 LIST_COPY_EMAIL_STR("Processed Subject (Conversation Topic)", item->email->processed_subject); |
43 | 2400 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
|
2401 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
|
2402 LIST_COPY_EMAIL_BIN("Conversation Index", item->email->conversation_index); |
43 | 2403 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
|
2404 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
|
2405 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
|
2406 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
|
2407 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
|
2408 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
|
2409 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
|
2410 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
|
2411 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
|
2412 break; |
43 | 2413 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
|
2414 LIST_COPY_EMAIL_STR("Received by Address type", item->email->recip_access); |
43 | 2415 break; |
2416 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
|
2417 LIST_COPY_EMAIL_STR("Received by Address", item->email->recip_address); |
43 | 2418 break; |
2419 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
|
2420 LIST_COPY_EMAIL_STR("Received on behalf of Address type", item->email->recip2_access); |
43 | 2421 break; |
2422 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
|
2423 LIST_COPY_EMAIL_STR("Received on behalf of Address", item->email->recip2_address); |
43 | 2424 break; |
2425 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
|
2426 LIST_COPY_EMAIL_STR("Internet Header", item->email->header); |
43 | 2427 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
|
2428 case 0x0C04: // PR_NDR_REASON_CODE |
152 | 2429 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
|
2430 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
|
2431 case 0x0C05: // PR_NDR_DIAG_CODE |
152 | 2432 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
|
2433 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
|
2434 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
|
2435 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
|
2436 break; |
43 | 2437 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
|
2438 LIST_COPY_EMAIL_BOOL("Reply Requested", item->email->reply_requested); |
43 | 2439 break; |
2440 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
|
2441 DEBUG_INFO(("Sender Structure 2 -- NOT PROCESSED\n")); |
43 | 2442 break; |
2443 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
|
2444 LIST_COPY_EMAIL_STR("Name of Sender Structure 2", item->email->outlook_sender_name2); |
43 | 2445 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
|
2446 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
|
2447 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
|
2448 break; |
43 | 2449 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
|
2450 LIST_COPY_EMAIL_STR("Name of Sender Address 2 (Sender search key)", item->email->outlook_sender2); |
43 | 2451 break; |
2452 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
|
2453 LIST_COPY_EMAIL_STR("Sender Address type", item->email->sender2_access); |
43 | 2454 break; |
2455 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
|
2456 LIST_COPY_EMAIL_STR("Sender Address", item->email->sender2_address); |
43 | 2457 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
|
2458 case 0x0C20: // PR_NDR_STATUS_CODE |
152 | 2459 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
|
2460 break; |
43 | 2461 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
|
2462 LIST_COPY_EMAIL_BOOL("Delete after submit", item->email->delete_after_submit); |
43 | 2463 break; |
59
7d5c637aaafb
General cleanup and code fixes.
Carl Byington <carl@five-ten-sg.com>
parents:
58
diff
changeset
|
2464 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
|
2465 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
|
2466 break; |
43 | 2467 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
|
2468 LIST_COPY_EMAIL_STR("Display CC Addresses", item->email->cc_address); |
43 | 2469 break; |
2470 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
|
2471 LIST_COPY_EMAIL_STR("Display Sent-To Address", item->email->sentto_address); |
43 | 2472 break; |
2473 case 0x0E06: // PR_MESSAGE_DELIVERY_TIME Date 3 - Email Arrival Date | |
152 | 2474 LIST_COPY_EMAIL_TIME("Date 3 (Delivery Time)", item->email->arrival_date); |
43 | 2475 break; |
2476 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
|
2477 LIST_COPY_EMAIL_INT32("Message Flags", item->flags); |
43 | 2478 break; |
2479 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
|
2480 LIST_COPY_INT32("Message Size", item->message_size); |
43 | 2481 break; |
2482 case 0x0E0A: // PR_SENTMAIL_ENTRYID | |
2483 // folder that this message is sent to after submission | |
152 | 2484 LIST_COPY_EMAIL_ENTRYID("Sentmail EntryID", item->email->sentmail_folder); |
43 | 2485 break; |
308
97c53c6868ab
add -m option to readpst to create Outlook .msg files
Carl Byington <carl@five-ten-sg.com>
parents:
242
diff
changeset
|
2486 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
|
2487 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
|
2488 break; |
43 | 2489 case 0x0E1F: // PR_RTF_IN_SYNC |
2490 // True means that the rtf version is same as text body | |
2491 // False means rtf version is more up-to-date than text body | |
2492 // 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
|
2493 // 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
|
2494 LIST_COPY_EMAIL_BOOL("Compressed RTF in Sync", item->email->rtf_in_sync); |
43 | 2495 break; |
2496 case 0x0E20: // PR_ATTACH_SIZE binary Attachment data in record | |
2497 NULL_CHECK(attach); | |
152 | 2498 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
|
2499 // 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
|
2500 // or id codes from 0x3701 or 0x67f2 |
43 | 2501 break; |
2502 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
|
2503 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
|
2504 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
|
2505 DEBUG_HEXDUMP(item->record_key.data, item->record_key.size); |
43 | 2506 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
|
2507 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
|
2508 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
|
2509 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
|
2510 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
|
2511 LIST_COPY_EMAIL_STR("Report Text", item->email->report_text); |
43 | 2512 break; |
2513 case 0x1006: // PR_RTF_SYNC_BODY_CRC | |
152 | 2514 LIST_COPY_EMAIL_INT32("RTF Sync Body CRC", item->email->rtf_body_crc); |
43 | 2515 break; |
2516 case 0x1007: // PR_RTF_SYNC_BODY_COUNT | |
2517 // a count of the *significant* charcters in the rtf body. Doesn't count | |
2518 // whitespace and other ignorable characters | |
152 | 2519 LIST_COPY_EMAIL_INT32("RTF Sync Body character count", item->email->rtf_body_char_count); |
43 | 2520 break; |
2521 case 0x1008: // PR_RTF_SYNC_BODY_TAG | |
2522 // the first couple of lines of RTF body so that after modification, then beginning can | |
2523 // 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
|
2524 LIST_COPY_EMAIL_STR("RTF Sync body tag", item->email->rtf_body_tag); |
43 | 2525 break; |
152 | 2526 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
|
2527 LIST_COPY_EMAIL_BIN("RTF Compressed body", item->email->rtf_compressed); |
43 | 2528 break; |
2529 case 0x1010: // PR_RTF_SYNC_PREFIX_COUNT | |
2530 // a count of the ignored characters before the first significant character | |
152 | 2531 LIST_COPY_EMAIL_INT32("RTF whitespace prefix count", item->email->rtf_ws_prefix_count); |
43 | 2532 break; |
2533 case 0x1011: // PR_RTF_SYNC_TRAILING_COUNT | |
2534 // a count of the ignored characters after the last significant character | |
152 | 2535 LIST_COPY_EMAIL_INT32("RTF whitespace tailing count", item->email->rtf_ws_trailing_count); |
43 | 2536 break; |
2537 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
|
2538 LIST_COPY_EMAIL_STR("HTML body", item->email->htmlbody); |
43 | 2539 break; |
2540 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
|
2541 LIST_COPY_EMAIL_STR("Message ID", item->email->messageid); |
43 | 2542 break; |
2543 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
|
2544 LIST_COPY_EMAIL_STR("In-Reply-To", item->email->in_reply_to); |
43 | 2545 break; |
141
fd4297884319
improve decoding of multipart/report and message/rfc822 mime types
Carl Byington <carl@five-ten-sg.com>
parents:
130
diff
changeset
|
2546 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
|
2547 LIST_COPY_EMAIL_STR("Return Path", item->email->return_path_address); |
43 | 2548 break; |
2549 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
|
2550 LIST_COPY_STR("Display Name", item->file_as); |
43 | 2551 break; |
2552 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
|
2553 LIST_COPY_CONTACT_STR("Address Type", item->contact->address1_transport); |
43 | 2554 break; |
2555 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
|
2556 LIST_COPY_CONTACT_STR("Contact email Address", item->contact->address1); |
43 | 2557 break; |
2558 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
|
2559 LIST_COPY_STR("Comment", item->comment); |
43 | 2560 break; |
2561 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
|
2562 LIST_COPY_TIME("Date 4 (Item Creation Date)", item->create_date); |
43 | 2563 break; |
2564 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
|
2565 LIST_COPY_TIME("Date 5 (Modify Date)", item->modify_date); |
43 | 2566 break; |
2567 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
|
2568 LIST_COPY_EMAIL_STR("Record Search 2", item->email->outlook_search_key); |
43 | 2569 break; |
2570 case 0x35DF: // PR_VALID_FOLDER_MASK | |
152 | 2571 LIST_COPY_STORE_INT32("Valid Folder Mask", item->message_store->valid_mask); |
43 | 2572 break; |
2573 case 0x35E0: // PR_IPM_SUBTREE_ENTRYID Top of Personal Folder Record | |
152 | 2574 LIST_COPY_STORE_ENTRYID("Top of Personal Folder Record", item->message_store->top_of_personal_folder); |
43 | 2575 break; |
51 | 2576 case 0x35E2: // PR_IPM_OUTBOX_ENTRYID |
152 | 2577 LIST_COPY_STORE_ENTRYID("Default Outbox Folder record", item->message_store->default_outbox_folder); |
51 | 2578 break; |
2579 case 0x35E3: // PR_IPM_WASTEBASKET_ENTRYID | |
152 | 2580 LIST_COPY_STORE_ENTRYID("Deleted Items Folder record", item->message_store->deleted_items_folder); |
43 | 2581 break; |
51 | 2582 case 0x35E4: // PR_IPM_SENTMAIL_ENTRYID |
152 | 2583 LIST_COPY_STORE_ENTRYID("Sent Items Folder record", item->message_store->sent_items_folder); |
51 | 2584 break; |
2585 case 0x35E5: // PR_VIEWS_ENTRYID | |
152 | 2586 LIST_COPY_STORE_ENTRYID("User Views Folder record", item->message_store->user_views_folder); |
51 | 2587 break; |
2588 case 0x35E6: // PR_COMMON_VIEWS_ENTRYID | |
152 | 2589 LIST_COPY_STORE_ENTRYID("Common View Folder record", item->message_store->common_view_folder); |
51 | 2590 break; |
2591 case 0x35E7: // PR_FINDER_ENTRYID | |
152 | 2592 LIST_COPY_STORE_ENTRYID("Search Root Folder record", item->message_store->search_root_folder); |
43 | 2593 break; |
2594 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
|
2595 LIST_COPY_FOLDER_INT32("Folder Email Count", item->folder->item_count); |
43 | 2596 break; |
2597 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
|
2598 LIST_COPY_FOLDER_INT32("Unread Email Count", item->folder->unseen_item_count); |
43 | 2599 break; |
2600 case 0x360A: // PR_SUBFOLDERS Has children | |
2601 MALLOC_FOLDER(item); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2602 LIST_COPY_BOOL("Has Subfolders", item->folder->subfolder); |
43 | 2603 break; |
2604 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
|
2605 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
|
2606 if (pst_strincmp("IPF.Note", item->ascii_type, 8) == 0) |
43 | 2607 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
|
2608 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
|
2609 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
|
2610 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
|
2611 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
|
2612 else if (pst_strincmp("IPF.Contact", item->ascii_type, 11) == 0) |
43 | 2613 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
|
2614 else if (pst_strincmp("IPF.Journal", item->ascii_type, 11) == 0) |
43 | 2615 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
|
2616 else if (pst_strincmp("IPF.Appointment", item->ascii_type, 15) == 0) |
43 | 2617 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
|
2618 else if (pst_strincmp("IPF.StickyNote", item->ascii_type, 14) == 0) |
43 | 2619 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
|
2620 else if (pst_strincmp("IPF.Task", item->ascii_type, 8) == 0) |
43 | 2621 item->type = PST_TYPE_TASK; |
2622 else | |
2623 item->type = PST_TYPE_OTHER; | |
2624 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
2625 DEBUG_INFO(("Container class %s [%"PRIi32"]\n", item->ascii_type, item->type)); |
43 | 2626 break; |
2627 case 0x3617: // PR_ASSOC_CONTENT_COUNT | |
2628 // associated content are items that are attached to this folder | |
2629 // 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
|
2630 LIST_COPY_FOLDER_INT32("Associated Content count", item->folder->assoc_count); |
43 | 2631 break; |
2632 case 0x3701: // PR_ATTACH_DATA_OBJ binary data of attachment | |
203 | 2633 DEBUG_INFO(("Binary Data [Size %i]\n", list->elements[x]->size)); |
43 | 2634 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
|
2635 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
|
2636 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
|
2637 DEBUG_INFO(("Seen a Reference. The data hasn't been loaded yet. [%#"PRIx64"]\n", attach->id2_val)); |
43 | 2638 } else { |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2639 LIST_COPY_BIN(attach->data); |
43 | 2640 } |
2641 break; | |
2642 case 0x3704: // PR_ATTACH_FILENAME Attachment filename (8.3) | |
2643 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2644 LIST_COPY_STR("Attachment Filename", attach->filename1); |
43 | 2645 break; |
2646 case 0x3705: // PR_ATTACH_METHOD | |
2647 NULL_CHECK(attach); | |
152 | 2648 LIST_COPY_ENUM("Attachment method", attach->method, 0, 7, |
2649 "No Attachment", | |
2650 "Attach By Value", | |
2651 "Attach By Reference", | |
2652 "Attach by Reference Resolve", | |
2653 "Attach by Reference Only", | |
2654 "Embedded Message", | |
2655 "OLE"); | |
43 | 2656 break; |
2657 case 0x3707: // PR_ATTACH_LONG_FILENAME Attachment filename (long?) | |
2658 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2659 LIST_COPY_STR("Attachment Filename long", attach->filename2); |
43 | 2660 break; |
2661 case 0x370B: // PR_RENDERING_POSITION | |
2662 // position in characters that the attachment appears in the plain text body | |
2663 NULL_CHECK(attach); | |
152 | 2664 LIST_COPY_INT32("Attachment Position", attach->position); |
43 | 2665 break; |
2666 case 0x370E: // PR_ATTACH_MIME_TAG Mime type of encoding | |
2667 NULL_CHECK(attach); | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
2668 LIST_COPY_STR("Attachment mime encoding", attach->mimetype); |
43 | 2669 break; |
2670 case 0x3710: // PR_ATTACH_MIME_SEQUENCE | |
2671 // sequence number for mime parts. Includes body | |
2672 NULL_CHECK(attach); | |
152 | 2673 LIST_COPY_INT32("Attachment Mime Sequence", attach->sequence); |
43 | 2674 break; |
352
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2675 case 0x3712: // PR_ATTACH_CONTENT_ID |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2676 // content identification header (Content-ID) |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2677 NULL_CHECK(attach); |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2678 LIST_COPY_STR("Content ID", attach->content_id); |
09dd5299d91c
Added Content-ID header support
Igor Stroh <igor.stroh@rulim.de>
parents:
345
diff
changeset
|
2679 break; |
43 | 2680 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
|
2681 LIST_COPY_CONTACT_STR("Contact's Account name", item->contact->account_name); |
43 | 2682 break; |
2683 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
|
2684 DEBUG_INFO(("Contact Alternate Recipient - NOT PROCESSED\n")); |
43 | 2685 break; |
2686 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
|
2687 LIST_COPY_CONTACT_STR("Callback telephone number", item->contact->callback_phone); |
43 | 2688 break; |
2689 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
|
2690 LIST_COPY_EMAIL_BOOL("Message Conversion Prohibited", item->email->conversion_prohibited); |
43 | 2691 break; |
2692 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
|
2693 LIST_COPY_CONTACT_STR("Contacts Suffix", item->contact->suffix); |
43 | 2694 break; |
2695 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
|
2696 LIST_COPY_CONTACT_STR("Contacts First Name", item->contact->first_name); |
43 | 2697 break; |
2698 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
|
2699 LIST_COPY_CONTACT_STR("Contacts Government ID Number", item->contact->gov_id); |
43 | 2700 break; |
2701 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
|
2702 LIST_COPY_CONTACT_STR("Business Telephone Number", item->contact->business_phone); |
43 | 2703 break; |
2704 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
|
2705 LIST_COPY_CONTACT_STR("Home Telephone Number", item->contact->home_phone); |
43 | 2706 break; |
2707 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
|
2708 LIST_COPY_CONTACT_STR("Contacts Initials", item->contact->initials); |
43 | 2709 break; |
2710 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
|
2711 LIST_COPY_CONTACT_STR("Keyword", item->contact->keyword); |
43 | 2712 break; |
2713 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
|
2714 LIST_COPY_CONTACT_STR("Contact's Language", item->contact->language); |
43 | 2715 break; |
2716 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
|
2717 LIST_COPY_CONTACT_STR("Contact's Location", item->contact->location); |
43 | 2718 break; |
2719 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
|
2720 LIST_COPY_CONTACT_BOOL("Mail Permission", item->contact->mail_permission); |
43 | 2721 break; |
2722 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
|
2723 LIST_COPY_CONTACT_STR("MHS Common Name", item->contact->common_name); |
43 | 2724 break; |
2725 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
|
2726 LIST_COPY_CONTACT_STR("Organizational ID #", item->contact->org_id); |
43 | 2727 break; |
2728 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
|
2729 LIST_COPY_CONTACT_STR("Contacts Surname", item->contact->surname); |
43 | 2730 break; |
2731 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
|
2732 DEBUG_INFO(("Original Entry ID - NOT PROCESSED\n")); |
43 | 2733 break; |
2734 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
|
2735 DEBUG_INFO(("Original Display Name - NOT PROCESSED\n")); |
43 | 2736 break; |
2737 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
|
2738 DEBUG_INFO(("Original Search Key - NOT PROCESSED\n")); |
43 | 2739 break; |
2740 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
|
2741 LIST_COPY_CONTACT_STR("Default Postal Address", item->contact->def_postal_address); |
43 | 2742 break; |
2743 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
|
2744 LIST_COPY_CONTACT_STR("Company Name", item->contact->company_name); |
43 | 2745 break; |
2746 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
|
2747 LIST_COPY_CONTACT_STR("Job Title", item->contact->job_title); |
43 | 2748 break; |
2749 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
|
2750 LIST_COPY_CONTACT_STR("Department Name", item->contact->department); |
43 | 2751 break; |
2752 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
|
2753 LIST_COPY_CONTACT_STR("Office Location", item->contact->office_loc); |
43 | 2754 break; |
2755 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
|
2756 LIST_COPY_CONTACT_STR("Primary Telephone", item->contact->primary_phone); |
43 | 2757 break; |
2758 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
|
2759 LIST_COPY_CONTACT_STR("Business Phone Number 2", item->contact->business_phone2); |
43 | 2760 break; |
2761 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
|
2762 LIST_COPY_CONTACT_STR("Mobile Phone Number", item->contact->mobile_phone); |
43 | 2763 break; |
2764 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
|
2765 LIST_COPY_CONTACT_STR("Radio Phone Number", item->contact->radio_phone); |
43 | 2766 break; |
2767 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
|
2768 LIST_COPY_CONTACT_STR("Car Phone Number", item->contact->car_phone); |
43 | 2769 break; |
2770 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
|
2771 LIST_COPY_CONTACT_STR("Other Phone Number", item->contact->other_phone); |
43 | 2772 break; |
2773 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
|
2774 LIST_COPY_CONTACT_STR("Transmittable Display Name", item->contact->transmittable_display_name); |
43 | 2775 break; |
2776 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
|
2777 LIST_COPY_CONTACT_STR("Pager Phone Number", item->contact->pager_phone); |
43 | 2778 break; |
2779 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
|
2780 DEBUG_INFO(("User Certificate - NOT PROCESSED\n")); |
43 | 2781 break; |
2782 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
|
2783 LIST_COPY_CONTACT_STR("Primary Fax Number", item->contact->primary_fax); |
43 | 2784 break; |
2785 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
|
2786 LIST_COPY_CONTACT_STR("Business Fax Number", item->contact->business_fax); |
43 | 2787 break; |
2788 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
|
2789 LIST_COPY_CONTACT_STR("Home Fax Number", item->contact->home_fax); |
43 | 2790 break; |
2791 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
|
2792 LIST_COPY_CONTACT_STR("Business Address Country", item->contact->business_country); |
43 | 2793 break; |
2794 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
|
2795 LIST_COPY_CONTACT_STR("Business Address City", item->contact->business_city); |
43 | 2796 break; |
2797 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
|
2798 LIST_COPY_CONTACT_STR("Business Address State", item->contact->business_state); |
43 | 2799 break; |
2800 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
|
2801 LIST_COPY_CONTACT_STR("Business Address Street", item->contact->business_street); |
43 | 2802 break; |
2803 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
|
2804 LIST_COPY_CONTACT_STR("Business Postal Code", item->contact->business_postal_code); |
43 | 2805 break; |
2806 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
|
2807 LIST_COPY_CONTACT_STR("Business PO Box", item->contact->business_po_box); |
43 | 2808 break; |
2809 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
|
2810 LIST_COPY_CONTACT_STR("Telex Number", item->contact->telex); |
43 | 2811 break; |
2812 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
|
2813 LIST_COPY_CONTACT_STR("ISDN Number", item->contact->isdn_phone); |
43 | 2814 break; |
2815 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
|
2816 LIST_COPY_CONTACT_STR("Assistant Phone Number", item->contact->assistant_phone); |
43 | 2817 break; |
2818 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
|
2819 LIST_COPY_CONTACT_STR("Home Phone 2", item->contact->home_phone2); |
43 | 2820 break; |
2821 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
|
2822 LIST_COPY_CONTACT_STR("Assistant's Name", item->contact->assistant_name); |
43 | 2823 break; |
2824 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
|
2825 LIST_COPY_CONTACT_BOOL("Can receive Rich Text", item->contact->rich_text); |
43 | 2826 break; |
2827 case 0x3A41: // PR_WEDDING_ANNIVERSARY | |
152 | 2828 LIST_COPY_CONTACT_TIME("Wedding Anniversary", item->contact->wedding_anniversary); |
43 | 2829 break; |
2830 case 0x3A42: // PR_BIRTHDAY | |
152 | 2831 LIST_COPY_CONTACT_TIME("Birthday", item->contact->birthday); |
43 | 2832 break; |
2833 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
|
2834 LIST_COPY_CONTACT_STR("Hobbies", item->contact->hobbies); |
43 | 2835 break; |
2836 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
|
2837 LIST_COPY_CONTACT_STR("Middle Name", item->contact->middle_name); |
43 | 2838 break; |
2839 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
|
2840 LIST_COPY_CONTACT_STR("Display Name Prefix (Title)", item->contact->display_name_prefix); |
43 | 2841 break; |
2842 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
|
2843 LIST_COPY_CONTACT_STR("Profession", item->contact->profession); |
43 | 2844 break; |
2845 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
|
2846 LIST_COPY_CONTACT_STR("Preferred By Name", item->contact->pref_name); |
43 | 2847 break; |
2848 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
|
2849 LIST_COPY_CONTACT_STR("Spouse's Name", item->contact->spouse_name); |
43 | 2850 break; |
2851 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
|
2852 LIST_COPY_CONTACT_STR("Computer Network Name", item->contact->computer_name); |
43 | 2853 break; |
2854 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
|
2855 LIST_COPY_CONTACT_STR("Customer ID", item->contact->customer_id); |
43 | 2856 break; |
2857 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
|
2858 LIST_COPY_CONTACT_STR("TTY/TDD Phone", item->contact->ttytdd_phone); |
43 | 2859 break; |
2860 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
|
2861 LIST_COPY_CONTACT_STR("Ftp Site", item->contact->ftp_site); |
43 | 2862 break; |
2863 case 0x3A4D: // PR_GENDER | |
152 | 2864 LIST_COPY_CONTACT_ENUM16("Gender", item->contact->gender, 0, 3, "Unspecified", "Female", "Male"); |
43 | 2865 break; |
2866 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
|
2867 LIST_COPY_CONTACT_STR("Manager's Name", item->contact->manager_name); |
43 | 2868 break; |
2869 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
|
2870 LIST_COPY_CONTACT_STR("Nickname", item->contact->nickname); |
43 | 2871 break; |
2872 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
|
2873 LIST_COPY_CONTACT_STR("Personal Home Page", item->contact->personal_homepage); |
43 | 2874 break; |
2875 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
|
2876 LIST_COPY_CONTACT_STR("Business Home Page", item->contact->business_homepage); |
43 | 2877 break; |
2878 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
|
2879 LIST_COPY_CONTACT_STR("Company Main Phone", item->contact->company_main_phone); |
43 | 2880 break; |
2881 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
|
2882 DEBUG_INFO(("Children's Names - NOT PROCESSED\n")); |
43 | 2883 break; |
2884 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
|
2885 LIST_COPY_CONTACT_STR("Home Address City", item->contact->home_city); |
43 | 2886 break; |
2887 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
|
2888 LIST_COPY_CONTACT_STR("Home Address Country", item->contact->home_country); |
43 | 2889 break; |
2890 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
|
2891 LIST_COPY_CONTACT_STR("Home Address Postal Code", item->contact->home_postal_code); |
43 | 2892 break; |
2893 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
|
2894 LIST_COPY_CONTACT_STR("Home Address State or Province", item->contact->home_state); |
43 | 2895 break; |
2896 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
|
2897 LIST_COPY_CONTACT_STR("Home Address Street", item->contact->home_street); |
43 | 2898 break; |
2899 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
|
2900 LIST_COPY_CONTACT_STR("Home Address Post Office Box", item->contact->home_po_box); |
43 | 2901 break; |
2902 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
|
2903 LIST_COPY_CONTACT_STR("Other Address City", item->contact->other_city); |
43 | 2904 break; |
2905 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
|
2906 LIST_COPY_CONTACT_STR("Other Address Country", item->contact->other_country); |
43 | 2907 break; |
2908 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
|
2909 LIST_COPY_CONTACT_STR("Other Address Postal Code", item->contact->other_postal_code); |
43 | 2910 break; |
2911 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
|
2912 LIST_COPY_CONTACT_STR("Other Address State", item->contact->other_state); |
43 | 2913 break; |
2914 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
|
2915 LIST_COPY_CONTACT_STR("Other Address Street", item->contact->other_street); |
43 | 2916 break; |
2917 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
|
2918 LIST_COPY_CONTACT_STR("Other Address Post Office box", item->contact->other_po_box); |
43 | 2919 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
|
2920 case 0x3FDE: // PR_INTERNET_CPID |
152 | 2921 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
|
2922 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
|
2923 case 0x3FFD: // PR_MESSAGE_CODEPAGE |
152 | 2924 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
|
2925 break; |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
2926 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
|
2927 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
|
2928 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
|
2929 DEBUG_HEXDUMP(item->predecessor_change.data, item->predecessor_change.size); |
43 | 2930 break; |
267
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2931 case 0x67F2: // ID2 value of the attachment |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2932 NULL_CHECK(attach); |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2933 LIST_COPY_INT32("Attachment ID2 value", ut); |
3fa737c05322
adding more debug code
Carl Byington <carl@five-ten-sg.com>
parents:
266
diff
changeset
|
2934 attach->id2_val = ut; |
43 | 2935 break; |
2936 case 0x67FF: // Extra Property Identifier (Password CheckSum) | |
152 | 2937 LIST_COPY_STORE_INT32("Password checksum", item->message_store->pwd_chksum); |
43 | 2938 break; |
2939 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
|
2940 LIST_COPY_EMAIL_BIN("Secure HTML Body", item->email->encrypted_htmlbody); |
43 | 2941 break; |
2942 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
|
2943 LIST_COPY_EMAIL_BIN("Secure Text Body", item->email->encrypted_body); |
43 | 2944 break; |
2945 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
|
2946 LIST_COPY_STORE_ENTRYID("Top of folders RecID", item->message_store->top_of_folder); |
43 | 2947 break; |
2948 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
|
2949 LIST_COPY_CONTACT_STR("Contact Fullname", item->contact->fullname); |
43 | 2950 break; |
2951 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
|
2952 LIST_COPY_CONTACT_STR("Home Address", item->contact->home_address); |
43 | 2953 break; |
2954 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
|
2955 LIST_COPY_CONTACT_STR("Business Address", item->contact->business_address); |
43 | 2956 break; |
2957 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
|
2958 LIST_COPY_CONTACT_STR("Other Address", item->contact->other_address); |
43 | 2959 break; |
51 | 2960 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
|
2961 LIST_COPY_CONTACT_STR("Work address street", item->contact->work_address_street); |
51 | 2962 break; |
2963 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
|
2964 LIST_COPY_CONTACT_STR("Work address city", item->contact->work_address_city); |
51 | 2965 break; |
2966 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
|
2967 LIST_COPY_CONTACT_STR("Work address state", item->contact->work_address_state); |
51 | 2968 break; |
2969 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
|
2970 LIST_COPY_CONTACT_STR("Work address postalcode", item->contact->work_address_postalcode); |
51 | 2971 break; |
2972 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
|
2973 LIST_COPY_CONTACT_STR("Work address country", item->contact->work_address_country); |
51 | 2974 break; |
2975 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
|
2976 LIST_COPY_CONTACT_STR("Work address postofficebox", item->contact->work_address_postofficebox); |
51 | 2977 break; |
43 | 2978 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
|
2979 LIST_COPY_CONTACT_STR("Email Address 1 Transport", item->contact->address1_transport); |
43 | 2980 break; |
2981 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
|
2982 LIST_COPY_CONTACT_STR("Email Address 1 Address", item->contact->address1); |
43 | 2983 break; |
2984 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
|
2985 LIST_COPY_CONTACT_STR("Email Address 1 Description", item->contact->address1_desc); |
43 | 2986 break; |
2987 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
|
2988 LIST_COPY_CONTACT_STR("Email Address 1 Record", item->contact->address1a); |
43 | 2989 break; |
2990 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
|
2991 LIST_COPY_CONTACT_STR("Email Address 2 Transport", item->contact->address2_transport); |
43 | 2992 break; |
2993 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
|
2994 LIST_COPY_CONTACT_STR("Email Address 2 Address", item->contact->address2); |
43 | 2995 break; |
2996 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
|
2997 LIST_COPY_CONTACT_STR("Email Address 2 Description", item->contact->address2_desc); |
43 | 2998 break; |
2999 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
|
3000 LIST_COPY_CONTACT_STR("Email Address 2 Record", item->contact->address2a); |
43 | 3001 break; |
3002 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
|
3003 LIST_COPY_CONTACT_STR("Email Address 3 Transport", item->contact->address3_transport); |
43 | 3004 break; |
3005 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
|
3006 LIST_COPY_CONTACT_STR("Email Address 3 Address", item->contact->address3); |
43 | 3007 break; |
3008 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
|
3009 LIST_COPY_CONTACT_STR("Email Address 3 Description", item->contact->address3_desc); |
43 | 3010 break; |
3011 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
|
3012 LIST_COPY_CONTACT_STR("Email Address 3 Record", item->contact->address3a); |
43 | 3013 break; |
3014 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
|
3015 LIST_COPY_CONTACT_STR("Internet Free/Busy", item->contact->free_busy_address); |
43 | 3016 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3017 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
|
3018 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
|
3019 "Free", "Tentative", "Busy", "Out Of Office"); |
43 | 3020 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3021 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
|
3022 LIST_COPY_APPT_STR("Appointment Location", item->appointment->location); |
43 | 3023 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3024 case 0x820d: // PR_OUTLOOK_EVENT_START_DATE |
152 | 3025 LIST_COPY_APPT_TIME("Appointment Date Start", item->appointment->start); |
50 | 3026 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3027 case 0x820e: // PR_OUTLOOK_EVENT_START_END |
152 | 3028 LIST_COPY_APPT_TIME("Appointment Date End", item->appointment->end); |
50 | 3029 break; |
43 | 3030 case 0x8214: // Label for an appointment |
152 | 3031 LIST_COPY_APPT_ENUM("Label for appointment", item->appointment->label, 0, 11, |
3032 "None", | |
3033 "Important", | |
3034 "Business", | |
3035 "Personal", | |
3036 "Vacation", | |
3037 "Must Attend", | |
3038 "Travel Required", | |
3039 "Needs Preparation", | |
3040 "Birthday", | |
3041 "Anniversary", | |
3042 "Phone Call"); | |
43 | 3043 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3044 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
|
3045 LIST_COPY_APPT_BOOL("All day flag", item->appointment->all_day); |
43 | 3046 break; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3047 case 0x8216: // PR_OUTLOOK_EVENT_RECURRENCE_DATA |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3048 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
|
3049 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3050 case 0x8223: // PR_OUTLOOK_EVENT_IS_RECURRING |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3051 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
|
3052 break; |
50 | 3053 case 0x8231: // Recurrence type |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3054 LIST_COPY_APPT_ENUM("Appointment recurrence type ", item->appointment->recurrence_type, 0, 5, |
152 | 3055 "None", |
3056 "Daily", | |
3057 "Weekly", | |
3058 "Monthly", | |
3059 "Yearly"); | |
50 | 3060 break; |
3061 case 0x8232: // Recurrence description | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3062 LIST_COPY_APPT_STR("Appointment recurrence description", item->appointment->recurrence_description); |
50 | 3063 break; |
43 | 3064 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
|
3065 LIST_COPY_APPT_STR("TimeZone of times", item->appointment->timezonestring); |
43 | 3066 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3067 case 0x8235: // PR_OUTLOOK_EVENT_RECURRENCE_START |
152 | 3068 LIST_COPY_APPT_TIME("Recurrence Start Date", item->appointment->recurrence_start); |
50 | 3069 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3070 case 0x8236: // PR_OUTLOOK_EVENT_RECURRENCE_END |
152 | 3071 LIST_COPY_APPT_TIME("Recurrence End Date", item->appointment->recurrence_end); |
50 | 3072 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3073 case 0x8501: // PR_OUTLOOK_COMMON_REMINDER_MINUTES_BEFORE |
152 | 3074 LIST_COPY_APPT_INT32("Alarm minutes", item->appointment->alarm_minutes); |
50 | 3075 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3076 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
|
3077 LIST_COPY_APPT_BOOL("Reminder alarm", item->appointment->alarm); |
50 | 3078 break; |
51 | 3079 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
|
3080 DEBUG_INFO(("Common Start Date - %s\n", pst_fileTimeToAscii((FILETIME*)list->elements[x]->data, time_buffer))); |
43 | 3081 break; |
51 | 3082 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
|
3083 DEBUG_INFO(("Common End Date - %s\n", pst_fileTimeToAscii((FILETIME*)list->elements[x]->data, time_buffer))); |
43 | 3084 break; |
50 | 3085 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
|
3086 LIST_COPY_APPT_STR("Appointment reminder sound filename", item->appointment->alarm_filename); |
50 | 3087 break; |
43 | 3088 case 0x8530: // Followup |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3089 LIST_COPY_CONTACT_STR("Followup String", item->contact->followup); |
43 | 3090 break; |
3091 case 0x8534: // Mileage | |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3092 LIST_COPY_CONTACT_STR("Mileage", item->contact->mileage); |
43 | 3093 break; |
3094 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
|
3095 LIST_COPY_CONTACT_STR("Billing Information", item->contact->billing_information); |
43 | 3096 break; |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
3097 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
|
3098 LIST_COPY_STR("Outlook Version", item->outlook_version); |
43 | 3099 break; |
3100 case 0x8560: // Appointment Reminder Time | |
152 | 3101 LIST_COPY_APPT_TIME("Appointment Reminder Time", item->appointment->reminder); |
43 | 3102 break; |
3103 case 0x8700: // Journal Type | |
152 | 3104 LIST_COPY_JOURNAL_STR("Journal Entry Type", item->journal->type); |
43 | 3105 break; |
3106 case 0x8706: // Journal Start date/time | |
152 | 3107 LIST_COPY_JOURNAL_TIME("Start Timestamp", item->journal->start); |
43 | 3108 break; |
3109 case 0x8708: // Journal End date/time | |
152 | 3110 LIST_COPY_JOURNAL_TIME("End Timestamp", item->journal->end); |
3111 break; | |
3112 case 0x8712: // Journal Type Description | |
3113 LIST_COPY_JOURNAL_STR("Journal description", item->journal->description); | |
43 | 3114 break; |
3115 default: | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3116 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
|
3117 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
|
3118 *(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
|
3119 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3120 } 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
|
3121 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
|
3122 *(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
|
3123 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3124 } 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
|
3125 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
|
3126 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3127 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
|
3128 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3129 } 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
|
3130 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
|
3131 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3132 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
|
3133 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3134 } 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
|
3135 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
|
3136 *(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
|
3137 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
|
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)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
|
3140 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
|
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)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
|
3145 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
|
3146 *(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
|
3147 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3148 } 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
|
3149 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
|
3150 (*((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
|
3151 *((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
|
3152 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3153 } else if (list->elements[x]->type == (uint32_t)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
|
3154 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
|
3155 list->elements[x]->size)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3156 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3157 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3158 } 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
|
3159 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
|
3160 *(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
|
3161 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
|
3162 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3163 } 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
|
3164 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
|
3165 list->elements[x]->data)); |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3166 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3167 } 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
|
3168 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
|
3169 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
|
3170 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
|
3171 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3172 } 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
|
3173 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
|
3174 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
|
3175 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3176 } 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
|
3177 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
|
3178 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
|
3179 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
|
3180 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3181 } 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
|
3182 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
|
3183 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
|
3184 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
|
3185 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3186 } 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
|
3187 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
|
3188 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
|
3189 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
|
3190 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3191 } 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
|
3192 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
|
3193 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
|
3194 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
|
3195 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3196 } 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
|
3197 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
|
3198 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
|
3199 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
|
3200 |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3201 } 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
|
3202 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
|
3203 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
|
3204 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
|
3205 |
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3206 } 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
|
3207 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
|
3208 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
|
3209 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
51 | 3210 |
43 | 3211 } 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
|
3212 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
|
3213 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
|
3214 DEBUG_HEXDUMP(list->elements[x]->data, list->elements[x]->size); |
43 | 3215 } |
51 | 3216 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3217 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
|
3218 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
|
3219 list->elements[x]->data = NULL; |
43 | 3220 } |
3221 } | |
3222 } | |
3223 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
|
3224 if (attach) attach = attach->next; |
43 | 3225 } |
3226 DEBUG_RET(); | |
3227 return 0; | |
16 | 3228 } |
3229 | |
3230 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3231 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
|
3232 pst_mapi_object *l; |
46 | 3233 DEBUG_ENT("pst_free_list"); |
43 | 3234 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
|
3235 if (list->elements) { |
43 | 3236 int32_t x; |
3237 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
|
3238 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
|
3239 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
|
3240 free(list->elements[x]); |
43 | 3241 } |
3242 } | |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
3243 free(list->elements); |
43 | 3244 } |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3245 l = list->next; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3246 free (list); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3247 list = l; |
43 | 3248 } |
3249 DEBUG_RET(); | |
16 | 3250 } |
3251 | |
3252 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3253 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
|
3254 pst_id2_tree *t; |
46 | 3255 DEBUG_ENT("pst_free_id2"); |
43 | 3256 while (head) { |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3257 pst_free_id2(head->child); |
43 | 3258 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
|
3259 free(head); |
43 | 3260 head = t; |
3261 } | |
3262 DEBUG_RET(); | |
16 | 3263 } |
3264 | |
3265 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3266 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
|
3267 pst_desc_tree *t; |
46 | 3268 DEBUG_ENT("pst_free_desc"); |
43 | 3269 while (head) { |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3270 pst_free_desc(head->child); |
43 | 3271 t = head->next; |
287
0f0ccd29b0d7
use recursion to free a tree structure
Carl Byington <carl@five-ten-sg.com>
parents:
277
diff
changeset
|
3272 free(head); |
43 | 3273 head = t; |
3274 } | |
3275 DEBUG_RET(); | |
16 | 3276 } |
3277 | |
3278 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3279 static void pst_free_xattrib(pst_x_attrib_ll *x) { |
43 | 3280 pst_x_attrib_ll *t; |
46 | 3281 DEBUG_ENT("pst_free_xattrib"); |
43 | 3282 while (x) { |
3283 if (x->data) free(x->data); | |
3284 t = x->next; | |
3285 free(x); | |
3286 x = t; | |
3287 } | |
3288 DEBUG_RET(); | |
16 | 3289 } |
3290 | |
3291 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3292 static pst_id2_tree * pst_build_id2(pst_file *pf, pst_index_ll* list) { |
43 | 3293 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
|
3294 pst_id2_tree *head = NULL, *tail = NULL; |
46 | 3295 uint16_t x = 0; |
3296 char *b_ptr = NULL; | |
43 | 3297 char *buf = NULL; |
3298 pst_id2_assoc id2_rec; | |
3299 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
|
3300 pst_id2_tree *i2_ptr = NULL; |
46 | 3301 DEBUG_ENT("pst_build_id2"); |
43 | 3302 |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3303 if (pst_read_block_size(pf, list->offset, list->size, list->inflated_size, &buf) < list->size) { |
43 | 3304 //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
|
3305 DEBUG_WARN(("block read error occured. offset = %#"PRIx64", size = %#"PRIx64"\n", list->offset, list->size)); |
43 | 3306 if (buf) free(buf); |
3307 DEBUG_RET(); | |
3308 return NULL; | |
3309 } | |
3310 DEBUG_HEXDUMPC(buf, list->size, 16); | |
3311 | |
3312 memcpy(&block_head, buf, sizeof(block_head)); | |
3313 LE16_CPU(block_head.type); | |
3314 LE16_CPU(block_head.count); | |
3315 | |
46 | 3316 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
|
3317 DEBUG_WARN(("Unknown constant [%#hx] at start of id2 values [offset %#"PRIx64"].\n", block_head.type, list->offset)); |
43 | 3318 if (buf) free(buf); |
3319 DEBUG_RET(); | |
3320 return NULL; | |
3321 } | |
3322 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3323 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
|
3324 list->i_id, block_head.count, list->offset)); |
43 | 3325 x = 0; |
46 | 3326 b_ptr = buf + ((pf->do_read64) ? 0x08 : 0x04); |
43 | 3327 while (x < block_head.count) { |
46 | 3328 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
|
3329 DEBUG_INFO(("id2 = %#x, id = %#"PRIx64", child id = %#"PRIx64"\n", id2_rec.id2, id2_rec.id, id2_rec.child_id)); |
46 | 3330 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
|
3331 DEBUG_WARN(("%#"PRIx64" - Not Found\n", id2_rec.id)); |
43 | 3332 } else { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3333 DEBUG_INFO(("%#"PRIx64" - Offset %#"PRIx64", u1 %#"PRIx64", Size %"PRIi64"(%#"PRIx64")\n", |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3334 i_ptr->i_id, i_ptr->offset, i_ptr->u1, i_ptr->size, i_ptr->inflated_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
|
3335 // 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
|
3336 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
|
3337 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
|
3338 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
|
3339 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
|
3340 i2_ptr->next = NULL; |
43 | 3341 if (!head) head = i2_ptr; |
3342 if (tail) tail->next = i2_ptr; | |
3343 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
|
3344 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
|
3345 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
|
3346 DEBUG_WARN(("child id [%#"PRIx64"] not found\n", id2_rec.child_id)); |
43 | 3347 } |
3348 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
|
3349 i2_ptr->child = pst_build_id2(pf, i_ptr); |
43 | 3350 } |
3351 } | |
3352 } | |
3353 x++; | |
3354 } | |
3355 if (buf) free (buf); | |
3356 DEBUG_RET(); | |
3357 return head; | |
16 | 3358 } |
3359 | |
3360 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3361 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
|
3362 while (attach) { |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3363 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
|
3364 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
|
3365 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
|
3366 SAFE_FREE_STR(attach->mimetype); |
354
843705c25b45
code cleanup; content-id in brackets
Carl Byington <carl@five-ten-sg.com>
parents:
352
diff
changeset
|
3367 SAFE_FREE_STR(attach->content_id); |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
3368 SAFE_FREE_BIN(attach->data); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3369 pst_free_id2(attach->id2_head); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3370 t = attach->next; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3371 free(attach); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3372 attach = t; |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3373 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3374 } |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3375 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3376 |
46 | 3377 void pst_freeItem(pst_item *item) { |
43 | 3378 pst_item_extra_field *et; |
3379 | |
46 | 3380 DEBUG_ENT("pst_freeItem"); |
43 | 3381 if (item) { |
3382 if (item->email) { | |
3383 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
|
3384 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
|
3385 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
|
3386 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
|
3387 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
|
3388 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
|
3389 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
|
3390 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
|
3391 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
|
3392 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
|
3393 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
|
3394 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
|
3395 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
|
3396 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
|
3397 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
|
3398 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
|
3399 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
|
3400 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
|
3401 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
|
3402 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
|
3403 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
|
3404 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
|
3405 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
|
3406 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
|
3407 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
|
3408 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
|
3409 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
|
3410 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
|
3411 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
|
3412 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
|
3413 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
|
3414 SAFE_FREE_STR(item->email->sender2_address); |
43 | 3415 SAFE_FREE(item->email->sent_date); |
3416 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
|
3417 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
|
3418 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
|
3419 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
|
3420 SAFE_FREE_STR(item->email->supplementary_info); |
328 | 3421 SAFE_FREE_STR(item->email->outlook_received_name1); |
3422 SAFE_FREE_STR(item->email->outlook_sender_name2); | |
3423 SAFE_FREE_STR(item->email->outlook_normalized_subject); | |
3424 SAFE_FREE_STR(item->email->outlook_search_key); | |
43 | 3425 free(item->email); |
3426 } | |
3427 if (item->folder) { | |
3428 free(item->folder); | |
3429 } | |
3430 if (item->message_store) { | |
51 | 3431 SAFE_FREE(item->message_store->top_of_personal_folder); |
3432 SAFE_FREE(item->message_store->default_outbox_folder); | |
43 | 3433 SAFE_FREE(item->message_store->deleted_items_folder); |
51 | 3434 SAFE_FREE(item->message_store->sent_items_folder); |
3435 SAFE_FREE(item->message_store->user_views_folder); | |
3436 SAFE_FREE(item->message_store->common_view_folder); | |
43 | 3437 SAFE_FREE(item->message_store->search_root_folder); |
3438 SAFE_FREE(item->message_store->top_of_folder); | |
3439 free(item->message_store); | |
3440 } | |
3441 if (item->contact) { | |
151
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->account_name); |
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->address1); |
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->address1a); |
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->address1_desc); |
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->address1_transport); |
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->address2); |
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->address2a); |
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->address2_desc); |
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->address2_transport); |
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->address3); |
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->address3a); |
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->address3_desc); |
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->address3_transport); |
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->assistant_name); |
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->assistant_phone); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
3457 SAFE_FREE_STR(item->contact->billing_information); |
43 | 3458 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
|
3459 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
|
3460 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
|
3461 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
|
3462 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
|
3463 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
|
3464 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
|
3465 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
|
3466 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
|
3467 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
|
3468 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
|
3469 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
|
3470 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
|
3471 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
|
3472 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
|
3473 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
|
3474 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
|
3475 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
|
3476 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
|
3477 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
|
3478 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
|
3479 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
|
3480 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
|
3481 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
|
3482 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
|
3483 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
|
3484 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
|
3485 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
|
3486 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
|
3487 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
|
3488 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
|
3489 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
|
3490 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
|
3491 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
|
3492 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
|
3493 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
|
3494 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
|
3495 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
|
3496 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
|
3497 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
|
3498 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
|
3499 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
|
3500 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
|
3501 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
|
3502 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
|
3503 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
|
3504 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
|
3505 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
|
3506 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
|
3507 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
|
3508 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
|
3509 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
|
3510 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
|
3511 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
|
3512 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
|
3513 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
|
3514 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
|
3515 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
|
3516 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
|
3517 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
|
3518 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
|
3519 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
|
3520 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
|
3521 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
|
3522 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
|
3523 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
|
3524 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
|
3525 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
|
3526 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
|
3527 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
|
3528 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
|
3529 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
|
3530 SAFE_FREE_STR(item->contact->ttytdd_phone); |
43 | 3531 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
|
3532 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
|
3533 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
|
3534 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
|
3535 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
|
3536 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
|
3537 SAFE_FREE_STR(item->contact->work_address_postofficebox); |
43 | 3538 free(item->contact); |
3539 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3540 |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3541 pst_free_attach(item->attach); |
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3542 |
43 | 3543 while (item->extra_fields) { |
3544 SAFE_FREE(item->extra_fields->field_name); | |
3545 SAFE_FREE(item->extra_fields->value); | |
3546 et = item->extra_fields->next; | |
3547 free(item->extra_fields); | |
3548 item->extra_fields = et; | |
3549 } | |
3550 if (item->journal) { | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3551 SAFE_FREE(item->journal->start); |
43 | 3552 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
|
3553 SAFE_FREE_STR(item->journal->type); |
43 | 3554 free(item->journal); |
3555 } | |
3556 if (item->appointment) { | |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3557 SAFE_FREE(item->appointment->start); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3558 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
|
3559 SAFE_FREE_STR(item->appointment->location); |
43 | 3560 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
|
3561 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
|
3562 SAFE_FREE_STR(item->appointment->timezonestring); |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3563 SAFE_FREE_STR(item->appointment->recurrence_description); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
3564 SAFE_FREE_BIN(item->appointment->recurrence_data); |
50 | 3565 SAFE_FREE(item->appointment->recurrence_start); |
3566 SAFE_FREE(item->appointment->recurrence_end); | |
43 | 3567 free(item->appointment); |
3568 } | |
3569 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
|
3570 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
|
3571 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
|
3572 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
|
3573 SAFE_FREE_STR(item->comment); |
43 | 3574 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
|
3575 SAFE_FREE_STR(item->file_as); |
43 | 3576 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
|
3577 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
|
3578 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
|
3579 SAFE_FREE_BIN(item->predecessor_change); |
43 | 3580 free(item); |
3581 } | |
3582 DEBUG_RET(); | |
16 | 3583 } |
3584 | |
3585 | |
35 | 3586 /** |
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
|
3587 * 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
|
3588 * 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
|
3589 * 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
|
3590 * 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
|
3591 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3592 static int pst_getBlockOffsetPointer(pst_file *pf, pst_id2_tree *i2_head, pst_subblocks *subblocks, uint32_t offset, pst_block_offset_pointer *p) { |
46 | 3593 size_t size; |
43 | 3594 pst_block_offset block_offset; |
46 | 3595 DEBUG_ENT("pst_getBlockOffsetPointer"); |
43 | 3596 if (p->needfree) free(p->from); |
49 | 3597 p->from = NULL; |
3598 p->to = NULL; | |
43 | 3599 p->needfree = 0; |
3600 if (!offset) { | |
49 | 3601 // no data |
43 | 3602 p->from = p->to = NULL; |
3603 } | |
46 | 3604 else if ((offset & 0xf) == (uint32_t)0xf) { |
49 | 3605 // external index reference |
43 | 3606 DEBUG_WARN(("Found id2 %#x value. Will follow it\n", offset)); |
46 | 3607 size = pst_ff_getID2block(pf, offset, i2_head, &(p->from)); |
43 | 3608 if (size) { |
3609 p->to = p->from + size; | |
3610 p->needfree = 1; | |
3611 } | |
3612 else { | |
50 | 3613 if (p->from) { |
3614 DEBUG_WARN(("size zero but non-null pointer\n")); | |
3615 free(p->from); | |
3616 } | |
43 | 3617 p->from = p->to = NULL; |
3618 } | |
3619 } | |
3620 else { | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3621 DEBUG_WARN(("Found internal %#x value.\n", offset)); |
49 | 3622 // internal index reference |
3623 size_t subindex = offset >> 16; | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3624 if (pf->do_read64 == 2) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3625 // Shift over 3 more bits for new flags. |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3626 subindex = subindex >> 3; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3627 } |
49 | 3628 size_t suboffset = offset & 0xffff; |
3629 if (subindex < subblocks->subblock_count) { | |
3630 if (pst_getBlockOffset(subblocks->subs[subindex].buf, | |
3631 subblocks->subs[subindex].read_size, | |
3632 subblocks->subs[subindex].i_offset, | |
3633 suboffset, &block_offset)) { | |
3634 p->from = subblocks->subs[subindex].buf + block_offset.from; | |
3635 p->to = subblocks->subs[subindex].buf + block_offset.to; | |
3636 } | |
3637 } | |
43 | 3638 } |
3639 DEBUG_RET(); | |
3640 return (p->from) ? 0 : 1; | |
35 | 3641 } |
3642 | |
3643 | |
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
|
3644 /** */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3645 static int pst_getBlockOffset(char *buf, size_t read_size, uint32_t i_offset, uint32_t offset, pst_block_offset *p) { |
46 | 3646 uint32_t low = offset & 0xf; |
3647 uint32_t of1 = offset >> 4; | |
3648 DEBUG_ENT("pst_getBlockOffset"); | |
43 | 3649 if (!p || !buf || !i_offset || low || (i_offset+2+of1+sizeof(*p) > read_size)) { |
3650 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)); | |
3651 DEBUG_RET(); | |
49 | 3652 return 0; |
43 | 3653 } |
3654 memcpy(&(p->from), &(buf[(i_offset+2)+of1]), sizeof(p->from)); | |
3655 memcpy(&(p->to), &(buf[(i_offset+2)+of1+sizeof(p->from)]), sizeof(p->to)); | |
3656 LE16_CPU(p->from); | |
3657 LE16_CPU(p->to); | |
3658 DEBUG_WARN(("get block offset finds from=%i(%#x), to=%i(%#x)\n", p->from, p->from, p->to, p->to)); | |
359 | 3659 if (p->from > p->to || p->to > read_size) { |
3660 DEBUG_WARN(("get block offset bad range\n")); | |
52 | 3661 DEBUG_RET(); |
49 | 3662 return 0; |
43 | 3663 } |
3664 DEBUG_RET(); | |
49 | 3665 return 1; |
16 | 3666 } |
3667 | |
3668 | |
360 | 3669 static int pst_getID_compare(const void *key, const void *entry) { |
3670 uint64_t key_id = *(const uint64_t*)key; | |
3671 uint64_t entry_id = ((const pst_index_ll*)entry)->i_id; | |
3672 return (key_id > entry_id) - (key_id < entry_id); | |
3673 } | |
3674 | |
3675 | |
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
|
3676 /** */ |
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
|
3677 pst_index_ll* pst_getID(pst_file* pf, uint64_t i_id) { |
69 | 3678 pst_index_ll *ptr; |
46 | 3679 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
|
3680 if (i_id == 0) { |
43 | 3681 DEBUG_RET(); |
3682 return NULL; | |
3683 } | |
3684 | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3685 //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
|
3686 //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
|
3687 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
|
3688 |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3689 DEBUG_INFO(("Trying to find %#"PRIx64"\n", i_id)); |
360 | 3690 ptr = bsearch(&i_id, pf->i_table, pf->i_count, sizeof *pf->i_table, pst_getID_compare); |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3691 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
|
3692 else {DEBUG_INFO(("ERROR: Value %#"PRIx64" not found\n", i_id)); } |
43 | 3693 DEBUG_RET(); |
3694 return ptr; | |
16 | 3695 } |
3696 | |
3697 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3698 static pst_id2_tree *pst_getID2(pst_id2_tree *head, uint64_t id2) { |
370
8700cc322c0c
Jeffrey Morlan - pst_getID2 must not recurse into children
Carl Byington <carl@five-ten-sg.com>
parents:
360
diff
changeset
|
3699 // the id2 values are only unique among siblings. |
8700cc322c0c
Jeffrey Morlan - pst_getID2 must not recurse into children
Carl Byington <carl@five-ten-sg.com>
parents:
360
diff
changeset
|
3700 // we must not recurse into children |
8700cc322c0c
Jeffrey Morlan - pst_getID2 must not recurse into children
Carl Byington <carl@five-ten-sg.com>
parents:
360
diff
changeset
|
3701 // the caller must supply the correct parent |
46 | 3702 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
|
3703 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
|
3704 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
|
3705 while (ptr) { |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3706 if (ptr->id2 == id2) break; |
43 | 3707 ptr = ptr->next; |
3708 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3709 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
|
3710 DEBUG_INFO(("Found value %#"PRIx64"\n", ptr->id->i_id)); |
43 | 3711 DEBUG_RET(); |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
3712 return ptr; |
43 | 3713 } |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3714 DEBUG_INFO(("ERROR Not Found\n")); |
43 | 3715 DEBUG_RET(); |
3716 return NULL; | |
16 | 3717 } |
3718 | |
3719 | |
35 | 3720 /** |
3721 * find the id in the descriptor tree rooted at pf->d_head | |
3722 * | |
43 | 3723 * @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
|
3724 * @param d_id the id we are looking for |
35 | 3725 * |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3726 * @return pointer to the pst_desc_tree node in the descriptor tree |
35 | 3727 */ |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3728 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
|
3729 pst_desc_tree *ptr = pf->d_head; |
46 | 3730 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
|
3731 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
|
3732 //DEBUG_INFO(("Looking for %#"PRIx64" at node %#"PRIx64" with parent %#"PRIx64"\n", id, ptr->d_id, ptr->parent_d_id)); |
43 | 3733 if (ptr->child) { |
3734 ptr = ptr->child; | |
3735 continue; | |
3736 } | |
3737 while (!ptr->next && ptr->parent) { | |
3738 ptr = ptr->parent; | |
3739 } | |
3740 ptr = ptr->next; | |
3741 } | |
3742 DEBUG_RET(); | |
3743 return ptr; // will be NULL or record we are looking for | |
16 | 3744 } |
3745 | |
3746 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3747 static void pst_printDptr(pst_file *pf, pst_desc_tree *ptr) { |
46 | 3748 DEBUG_ENT("pst_printDptr"); |
43 | 3749 while (ptr) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3750 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
|
3751 (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
|
3752 (ptr->assoc_tree ? ptr->assoc_tree->i_id : (uint64_t)0))); |
43 | 3753 if (ptr->child) { |
51 | 3754 pst_printDptr(pf, ptr->child); |
43 | 3755 } |
3756 ptr = ptr->next; | |
3757 } | |
3758 DEBUG_RET(); | |
16 | 3759 } |
3760 | |
3761 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
3762 static void pst_printID2ptr(pst_id2_tree *ptr) { |
46 | 3763 DEBUG_ENT("pst_printID2ptr"); |
43 | 3764 while (ptr) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3765 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
|
3766 if (ptr->child) pst_printID2ptr(ptr->child); |
43 | 3767 ptr = ptr->next; |
3768 } | |
3769 DEBUG_RET(); | |
16 | 3770 } |
3771 | |
3772 | |
52 | 3773 /** |
3774 * Read a block of data from file into memory | |
3775 * @param pf PST file | |
3776 * @param offset offset in the pst file of the data | |
3777 * @param size size of the block to be read | |
3778 * @param buf reference to pointer to buffer. If this pointer | |
3779 is non-NULL, it will first be free()d | |
3780 * @return size of block read into memory | |
3781 */ | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3782 static size_t pst_read_raw_block_size(pst_file *pf, int64_t offset, size_t size, char **buf) { |
51 | 3783 size_t rsize; |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3784 DEBUG_ENT("pst_read_raw_block_size"); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3785 DEBUG_INFO(("Reading raw block from %#"PRIx64", %x bytes\n", offset, size)); |
43 | 3786 |
3787 if (*buf) { | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3788 DEBUG_INFO(("Freeing old memory\n")); |
43 | 3789 free(*buf); |
3790 } | |
172
6954d315aaa8
move version-info into main configure.in, and set it properly.
Carl Byington <carl@five-ten-sg.com>
parents:
171
diff
changeset
|
3791 *buf = (char*) pst_malloc(size); |
52 | 3792 |
3793 rsize = pst_getAtPos(pf, offset, *buf, size); | |
43 | 3794 if (rsize != size) { |
52 | 3795 DEBUG_WARN(("Didn't read all the data. fread returned less [%i instead of %i]\n", rsize, size)); |
43 | 3796 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
|
3797 DEBUG_WARN(("We tried to read past the end of the file at [offset %#"PRIx64", size %#x]\n", offset, size)); |
43 | 3798 } else if (ferror(pf->fp)) { |
3799 DEBUG_WARN(("Error is set on file stream.\n")); | |
3800 } else { | |
3801 DEBUG_WARN(("I can't tell why it failed\n")); | |
3802 } | |
3803 } | |
3804 | |
3805 DEBUG_RET(); | |
52 | 3806 return rsize; |
16 | 3807 } |
3808 | |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3809 static size_t pst_read_block_size(pst_file *pf, int64_t offset, size_t size, size_t inflated_size, char **buf) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3810 DEBUG_ENT("pst_read_block_size"); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3811 DEBUG_INFO(("Reading block from %#"PRIx64", %x bytes, %x inflated\n", offset, size, inflated_size)); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3812 if (inflated_size <= size) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3813 // Not deflated. |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3814 size_t ret = pst_read_raw_block_size(pf, offset, size, buf); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3815 DEBUG_RET(); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3816 return ret; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3817 } |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3818 // We need to read the raw block and inflate it. |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3819 char *zbuf = NULL; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3820 if (pst_read_raw_block_size(pf, offset, size, &zbuf) != size) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3821 DEBUG_WARN(("Failed to read %i bytes\n", size)); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3822 if (zbuf) free(zbuf); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3823 DEBUG_RET(); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3824 return -1; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3825 } |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3826 *buf = (char *) pst_malloc(inflated_size); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3827 size_t result_size = inflated_size; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3828 if (uncompress((Bytef *) *buf, &result_size, (Bytef *) zbuf, size) != Z_OK || result_size != inflated_size) { |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3829 DEBUG_WARN(("Failed to uncompress %i bytes to %i bytes, got %i\n", size, inflated_size, result_size)); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3830 if (zbuf) free(zbuf); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3831 DEBUG_RET(); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3832 return -1; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3833 } |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3834 DEBUG_RET(); |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3835 return inflated_size; |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3836 } |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3837 |
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
3838 |
16 | 3839 |
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
|
3840 /** 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
|
3841 * @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
|
3842 * @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
|
3843 * @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
|
3844 * @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
|
3845 @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
|
3846 @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
|
3847 @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
|
3848 * @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
|
3849 */ |
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
|
3850 static int pst_decrypt(uint64_t i_id, char *buf, size_t size, unsigned char type) { |
43 | 3851 size_t x = 0; |
3852 unsigned char y; | |
46 | 3853 DEBUG_ENT("pst_decrypt"); |
43 | 3854 if (!buf) { |
3855 DEBUG_RET(); | |
3856 return -1; | |
3857 } | |
3858 | |
3859 if (type == PST_COMP_ENCRYPT) { | |
3860 x = 0; | |
3861 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
|
3862 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
|
3863 buf[x] = (char)comp_enc[y]; // transpose from encrypt array |
43 | 3864 x++; |
3865 } | |
79
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3866 |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3867 } 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
|
3868 // 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
|
3869 // http://www.passcape.com/outlook_passwords.htm |
188 | 3870 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
|
3871 x = 0; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3872 while (x < size) { |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3873 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
|
3874 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
|
3875 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
|
3876 y += losalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3877 y = comp_high1[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3878 y += hisalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3879 y = comp_high2[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3880 y -= hisalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3881 y = comp_enc[y]; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3882 y -= losalt; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3883 buf[x] = (char)y; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3884 x++; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3885 salt++; |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3886 } |
56fa05fd5271
Patch from Robert Simpson for encryption type 2.
Carl Byington <carl@five-ten-sg.com>
parents:
75
diff
changeset
|
3887 |
43 | 3888 } 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
|
3889 DEBUG_WARN(("Unknown encryption: %i. Cannot decrypt\n", type)); |
43 | 3890 DEBUG_RET(); |
3891 return -1; | |
3892 } | |
3893 DEBUG_RET(); | |
3894 return 0; | |
16 | 3895 } |
3896 | |
3897 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3898 static uint64_t pst_getIntAt(pst_file *pf, char *buf) { |
46 | 3899 uint64_t buf64; |
3900 uint32_t buf32; | |
3901 if (pf->do_read64) { | |
43 | 3902 memcpy(&buf64, buf, sizeof(buf64)); |
3903 LE64_CPU(buf64); | |
3904 return buf64; | |
3905 } | |
3906 else { | |
3907 memcpy(&buf32, buf, sizeof(buf32)); | |
3908 LE32_CPU(buf32); | |
3909 return buf32; | |
3910 } | |
3911 } | |
3912 | |
3913 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3914 static uint64_t pst_getIntAtPos(pst_file *pf, int64_t pos ) { |
46 | 3915 uint64_t buf64; |
3916 uint32_t buf32; | |
3917 if (pf->do_read64) { | |
52 | 3918 (void)pst_getAtPos(pf, pos, &buf64, sizeof(buf64)); |
43 | 3919 LE64_CPU(buf64); |
3920 return buf64; | |
3921 } | |
3922 else { | |
52 | 3923 (void)pst_getAtPos(pf, pos, &buf32, sizeof(buf32)); |
43 | 3924 LE32_CPU(buf32); |
3925 return buf32; | |
3926 } | |
16 | 3927 } |
3928 | |
52 | 3929 /** |
3930 * Read part of the pst file. | |
3931 * | |
3932 * @param pf PST file structure | |
3933 * @param pos offset of the data in the pst file | |
3934 * @param buf buffer to contain the data | |
3935 * @param size size of the buffer and the amount of data to be read | |
3936 * @return actual read size, 0 if seek error | |
3937 */ | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
3938 static size_t pst_getAtPos(pst_file *pf, int64_t pos, void* buf, size_t size) { |
52 | 3939 size_t rc; |
46 | 3940 DEBUG_ENT("pst_getAtPos"); |
52 | 3941 // pst_block_recorder **t = &pf->block_head; |
3942 // pst_block_recorder *p = pf->block_head; | |
3943 // while (p && ((p->offset+p->size) <= pos)) { | |
3944 // t = &p->next; | |
3945 // p = p->next; | |
3946 // } | |
3947 // if (p && (p->offset <= pos) && (pos < (p->offset+p->size))) { | |
3948 // // bump the count | |
3949 // p->readcount++; | |
3950 // } else { | |
3951 // // add a new block | |
3952 // 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
|
3953 // p = (pst_block_recorder*)pst_malloc(sizeof(*p)); |
52 | 3954 // *t = p; |
3955 // p->next = tail; | |
3956 // p->offset = pos; | |
3957 // p->size = size; | |
3958 // p->readcount = 1; | |
3959 // } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
3960 // DEBUG_INFO(("pst file old offset %#"PRIx64" old size %#x read count %i offset %#"PRIx64" size %#x\n", |
52 | 3961 // p->offset, p->size, p->readcount, pos, size)); |
3962 | |
75
987aa872294e
Use ftello/fseeko to properly handle large files.
Carl Byington <carl@five-ten-sg.com>
parents:
73
diff
changeset
|
3963 if (fseeko(pf->fp, pos, SEEK_SET) == -1) { |
43 | 3964 DEBUG_RET(); |
52 | 3965 return 0; |
43 | 3966 } |
52 | 3967 rc = fread(buf, (size_t)1, size, pf->fp); |
43 | 3968 DEBUG_RET(); |
52 | 3969 return rc; |
16 | 3970 } |
3971 | |
3972 | |
50 | 3973 /** |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
3974 * Get an ID block from file using pst_ff_getIDblock() and decrypt if necessary |
52 | 3975 * @param pf PST file structure |
188 | 3976 * @param i_id ID of block to retrieve |
3977 * @param buf reference to pointer to buffer that will contain the data block. | |
3978 * If this pointer is non-NULL, it will first be free()d. | |
3979 * @return Size of block read into memory | |
50 | 3980 */ |
188 | 3981 size_t pst_ff_getIDblock_dec(pst_file *pf, uint64_t i_id, char **buf) { |
43 | 3982 size_t r; |
188 | 3983 int noenc = (int)(i_id & 2); // disable encryption |
46 | 3984 DEBUG_ENT("pst_ff_getIDblock_dec"); |
233
1d50ff3c5091
better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents:
231
diff
changeset
|
3985 DEBUG_INFO(("for id %#"PRIx64"\n", i_id)); |
188 | 3986 r = pst_ff_getIDblock(pf, i_id, buf); |
46 | 3987 if ((pf->encryption) && !(noenc)) { |
188 | 3988 (void)pst_decrypt(i_id, *buf, r, pf->encryption); |
43 | 3989 } |
52 | 3990 DEBUG_HEXDUMPC(*buf, r, 16); |
43 | 3991 DEBUG_RET(); |
3992 return r; | |
3993 } | |
3994 | |
3995 | |
50 | 3996 /** |
3997 * Read a block of data from file into memory | |
188 | 3998 * @param pf PST file structure |
3999 * @param i_id ID of block to read | |
4000 * @param buf reference to pointer to buffer that will contain the data block. | |
4001 * If this pointer is non-NULL, it will first be free()d. | |
52 | 4002 * @return size of block read into memory |
50 | 4003 */ |
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
|
4004 static size_t pst_ff_getIDblock(pst_file *pf, uint64_t i_id, char** buf) { |
43 | 4005 pst_index_ll *rec; |
52 | 4006 size_t rsize; |
46 | 4007 DEBUG_ENT("pst_ff_getIDblock"); |
188 | 4008 rec = pst_getID(pf, i_id); |
52 | 4009 if (!rec) { |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
4010 DEBUG_INFO(("Cannot find ID %#"PRIx64"\n", i_id)); |
43 | 4011 DEBUG_RET(); |
4012 return 0; | |
4013 } | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
4014 DEBUG_INFO(("id = %#"PRIx64", record size = %#x, offset = %#x\n", i_id, rec->size, rec->offset)); |
373
0ccc746c8079
Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility
Carl Byington <carl@five-ten-sg.com>
parents:
370
diff
changeset
|
4015 rsize = pst_read_block_size(pf, rec->offset, rec->size, rec->inflated_size, buf); |
43 | 4016 DEBUG_RET(); |
4017 return rsize; | |
16 | 4018 } |
4019 | |
4020 | |
186
0a4f7ecd7452
more cleanup of external names in the shared library
Carl Byington <carl@five-ten-sg.com>
parents:
182
diff
changeset
|
4021 static size_t pst_ff_getID2block(pst_file *pf, uint64_t id2, pst_id2_tree *id2_head, char** buf) { |
50 | 4022 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
|
4023 pst_id2_tree* ptr; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4024 pst_holder h = {buf, NULL, 0, 0, 0}; |
46 | 4025 DEBUG_ENT("pst_ff_getID2block"); |
4026 ptr = pst_getID2(id2_head, id2); | |
43 | 4027 |
4028 if (!ptr) { | |
233
1d50ff3c5091
better rfc822 embedded message decoding
Carl Byington <carl@five-ten-sg.com>
parents:
231
diff
changeset
|
4029 DEBUG_WARN(("Cannot find id2 value %#"PRIx64"\n", id2)); |
43 | 4030 DEBUG_RET(); |
4031 return 0; | |
4032 } | |
143
fdc58ad2c758
fix embedded rfc822 messages with attachments
Carl Byington <carl@five-ten-sg.com>
parents:
142
diff
changeset
|
4033 ret = pst_ff_getID2data(pf, ptr->id, &h); |
43 | 4034 DEBUG_RET(); |
50 | 4035 return ret; |
16 | 4036 } |
4037 | |
4038 | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4039 /** 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
|
4040 * 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
|
4041 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4042 * @param pf PST file structure |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4043 * @param ptr |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4044 * @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
|
4045 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4046 */ |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4047 static size_t pst_ff_getID2data(pst_file *pf, pst_index_ll *ptr, pst_holder *h) { |
46 | 4048 size_t ret; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4049 char *b = NULL; |
46 | 4050 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
|
4051 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
|
4052 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
|
4053 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
|
4054 free(b); |
43 | 4055 } else { |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4056 // 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
|
4057 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
|
4058 ret = pst_ff_compile_ID(pf, ptr->i_id, h, (size_t)0); |
43 | 4059 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4060 ret = pst_finish_cleanup_holder(h, ret); |
43 | 4061 DEBUG_RET(); |
4062 return ret; | |
16 | 4063 } |
4064 | |
4065 | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4066 /** 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
|
4067 * specified by the pst_holder. |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4068 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4069 * @param pf PST file structure |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4070 * @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
|
4071 * @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
|
4072 * @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
|
4073 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4074 */ |
188 | 4075 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
|
4076 size_t z, a; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4077 uint16_t count, y; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4078 char *buf3 = NULL; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4079 char *buf2 = NULL; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4080 char *b_ptr; |
50 | 4081 pst_block_hdr block_hdr; |
4082 pst_table3_rec table3_rec; //for type 3 (0x0101) blocks | |
43 | 4083 |
46 | 4084 DEBUG_ENT("pst_ff_compile_ID"); |
188 | 4085 a = pst_ff_getIDblock(pf, i_id, &buf3); |
43 | 4086 if (!a) { |
4087 if (buf3) free(buf3); | |
52 | 4088 DEBUG_RET(); |
43 | 4089 return 0; |
4090 } | |
167
40e9de445038
improve consistency checking when fetching items from the pst file.
Carl Byington <carl@five-ten-sg.com>
parents:
164
diff
changeset
|
4091 DEBUG_HEXDUMPC(buf3, a, 16); |
50 | 4092 memcpy(&block_hdr, buf3, sizeof(block_hdr)); |
4093 LE16_CPU(block_hdr.index_offset); | |
4094 LE16_CPU(block_hdr.type); | |
4095 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
|
4096 DEBUG_INFO(("block header (index_offset=%#hx, type=%#hx, offset=%#x)\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
50 | 4097 |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4098 count = block_hdr.type; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4099 b_ptr = buf3 + 8; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4100 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4101 // 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
|
4102 // 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
|
4103 // total size of the data. |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4104 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
|
4105 for (y=0; y<count; y++) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4106 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
|
4107 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
|
4108 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4109 free(buf3); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4110 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4111 return size; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4112 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4113 |
50 | 4114 if (block_hdr.index_offset != (uint16_t)0x0101) { //type 3 |
4115 DEBUG_WARN(("WARNING: not a type 0x0101 buffer, Treating as normal buffer\n")); | |
188 | 4116 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
|
4117 size = pst_append_holder(h, size, &buf3, a); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4118 free(buf3); |
43 | 4119 DEBUG_RET(); |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4120 return size; |
43 | 4121 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4122 |
50 | 4123 for (y=0; y<count; y++) { |
4124 b_ptr += pst_decode_type3(pf, &table3_rec, b_ptr); | |
4125 z = pst_ff_getIDblock_dec(pf, table3_rec.id, &buf2); | |
4126 if (!z) { | |
4127 DEBUG_WARN(("call to getIDblock returned zero %i\n", z)); | |
4128 if (buf2) free(buf2); | |
4129 free(buf3); | |
52 | 4130 DEBUG_RET(); |
50 | 4131 return z; |
4132 } | |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4133 size = pst_append_holder(h, size, &buf2, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4134 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4135 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4136 free(buf3); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4137 if (buf2) free(buf2); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4138 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4139 return size; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4140 } |
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 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4143 /** 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
|
4144 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4145 * @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
|
4146 * @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
|
4147 * @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
|
4148 * @param z number of bytes in buf |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4149 * @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
|
4150 */ |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4151 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
|
4152 char *t; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4153 DEBUG_ENT("pst_append_holder"); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4154 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4155 // raw append to a buffer |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4156 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
|
4157 *(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
|
4158 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
|
4159 memcpy(*(h->buf)+size, *buf, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4160 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4161 // base64 encoding to a file |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4162 } else if ((h->base64 == 1) && h->fp) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4163 // |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4164 if (h->base64_extra) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4165 // 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
|
4166 *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
|
4167 memmove(*buf+h->base64_extra, *buf, z); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4168 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
|
4169 z += h->base64_extra; |
43 | 4170 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4171 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4172 // 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
|
4173 h->base64_extra = z % 3; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4174 if (h->base64_extra) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4175 z -= h->base64_extra; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4176 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
|
4177 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4178 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4179 // encode this chunk |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4180 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
|
4181 if (t) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4182 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
|
4183 (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
|
4184 free(t); // caught by valgrind |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4185 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4186 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4187 // raw append to a file |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4188 } else if (h->fp) { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4189 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
|
4190 (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
|
4191 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4192 // null output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4193 } else { |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4194 // h-> does not specify any output |
43 | 4195 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4196 DEBUG_RET(); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4197 return size+z; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4198 } |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4199 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4200 |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4201 /** 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
|
4202 * |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4203 * @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
|
4204 * @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
|
4205 * @return updated size of the output |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4206 */ |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4207 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
|
4208 char *t; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4209 DEBUG_ENT("pst_finish_cleanup_holder"); |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4210 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
|
4211 // need to encode any bytes left over |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4212 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
|
4213 if (t) { |
997cf1373f9e
fix base64 encoding that could create long lines
Carl Byington <carl@five-ten-sg.com>
parents:
93
diff
changeset
|
4214 (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
|
4215 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
|
4216 } |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4217 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
|
4218 } |
43 | 4219 DEBUG_RET(); |
4220 return size; | |
16 | 4221 } |
4222 | |
4223 | |
328 | 4224 /** compare strings case-insensitive. |
4225 * @return -1 if a < b, 0 if a==b, 1 if a > b | |
4226 */ | |
4227 int pst_stricmp(char *a, char *b) { | |
43 | 4228 while(*a != '\0' && *b != '\0' && toupper(*a)==toupper(*b)) { |
4229 a++; b++; | |
4230 } | |
4231 if (toupper(*a) == toupper(*b)) | |
4232 return 0; | |
4233 else if (toupper(*a) < toupper(*b)) | |
4234 return -1; | |
4235 else | |
4236 return 1; | |
16 | 4237 } |
4238 | |
4239 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4240 static int pst_strincmp(char *a, char *b, size_t x) { |
43 | 4241 // compare upto x chars in string a and b case-insensitively |
4242 // returns -1 if a < b, 0 if a==b, 1 if a > b | |
46 | 4243 size_t y = 0; |
43 | 4244 while (*a != '\0' && *b != '\0' && y < x && toupper(*a)==toupper(*b)) { |
4245 a++; b++; y++; | |
4246 } | |
4247 // if we have reached the end of either string, or a and b still match | |
4248 if (*a == '\0' || *b == '\0' || toupper(*a)==toupper(*b)) | |
4249 return 0; | |
4250 else if (toupper(*a) < toupper(*b)) | |
4251 return -1; | |
4252 else | |
4253 return 1; | |
16 | 4254 } |
4255 | |
4256 | |
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
|
4257 size_t pst_fwrite(const void* ptr, size_t size, size_t nmemb, FILE *stream) { |
43 | 4258 size_t r; |
4259 if (ptr) | |
4260 r = fwrite(ptr, size, nmemb, stream); | |
4261 else { | |
4262 r = 0; | |
202
2f38c4ce606f
remove readpstlog, switch to plain ascii debug log files
Carl Byington <carl@five-ten-sg.com>
parents:
201
diff
changeset
|
4263 DEBUG_ENT("pst_fwrite"); |
43 | 4264 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
|
4265 DEBUG_RET(); |
43 | 4266 } |
4267 return r; | |
16 | 4268 } |
4269 | |
4270 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4271 static char* pst_wide_to_single(char *wt, size_t size) { |
43 | 4272 // returns the first byte of each wide char. the size is the number of bytes in source |
4273 char *x, *y; | |
46 | 4274 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
|
4275 x = pst_malloc((size/2)+1); |
43 | 4276 y = x; |
4277 while (size != 0 && *wt != '\0') { | |
4278 *y = *wt; | |
4279 wt+=2; | |
4280 size -= 2; | |
4281 y++; | |
4282 } | |
4283 *y = '\0'; | |
4284 DEBUG_RET(); | |
4285 return x; | |
16 | 4286 } |
4287 | |
43 | 4288 |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4289 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
|
4290 //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
|
4291 //static size_t buflen = 0; |
43 | 4292 char *ret, *a, *b; |
47 | 4293 size_t x = 0; |
4294 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
|
4295 if (!str) return NULL; |
43 | 4296 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
|
4297 // 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
|
4298 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
|
4299 + 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
|
4300 + 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
|
4301 + 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
|
4302 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
|
4303 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
|
4304 // there isn't any extra space required |
43 | 4305 ret = str; |
4306 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
|
4307 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
|
4308 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
|
4309 *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
|
4310 *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
|
4311 } |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4312 a = str; |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4313 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
|
4314 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
|
4315 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
|
4316 case ',' : |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4317 case '\\': |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4318 case ';' : |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4319 *(b++) = '\\'; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4320 *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
|
4321 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4322 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
|
4323 *(b++) = '\\'; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4324 *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
|
4325 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4326 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
|
4327 b--; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4328 break; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4329 default: |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4330 *b=*a; |
48 | 4331 } |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4332 b++; |
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4333 a++; |
43 | 4334 } |
191
4b498fd68464
add pst_attach_to_mem() back into the shared library interface.
Carl Byington <carl@five-ten-sg.com>
parents:
190
diff
changeset
|
4335 *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
|
4336 ret = *buf; |
43 | 4337 } |
4338 DEBUG_RET(); | |
4339 return ret; | |
4340 } | |
4341 | |
4342 | |
176
ac6e22c8a9cf
build separate libpst, libpst-libs, libpst-devel rpms.
Carl Byington <carl@five-ten-sg.com>
parents:
172
diff
changeset
|
4343 static int pst_chr_count(char *str, char x) { |
43 | 4344 int r = 0; |
46 | 4345 while (*str) { |
4346 if (*str == x) r++; | |
43 | 4347 str++; |
4348 } | |
4349 return r; | |
4350 } | |
4351 | |
4352 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4353 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
|
4354 struct tm stm; |
43 | 4355 DEBUG_ENT("rfc2425_datetime_format"); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4356 pst_fileTimeToStructTM(ft, &stm); |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4357 if (strftime(result, buflen, "%Y-%m-%dT%H:%M:%SZ", &stm)==0) { |
43 | 4358 DEBUG_INFO(("Problem occured formatting date\n")); |
4359 } | |
4360 DEBUG_RET(); | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4361 return result; |
43 | 4362 } |
4363 | |
4364 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4365 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
|
4366 struct tm stm; |
43 | 4367 DEBUG_ENT("rfc2445_datetime_format"); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4368 pst_fileTimeToStructTM(ft, &stm); |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4369 if (strftime(result, buflen, "%Y%m%dT%H%M%SZ", &stm)==0) { |
43 | 4370 DEBUG_INFO(("Problem occured formatting date\n")); |
4371 } | |
4372 DEBUG_RET(); | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4373 return result; |
43 | 4374 } |
4375 | |
4376 | |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4377 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
|
4378 struct tm stm; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4379 time_t t = time(NULL); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4380 DEBUG_ENT("rfc2445_datetime_format_now"); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4381 gmtime_r(&t, &stm); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4382 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
|
4383 DEBUG_INFO(("Problem occured formatting date\n")); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4384 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4385 DEBUG_RET(); |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4386 return result; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4387 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4388 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4389 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4390 /** 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
|
4391 * |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4392 * @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
|
4393 * @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
|
4394 * @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
|
4395 * @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
|
4396 * equivalent iconv character set |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4397 */ |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4398 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
|
4399 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
|
4400 switch (cp) { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4401 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
|
4402 case 936 : return "gb2313"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4403 case 950 : return "big5"; |
230
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4404 case 1200 : return "ucs-2le"; |
42b38d65f7e4
patches from Justin Greer
Carl Byington <carl@five-ten-sg.com>
parents:
215
diff
changeset
|
4405 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
|
4406 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
|
4407 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
|
4408 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
|
4409 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
|
4410 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
|
4411 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
|
4412 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
|
4413 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
|
4414 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
|
4415 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
|
4416 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
|
4417 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
|
4418 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
|
4419 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
|
4420 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
|
4421 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
|
4422 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
|
4423 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
|
4424 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
|
4425 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
|
4426 case 50221 : return "csiso2022jp"; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4427 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
|
4428 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
|
4429 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
|
4430 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
|
4431 default : |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4432 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
|
4433 return result; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4434 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4435 return NULL; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4436 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4437 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4438 |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4439 /** 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
|
4440 * the charset for pst_string elements that are not already in utf8 encoding. |
271 | 4441 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4442 * @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
|
4443 * @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
|
4444 * @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
|
4445 * @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
|
4446 */ |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4447 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
|
4448 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
|
4449 (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
|
4450 (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
|
4451 (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
|
4452 "iso-8859-1"; |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4453 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4454 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4455 |
257
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4456 /** 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
|
4457 * |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4458 * @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
|
4459 */ |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4460 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
|
4461 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
|
4462 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
|
4463 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
|
4464 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
|
4465 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4466 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4467 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
|
4468 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
|
4469 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
|
4470 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
|
4471 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
|
4472 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
|
4473 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
|
4474 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
|
4475 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
|
4476 *(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
|
4477 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
|
4478 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
|
4479 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4480 else { |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4481 *(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
|
4482 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4483 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4484 y++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4485 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4486 *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
|
4487 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
|
4488 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
|
4489 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4490 |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4491 |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4492 /** 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
|
4493 * |
271 | 4494 * @param item pointer to the containing mapi item |
4495 * @param str pointer to the mapi string of interest | |
4496 * @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
|
4497 */ |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4498 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
|
4499 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
|
4500 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
|
4501 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
|
4502 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
|
4503 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
|
4504 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
|
4505 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
|
4506 x++; |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4507 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4508 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
|
4509 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
|
4510 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
|
4511 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
|
4512 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
|
4513 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
|
4514 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
|
4515 } |
c947b8812120
rfc2047 and rfc2231 encoding for non-ascii headers and attachment filenames
Carl Byington <carl@five-ten-sg.com>
parents:
252
diff
changeset
|
4516 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
|
4517 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
|
4518 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
|
4519 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
|
4520 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
|
4521 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
|
4522 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4523 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4524 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4525 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4526 /** 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
|
4527 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4528 * @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
|
4529 * @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
|
4530 */ |
193 | 4531 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
|
4532 if (!str->str) return; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4533 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
|
4534 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4535 |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4536 |
153
0b1766da9be8
use AM_ICONV for better portability of the library location.
Carl Byington <carl@five-ten-sg.com>
parents:
152
diff
changeset
|
4537 /** 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
|
4538 * |
190
e3a63888cdd4
add documentation for shared library interface
Carl Byington <carl@five-ten-sg.com>
parents:
188
diff
changeset
|
4539 * @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
|
4540 * @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
|
4541 */ |
193 | 4542 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
|
4543 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
|
4544 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
|
4545 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
|
4546 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
|
4547 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
|
4548 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
|
4549 } |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4550 if (!str->str) { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4551 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
|
4552 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
|
4553 DEBUG_RET(); |
151
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4554 return; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4555 } |
211
94bde95d7e18
the shared library interface should now be thread safe
Carl Byington <carl@five-ten-sg.com>
parents:
204
diff
changeset
|
4556 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
|
4557 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
|
4558 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
|
4559 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
|
4560 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
|
4561 } |
182
b65e8d0a088a
more cleanup on external names in the shared object file
Carl Byington <carl@five-ten-sg.com>
parents:
176
diff
changeset
|
4562 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
|
4563 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
|
4564 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
|
4565 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
|
4566 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
|
4567 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4568 else { |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4569 free(str->str); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4570 str->str = newer->b; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4571 str->is_utf8 = 1; |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4572 } |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4573 free(newer); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4574 DEBUG_RET(); |
cda7c812ec01
track character set individually for each mapi element
Carl Byington <carl@five-ten-sg.com>
parents:
150
diff
changeset
|
4575 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4576 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4577 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4578 /** 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
|
4579 * @param appt pointer to appointment structure |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4580 * @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
|
4581 */ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4582 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
|
4583 { |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4584 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
|
4585 int m[4] = {3,4,4,5}; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4586 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
|
4587 memset(r, 0, sizeof(pst_recurrence)); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4588 size_t s = appt->recurrence_data.size; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4589 size_t i = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4590 char* p = appt->recurrence_data.data; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4591 if (p) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4592 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
|
4593 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
|
4594 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
|
4595 if (r->sub_type <= 3) { |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4596 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
|
4597 int j = 0; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4598 for (j=0; j<n; j++) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4599 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
|
4600 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4601 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4602 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
|
4603 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
|
4604 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
|
4605 switch (r->type) { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4606 case 0: // daily |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4607 if (r->sub_type == 0) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4608 // simple daily |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4609 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
|
4610 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4611 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4612 // daily every weekday, subset of weekly |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4613 r->interval = 1; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4614 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4615 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4616 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4617 case 1: // weekly |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4618 r->interval = r->parm2; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4619 r->bydaymask = r->parm4; |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4620 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4621 case 2: // monthly |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4622 r->interval = r->parm2; |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4623 if (r->sub_type == 2) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4624 // monthly on day d |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4625 r->dayofmonth = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4626 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4627 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4628 // monthly on 2nd tuesday |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4629 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4630 r->position = r->parm5; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4631 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4632 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4633 case 3: // yearly |
199
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4634 r->interval = 1; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4635 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
|
4636 if (r->sub_type == 2) { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4637 // yearly on day d of month m |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4638 r->dayofmonth = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4639 } |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4640 else { |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4641 // yearly on 2nd tuesday of month m |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4642 r->bydaymask = r->parm4; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4643 r->position = r->parm5; |
e3a46f66332b
more changes in recurrence decoding
Carl Byington <carl@five-ten-sg.com>
parents:
198
diff
changeset
|
4644 } |
198
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4645 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4646 default: |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4647 break; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4648 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4649 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4650 return r; |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4651 } |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4652 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4653 |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4654 /** Free a recurrence structure. |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4655 * @param r input pointer to be freed |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4656 */ |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4657 void pst_free_recurrence(pst_recurrence* r) |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4658 { |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4659 if (r) free(r); |
7c60d6d1c681
decode more recurrence mapi elements
Carl Byington <carl@five-ten-sg.com>
parents:
195
diff
changeset
|
4660 } |