Mercurial > libpst
annotate libpst.c @ 14:3f2fedec798c
patches from debian
author | carl |
---|---|
date | Sun, 19 Feb 2006 14:35:22 -0800 |
parents | 3f627519a92d |
children |
rev | line source |
---|---|
0 | 1 /*** |
2 * libpst.c | |
3 * Part of the LibPST project | |
4 * Written by David Smith | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
5 * dave.s@earthcorp.com |
0 | 6 */ |
7 #include <stdio.h> | |
8 #include <stdlib.h> | |
9 #include <time.h> | |
10 #include <string.h> | |
11 #include <ctype.h> | |
12 #include <limits.h> | |
13 #include <wchar.h> | |
14 | |
15 #include <errno.h> | |
16 #include <sys/stat.h> //mkdir | |
17 #include <fcntl.h> // for Win32 definition of _O_BINARY | |
18 #include "define.h" | |
19 #include "libstrfunc.h" | |
20 | |
21 #ifdef _MSC_VER | |
22 # include <windows.h> | |
23 #else | |
24 # include <unistd.h> | |
25 #endif //ifdef _MSC_VER | |
26 | |
27 //#include <endian.h> | |
28 //#include <byteswap.h> | |
29 | |
30 #include "libpst.h" | |
31 #include "timeconv.h" | |
32 | |
33 //#ifdef _MSC_VER | |
34 //#include "windows.h" | |
35 //#define WARN printf | |
36 //#define DEBUG_INFO printf | |
37 //#define DEBUG_EMAIL printf | |
38 //#define DEBUG_READ printf | |
39 //#define DEBUG_DECRYPT printf | |
40 //#define DEBUG_CODE printf | |
41 //#define DEBUG_INDEX printf | |
42 //#define DEBUG_WARN printf | |
43 //#define DEBUG printf | |
44 // | |
45 //#define LE32_CPU(x) {} | |
46 //#define LE16_CPU(x) {} | |
47 //#endif // _MSC_VER | |
48 | |
49 #define FILE_SIZE_POINTER 0xA8 | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
50 #define INDEX_POINTER 0xC4 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
51 #define SECOND_POINTER 0xBC |
0 | 52 // the encryption setting could be at 0x1CC. Will require field testing |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
53 #define ENC_OFFSET 0x1CD |
0 | 54 // says the type of index we have |
55 #define INDEX_TYPE_OFFSET 0x0A | |
56 | |
57 // for the 64bit 2003 outlook PST we need new file offsets | |
58 // perhaps someone can figure out the header format for the pst files... | |
59 #define FILE_SIZE_POINTER_64 0xB8 | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
60 #define INDEX_POINTER_64 0xF0 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
61 #define SECOND_POINTER_64 0xE0 |
0 | 62 |
63 #define PST_SIGNATURE 0x4E444221 | |
64 | |
65 struct _pst_table_ptr_struct{ | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
66 int32_t start; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
67 int32_t u1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
68 int32_t offset; |
0 | 69 }; |
70 | |
71 typedef struct _pst_block_header { | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
72 int16_t type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
73 int16_t count; |
0 | 74 } pst_block_header; |
75 | |
76 typedef struct _pst_id2_assoc { | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
77 int32_t id2; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
78 int32_t id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
79 int32_t table2; |
0 | 80 } pst_id2_assoc; |
81 | |
8 | 82 // this is an array of the un-encrypted values. the un-encrypyed value is in the position |
0 | 83 // of the encrypted value. ie the encrypted value 0x13 represents 0x02 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
84 // 0 1 2 3 4 5 6 7 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
85 // 8 9 a b c d e f |
8 | 86 unsigned char comp_enc [] = |
0 | 87 { 0x47, 0xf1, 0xb4, 0xe6, 0x0b, 0x6a, 0x72, 0x48, |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
88 0x85, 0x4e, 0x9e, 0xeb, 0xe2, 0xf8, 0x94, 0x53, /*0x0f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
89 0xe0, 0xbb, 0xa0, 0x02, 0xe8, 0x5a, 0x09, 0xab, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
90 0xdb, 0xe3, 0xba, 0xc6, 0x7c, 0xc3, 0x10, 0xdd, /*0x1f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
91 0x39, 0x05, 0x96, 0x30, 0xf5, 0x37, 0x60, 0x82, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
92 0x8c, 0xc9, 0x13, 0x4a, 0x6b, 0x1d, 0xf3, 0xfb, /*0x2f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
93 0x8f, 0x26, 0x97, 0xca, 0x91, 0x17, 0x01, 0xc4, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
94 0x32, 0x2d, 0x6e, 0x31, 0x95, 0xff, 0xd9, 0x23, /*0x3f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
95 0xd1, 0x00, 0x5e, 0x79, 0xdc, 0x44, 0x3b, 0x1a, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
96 0x28, 0xc5, 0x61, 0x57, 0x20, 0x90, 0x3d, 0x83, /*0x4f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
97 0xb9, 0x43, 0xbe, 0x67, 0xd2, 0x46, 0x42, 0x76, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
98 0xc0, 0x6d, 0x5b, 0x7e, 0xb2, 0x0f, 0x16, 0x29, /*0x5f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
99 0x3c, 0xa9, 0x03, 0x54, 0x0d, 0xda, 0x5d, 0xdf, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
100 0xf6, 0xb7, 0xc7, 0x62, 0xcd, 0x8d, 0x06, 0xd3, /*0x6f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
101 0x69, 0x5c, 0x86, 0xd6, 0x14, 0xf7, 0xa5, 0x66, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
102 0x75, 0xac, 0xb1, 0xe9, 0x45, 0x21, 0x70, 0x0c, /*0x7f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
103 0x87, 0x9f, 0x74, 0xa4, 0x22, 0x4c, 0x6f, 0xbf, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
104 0x1f, 0x56, 0xaa, 0x2e, 0xb3, 0x78, 0x33, 0x50, /*0x8f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
105 0xb0, 0xa3, 0x92, 0xbc, 0xcf, 0x19, 0x1c, 0xa7, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
106 0x63, 0xcb, 0x1e, 0x4d, 0x3e, 0x4b, 0x1b, 0x9b, /*0x9f*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
107 0x4f, 0xe7, 0xf0, 0xee, 0xad, 0x3a, 0xb5, 0x59, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
108 0x04, 0xea, 0x40, 0x55, 0x25, 0x51, 0xe5, 0x7a, /*0xaf*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
109 0x89, 0x38, 0x68, 0x52, 0x7b, 0xfc, 0x27, 0xae, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
110 0xd7, 0xbd, 0xfa, 0x07, 0xf4, 0xcc, 0x8e, 0x5f, /*0xbf*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
111 0xef, 0x35, 0x9c, 0x84, 0x2b, 0x15, 0xd5, 0x77, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
112 0x34, 0x49, 0xb6, 0x12, 0x0a, 0x7f, 0x71, 0x88, /*0xcf*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
113 0xfd, 0x9d, 0x18, 0x41, 0x7d, 0x93, 0xd8, 0x58, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
114 0x2c, 0xce, 0xfe, 0x24, 0xaf, 0xde, 0xb8, 0x36, /*0xdf*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
115 0xc8, 0xa1, 0x80, 0xa6, 0x99, 0x98, 0xa8, 0x2f, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
116 0x0e, 0x81, 0x65, 0x73, 0xe4, 0xc2, 0xa2, 0x8a, /*0xef*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
117 0xd4, 0xe1, 0x11, 0xd0, 0x08, 0x8b, 0x2a, 0xf2, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
118 0xed, 0x9a, 0x64, 0x3f, 0xc1, 0x6c, 0xf9, 0xec}; /*0xff*/ |
0 | 119 |
120 int32_t pst_open(pst_file *pf, char *name, char *mode) { | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
121 u_int32_t sig; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
122 // unsigned char ind_type; |
0 | 123 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
124 DEBUG_ENT("pst_open"); |
0 | 125 #ifdef _MSC_VER |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
126 // set the default open mode for windows |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
127 _fmode = _O_BINARY; |
0 | 128 #endif //_MSC_VER |
129 | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
130 if (!pf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
131 WARN (("cannot be passed a NULL pst_file\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
132 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
133 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
134 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
135 memset(pf, 0, sizeof(pst_file)); |
8 | 136 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
137 if ((pf->fp = fopen(name, mode)) == NULL) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
138 WARN(("cannot open PST file. Error\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
139 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
140 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
141 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
142 if (fread(&sig, sizeof(sig), 1, pf->fp) == 0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
143 fclose(pf->fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
144 WARN(("cannot read signature from PST file. Closing on error\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
145 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
146 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
147 } |
0 | 148 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
149 // architecture independant byte-swapping (little, big, pdp) |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
150 LE32_CPU(sig); |
0 | 151 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
152 DEBUG_INFO(("sig = %X\n", sig)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
153 if (sig != PST_SIGNATURE) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
154 fclose(pf->fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
155 WARN(("not a PST file that I know. Closing with error\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
156 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
157 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
158 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
159 _pst_getAtPos(pf->fp, INDEX_TYPE_OFFSET, &(pf->ind_type), sizeof(unsigned char)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
160 DEBUG_INFO(("index_type = %i\n", pf->ind_type)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
161 if (pf->ind_type != 0x0E) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
162 WARN(("unknown index structure. Could this be a new Outlook 2003 PST file?\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
163 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
164 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
165 } |
0 | 166 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
167 _pst_getAtPos(pf->fp, ENC_OFFSET, &(pf->encryption), sizeof(unsigned char)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
168 DEBUG_INFO(("encrypt = %i\n", pf->encryption)); |
8 | 169 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
170 _pst_getAtPos(pf->fp, SECOND_POINTER-4, &(pf->index2_count), sizeof(pf->index2_count)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
171 _pst_getAtPos(pf->fp, SECOND_POINTER, &(pf->index2), sizeof(pf->index2)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
172 LE32_CPU(pf->index2_count); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
173 LE32_CPU(pf->index2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
174 DEBUG_INFO(("Pointer2 is %#X, count %i[%#x]\n", pf->index2, pf->index2_count, pf->index2_count)); |
0 | 175 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
176 _pst_getAtPos(pf->fp, FILE_SIZE_POINTER, &(pf->size), sizeof(pf->size)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
177 LE32_CPU(pf->size); |
0 | 178 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
179 _pst_getAtPos(pf->fp, INDEX_POINTER-4, &(pf->index1_count), sizeof(pf->index1_count)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
180 _pst_getAtPos(pf->fp, INDEX_POINTER, &(pf->index1), sizeof(pf->index1)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
181 LE32_CPU(pf->index1_count); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
182 LE32_CPU(pf->index1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
183 DEBUG_INFO(("Pointer1 is %#X, count %i[%#x]\n", pf->index1, pf->index1_count, pf->index1_count)); |
0 | 184 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
185 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
186 return 0; |
0 | 187 } |
188 | |
11 | 189 |
0 | 190 int32_t pst_close(pst_file *pf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
191 DEBUG_ENT("pst_close"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
192 if (!pf->fp) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
193 WARN(("cannot close NULL fp\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
194 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
195 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
196 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
197 if (fclose(pf->fp)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
198 WARN(("fclose returned non-zero value\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
199 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
200 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
201 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
202 // we must free the id linklist and the desc tree |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
203 _pst_free_id (pf->i_head); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
204 _pst_free_desc (pf->d_head); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
205 _pst_free_xattrib (pf->x_head); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
206 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
207 return 0; |
0 | 208 } |
209 | |
11 | 210 |
0 | 211 pst_desc_ll* pst_getTopOfFolders(pst_file *pf, pst_item *root) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
212 pst_desc_ll *ret; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
213 // pst_item *i; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
214 // char *a, *b; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
215 // int x,z; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
216 DEBUG_ENT("pst_getTopOfFolders"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
217 if (!root || !root->message_store) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
218 DEBUG_INDEX(("There isn't a top of folder record here.\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
219 ret = NULL; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
220 } else if (!root->message_store->top_of_personal_folder) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
221 // this is the OST way |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
222 // ASSUMPTION: Top Of Folders record in PST files is *always* descid 0x2142 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
223 ret = _pst_getDptr(pf, 0x2142); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
224 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
225 ret = _pst_getDptr(pf, root->message_store->top_of_personal_folder->id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
226 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
227 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
228 return ret; |
0 | 229 } |
230 | |
11 | 231 |
0 | 232 int32_t pst_attach_to_mem(pst_file *pf, pst_item_attach *attach, unsigned char **b){ |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
233 int32_t size=0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
234 pst_index_ll *ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
235 struct holder h = {b, NULL, 0, "", 0}; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
236 DEBUG_ENT("pst_attach_to_mem"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
237 if (attach->id_val != -1) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
238 ptr = _pst_getID(pf, attach->id_val); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
239 if (ptr) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
240 size = _pst_ff_getID2data(pf, ptr, &h); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
241 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
242 DEBUG_WARN(("Couldn't find ID pointer. Cannot handle attachment\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
243 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
244 attach->size = size; // may aswell update it to what is correct for this instance |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
245 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
246 size = attach->size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
247 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
248 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
249 return size; |
0 | 250 } |
251 | |
11 | 252 |
0 | 253 int32_t pst_attach_to_file(pst_file *pf, pst_item_attach *attach, FILE* fp) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
254 pst_index_ll *ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
255 struct holder h = {NULL, fp, 0, "", 0}; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
256 int32_t size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
257 DEBUG_ENT("pst_attach_to_file"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
258 if (attach->id_val != -1) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
259 ptr = _pst_getID(pf, attach->id_val); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
260 if (ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
261 size = _pst_ff_getID2data(pf, ptr, &h); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
262 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
263 DEBUG_WARN(("Couldn't find ID pointer. Cannot save attachment to file\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
264 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
265 attach->size = size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
266 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
267 // save the attachment to file |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
268 size = attach->size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
269 pst_fwrite(attach->data, 1, size, fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
270 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
271 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
272 return 1; |
0 | 273 } |
274 | |
11 | 275 |
0 | 276 int32_t pst_attach_to_file_base64(pst_file *pf, pst_item_attach *attach, FILE* fp) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
277 pst_index_ll *ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
278 struct holder h = {NULL, fp, 1, "", 0}; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
279 int32_t size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
280 char *c; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
281 DEBUG_ENT("pst_attach_to_file_base64"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
282 if (attach->id_val != -1) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
283 ptr = _pst_getID(pf, attach->id_val); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
284 if (ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
285 size = _pst_ff_getID2data(pf, ptr, &h); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
286 // will need to encode any bytes left over |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
287 c = base64_encode(h.base64_extra_chars, h.base64_extra); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
288 pst_fwrite(c, 1, strlen(c), fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
289 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
290 DEBUG_WARN (("Couldn't find ID pointer. Cannot save attachement to Base64\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
291 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
292 attach->size = size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
293 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
294 // encode the attachment to the file |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
295 c = base64_encode(attach->data, attach->size); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
296 pst_fwrite(c, 1, strlen(c), fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
297 size = attach->size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
298 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
299 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
300 return 1; |
0 | 301 } |
302 | |
11 | 303 |
0 | 304 int32_t pst_load_index (pst_file *pf) { |
11 | 305 int32_t x; |
306 u_int32_t y; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
307 DEBUG_ENT("pst_load_index"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
308 if (!pf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
309 WARN(("Cannot load index for a NULL pst_file\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
310 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
311 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
312 } |
0 | 313 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
314 x = _pst_build_id_ptr(pf, pf->index1, 0, pf->index1_count, -1, INT32_MAX); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
315 DEBUG_INDEX(("build id ptr returns %i\n", x)); |
0 | 316 |
11 | 317 y = 0; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
318 x = _pst_build_desc_ptr(pf, pf->index2, 0, pf->index2_count, &y, 0x21, INT32_MAX); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
319 DEBUG_INDEX(("build desc ptr returns %i\n", x)); |
0 | 320 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
321 DEBUG_CODE(_pst_printDptr(pf);); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
322 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
323 return 0; |
0 | 324 } |
325 | |
11 | 326 |
0 | 327 pst_desc_ll* pst_getNextDptr(pst_desc_ll* d) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
328 pst_desc_ll* r = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
329 DEBUG_ENT("pst_getNextDptr"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
330 if (d) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
331 if ((r = d->child) == NULL) { |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
332 while (!d->next && d->parent) d = d->parent; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
333 r = d->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
334 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
335 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
336 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
337 return r; |
0 | 338 } |
339 | |
11 | 340 |
0 | 341 typedef struct _pst_x_attrib { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
342 u_int16_t extended; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
343 u_int16_t zero; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
344 u_int16_t type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
345 u_int16_t map; |
0 | 346 } pst_x_attrib; |
347 | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
348 |
0 | 349 int32_t pst_load_extended_attributes(pst_file *pf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
350 // for PST files this will load up ID2 0x61 and check it's "list" attribute. |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
351 pst_desc_ll *p; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
352 pst_num_array *na; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
353 // pst_index_ll *list; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
354 pst_index2_ll *list2;//, *t; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
355 unsigned char * buffer=NULL, *headerbuffer=NULL;//, *tc; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
356 pst_x_attrib xattrib; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
357 int32_t bptr = 0, bsize, hsize, tint, err=0, x; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
358 pst_x_attrib_ll *ptr, *p_head=NULL, *p_sh=NULL, *p_sh2=NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
359 char *wt; |
0 | 360 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
361 DEBUG_ENT("pst_loadExtendedAttributes"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
362 if ((p = _pst_getDptr(pf, 0x61)) == NULL) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
363 DEBUG_WARN(("Cannot find DescID 0x61 for loading the Extended Attributes\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
364 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
365 return 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
366 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
367 if (p->list_index) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
368 list2 = _pst_build_id2(pf, p->list_index, NULL); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
369 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
370 if (!p->desc) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
371 DEBUG_WARN(("desc is NULL for item 0x61. Cannot load Extended Attributes\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
372 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
373 return 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
374 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
375 if ((na = _pst_parse_block(pf, p->desc->id, list2)) == NULL) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
376 DEBUG_WARN(("Cannot process desc block for item 0x61. Not loading extended Attributes\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
377 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
378 return 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
379 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
380 x = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
381 while (x < na->count_item) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
382 if (na->items[x]->id == 0x0003) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
383 buffer = na->items[x]->data; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
384 bsize = na->items[x]->size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
385 } else if (na->items[x]->id == 0x0004) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
386 headerbuffer = na->items[x]->data; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
387 hsize = na->items[x]->size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
388 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
389 x++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
390 } |
0 | 391 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
392 if (!buffer) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
393 DEBUG_WARN(("No extended attributes buffer found. Not processing\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
394 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
395 return 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
396 } |
0 | 397 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
398 memcpy(&xattrib, &(buffer[bptr]), sizeof(xattrib)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
399 LE16_CPU(xattrib.extended); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
400 LE16_CPU(xattrib.zero); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
401 LE16_CPU(xattrib.type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
402 LE16_CPU(xattrib.map); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
403 bptr += sizeof(xattrib); |
8 | 404 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
405 while (xattrib.type != 0 && bptr < bsize) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
406 ptr = (pst_x_attrib_ll*) xmalloc(sizeof(pst_x_attrib_ll)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
407 memset(ptr, 0, sizeof(pst_x_attrib_ll)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
408 ptr->type = xattrib.type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
409 ptr->map = xattrib.map+0x8000; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
410 ptr->next = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
411 DEBUG_INDEX(("xattrib: ext = %#hx, zero = %#hx, type = %#hx, map = %#hx\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
412 xattrib.extended, xattrib.zero, xattrib.type, xattrib.map)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
413 err=0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
414 if (xattrib.type & 0x0001) { // if the Bit 1 is set |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
415 // pointer to Unicode field in buffer |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
416 if (xattrib.extended < hsize) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
417 // copy the size of the header. It is 32 bit int |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
418 memcpy(&tint, &(headerbuffer[xattrib.extended]), sizeof(tint)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
419 LE32_CPU(tint); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
420 wt = (char*) xmalloc(tint+2); // plus 2 for a uni-code zero |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
421 memset(wt, 0, tint+2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
422 memcpy(wt, &(headerbuffer[xattrib.extended+sizeof(tint)]), tint); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
423 ptr->data = _pst_wide_to_single(wt, tint); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
424 DEBUG_INDEX(("Read string (converted from UTF-16): %s\n", ptr->data)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
425 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
426 DEBUG_INDEX(("Cannot read outside of buffer [%i !< %i]\n", xattrib.extended, hsize)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
427 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
428 ptr->mytype = PST_MAP_HEADER; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
429 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
430 // contains the attribute code to map to. |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
431 ptr->data = (int*)xmalloc(sizeof(int32_t)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
432 memset(ptr->data, 0, sizeof(int32_t)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
433 *((int32_t*)ptr->data) = xattrib.extended; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
434 ptr->mytype = PST_MAP_ATTRIB; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
435 DEBUG_INDEX(("Mapped attribute %#x to %#x\n", ptr->map, *((int32_t*)ptr->data))); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
436 } |
0 | 437 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
438 if (err==0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
439 // add it to the list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
440 p_sh = p_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
441 p_sh2 = NULL; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
442 while (p_sh && ptr->map > p_sh->map) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
443 p_sh2 = p_sh; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
444 p_sh = p_sh->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
445 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
446 if (!p_sh2) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
447 // needs to go before first item |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
448 ptr->next = p_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
449 p_head = ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
450 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
451 // it will go after p_sh2 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
452 ptr->next = p_sh2->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
453 p_sh2->next = ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
454 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
455 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
456 free(ptr); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
457 ptr = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
458 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
459 memcpy(&xattrib, &(buffer[bptr]), sizeof(xattrib)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
460 LE16_CPU(xattrib.extended); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
461 LE16_CPU(xattrib.zero); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
462 LE16_CPU(xattrib.type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
463 LE16_CPU(xattrib.map); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
464 bptr += sizeof(xattrib); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
465 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
466 if (buffer) free(buffer); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
467 if (headerbuffer) free(headerbuffer); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
468 pf->x_head = p_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
469 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
470 return 1; |
0 | 471 } |
472 | |
11 | 473 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
474 #define BLOCK_SIZE 516 // index blocks |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
475 #define DESC_BLOCK_SIZE 520 // descriptor blocks |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
476 #define ITEM_COUNT_OFFSET 0x1f0 // count byte |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
477 #define LEVEL_INDICATOR_OFFSET 0x1f3 // node or leaf |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
478 #define BACKLINK_OFFSET 0x1f8 // backlink u1 value |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
479 #define ITEM_SIZE 12 |
11 | 480 #define DESC_SIZE 16 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
481 #define INDEX_COUNT_MAX 41 // max active items |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
482 #define DESC_COUNT_MAX 31 // max active items |
0 | 483 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
484 int32_t _pst_build_id_ptr(pst_file *pf, int32_t offset, int32_t depth, int32_t linku1, int32_t start_val, int32_t end_val) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
485 struct _pst_table_ptr_struct table, table2; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
486 pst_index_ll *i_ptr=NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
487 pst_index index; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
488 int32_t x, item_count; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
489 int32_t old = start_val; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
490 char *buf = NULL, *bptr; |
0 | 491 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
492 DEBUG_ENT("_pst_build_id_ptr"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
493 DEBUG_INDEX(("offset %x depth %i linku1 %x start %x end %x\n", offset, depth, linku1, start_val, end_val)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
494 if (end_val <= start_val) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
495 DEBUG_WARN(("The end value is BEFORE the start value. This function will quit. Soz. [start:%#x, end:%#x]\n", start_val, end_val)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
496 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
497 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
498 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
499 DEBUG_INDEX(("Reading index block\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
500 if (_pst_read_block_size(pf, offset, BLOCK_SIZE, &buf, 0, 0) < BLOCK_SIZE) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
501 DEBUG_WARN(("Failed to read %i bytes\n", BLOCK_SIZE)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
502 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
503 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
504 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
505 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
506 bptr = buf; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
507 DEBUG_HEXDUMPC(buf, BLOCK_SIZE, ITEM_SIZE); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
508 item_count = (int)(unsigned)(buf[ITEM_COUNT_OFFSET]); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
509 if (item_count > INDEX_COUNT_MAX) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
510 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, INDEX_COUNT_MAX)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
511 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
512 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
513 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
514 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
515 memcpy(&index, buf+BACKLINK_OFFSET, sizeof(index)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
516 LE32_CPU(index.id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
517 if (index.id != linku1) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
518 DEBUG_WARN(("Backlink %#x in this node does not match required %#x\n", index.id, linku1)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
519 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
520 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
521 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
522 } |
0 | 523 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
524 if (buf[LEVEL_INDICATOR_OFFSET] == '\0') { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
525 // this node contains leaf pointers |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
526 x = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
527 while (x < item_count) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
528 memcpy(&index, bptr, sizeof(index)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
529 LE32_CPU(index.id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
530 LE32_CPU(index.offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
531 LE16_CPU(index.size); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
532 LE16_CPU(index.u1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
533 bptr += sizeof(index); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
534 x++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
535 if (index.id == 0) break; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
536 DEBUG_INDEX(("[%i]%i Item [id = %#x, offset = %#x, u1 = %#x, size = %i(%#x)]\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
537 depth, x, index.id, index.offset, index.u1, index.size, index.size)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
538 if (index.id & 0x02) DEBUG_INDEX(("two-bit set!!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
539 if ((index.id >= end_val) || (index.id < old)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
540 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
541 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
542 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
543 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
544 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
545 old = index.id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
546 if (x == 1) { // first entry |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
547 if ((start_val != -1) && (index.id != start_val)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
548 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
549 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
550 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
551 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
552 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
553 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
554 i_ptr = (pst_index_ll*) xmalloc(sizeof(pst_index_ll)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
555 i_ptr->id = index.id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
556 i_ptr->offset = index.offset; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
557 i_ptr->u1 = index.u1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
558 i_ptr->size = index.size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
559 i_ptr->next = NULL; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
560 if (pf->i_tail) pf->i_tail->next = i_ptr; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
561 if (!pf->i_head) pf->i_head = i_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
562 pf->i_tail = i_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
563 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
564 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
565 // this node contains node pointers |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
566 x = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
567 while (x < item_count) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
568 memcpy(&table, bptr, sizeof(table)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
569 LE32_CPU(table.start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
570 LE32_CPU(table.u1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
571 LE32_CPU(table.offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
572 bptr += sizeof(table); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
573 x++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
574 if (table.start == 0) break; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
575 if (x < item_count) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
576 memcpy(&table2, bptr, sizeof(table)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
577 LE32_CPU(table2.start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
578 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
579 else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
580 table2.start = end_val; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
581 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
582 DEBUG_INDEX(("[%i] %i Index Table [start id = %#x, u1 = %#x, offset = %#x, end id = %#x]\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
583 depth, x, table.start, table.u1, table.offset, table2.start)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
584 if ((table.start >= end_val) || (table.start < old)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
585 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
586 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
587 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
588 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
589 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
590 old = table.start; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
591 if (x == 1) { // first entry |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
592 if (start_val != -1 && table.start != start_val) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
593 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
594 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
595 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
596 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
597 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
598 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
599 _pst_build_id_ptr(pf, table.offset, depth+1, table.u1, table.start, table2.start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
600 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
601 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
602 if (buf) free (buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
603 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
604 return 0; |
0 | 605 } |
606 | |
8 | 607 |
11 | 608 int32_t _pst_build_desc_ptr (pst_file *pf, int32_t offset, int32_t depth, int32_t linku1, u_int32_t *high_id, int32_t start_val, int32_t end_val) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
609 struct _pst_table_ptr_struct table, table2; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
610 pst_desc desc_rec; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
611 pst_desc_ll *d_ptr=NULL, *d_par=NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
612 int32_t d_ptr_count = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
613 int32_t x, item_count; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
614 int32_t old = start_val; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
615 char *buf = NULL, *bptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
616 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
617 struct _pst_d_ptr_ll { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
618 pst_desc_ll * ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
619 int32_t parent; // used for lost and found lists |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
620 struct _pst_d_ptr_ll * next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
621 struct _pst_d_ptr_ll * prev; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
622 } *d_ptr_head=NULL, *d_ptr_tail=NULL, *d_ptr_ptr=NULL, *lf_ptr=NULL, *lf_head=NULL, *lf_shd=NULL, *lf_tmp; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
623 // lf_ptr and lf_head are used for the lost/found list. If the parent isn't found yet, put it on this |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
624 // list and check it each time you read a new item |
0 | 625 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
626 DEBUG_ENT("_pst_build_desc_ptr"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
627 DEBUG_INDEX(("offset %x depth %i linku1 %x start %x end %x\n", offset, depth, linku1, start_val, end_val)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
628 if (end_val <= start_val) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
629 DEBUG_WARN(("The end value is BEFORE the start value. This function will quit. Soz. [start:%#x, end:%#x]\n", start_val, end_val)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
630 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
631 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
632 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
633 DEBUG_INDEX(("Reading desc block\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
634 if (_pst_read_block_size(pf, offset, DESC_BLOCK_SIZE, &buf, 0, 0) < DESC_BLOCK_SIZE) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
635 DEBUG_WARN(("Failed to read %i bytes\n", DESC_BLOCK_SIZE)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
636 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
637 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
638 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
639 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
640 bptr = buf; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
641 item_count = (int)(unsigned)(buf[ITEM_COUNT_OFFSET]); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
642 memcpy(&desc_rec, buf+BACKLINK_OFFSET, sizeof(desc_rec)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
643 LE32_CPU(desc_rec.d_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
644 if (desc_rec.d_id != linku1) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
645 DEBUG_WARN(("Backlink %#x in this node does not match required %#x\n", desc_rec.d_id, linku1)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
646 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
647 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
648 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
649 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
650 if (buf[LEVEL_INDICATOR_OFFSET] == '\0') { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
651 // this node contains leaf pointers |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
652 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, 16); |
11 | 653 if (item_count > DESC_COUNT_MAX) { |
654 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, DESC_COUNT_MAX)); | |
655 if (buf) free(buf); | |
656 DEBUG_RET(); | |
657 return -1; | |
658 } | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
659 x = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
660 while (x < item_count) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
661 memcpy(&desc_rec, bptr, sizeof(desc_rec)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
662 LE32_CPU(desc_rec.d_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
663 LE32_CPU(desc_rec.desc_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
664 LE32_CPU(desc_rec.list_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
665 LE32_CPU(desc_rec.parent_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
666 bptr+= sizeof(desc_rec); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
667 x++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
668 if (desc_rec.d_id == 0) break; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
669 DEBUG_INDEX(("[%i] Item(%#x) = [d_id = %#x, desc_id = %#x, list_id = %#x, parent_id = %#x]\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
670 depth, x, desc_rec.d_id, desc_rec.desc_id, desc_rec.list_id, desc_rec.parent_id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
671 if ((desc_rec.d_id >= end_val) || (desc_rec.d_id < old)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
672 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
673 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, 16); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
674 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
675 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
676 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
677 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
678 old = desc_rec.d_id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
679 if (x == 1) { // first entry |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
680 if (start_val != -1 && desc_rec.d_id != start_val) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
681 DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
682 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
683 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
684 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
685 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
686 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
687 // When duplicates found, just update the info.... perhaps this is correct functionality |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
688 DEBUG_INDEX(("Searching for existing record\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
689 if (desc_rec.d_id <= *high_id && (d_ptr = _pst_getDptr(pf, desc_rec.d_id)) != NULL) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
690 DEBUG_INDEX(("Updating Existing Values\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
691 d_ptr->list_index = _pst_getID(pf, desc_rec.list_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
692 d_ptr->desc = _pst_getID(pf, desc_rec.desc_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
693 DEBUG_INDEX(("\tdesc = %#x\tlist_index=%#x\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
694 (d_ptr->desc==NULL?0:d_ptr->desc->id), |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
695 (d_ptr->list_index==NULL?0:d_ptr->list_index->id))); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
696 if (d_ptr->parent && desc_rec.parent_id != d_ptr->parent->id) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
697 DEBUG_INDEX(("WARNING -- Parent of record has changed. Moving it\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
698 //hmmm, we must move the record. |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
699 // first we must remove from current location |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
700 // change previous record to point next to our next |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
701 // if no previous, then use parent's child |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
702 // if no parent then change pf->d_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
703 // change next's prev to our prev |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
704 // if no next then change parent's child_tail |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
705 // if no parent then change pf->d_tail |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
706 if (d_ptr->prev) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
707 d_ptr->prev->next = d_ptr->next; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
708 else if (d_ptr->parent) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
709 d_ptr->parent->child = d_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
710 else |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
711 pf->d_head = d_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
712 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
713 if (d_ptr->next) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
714 d_ptr->next->prev = d_ptr->prev; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
715 else if (d_ptr->parent) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
716 d_ptr->parent->child_tail = d_ptr->prev; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
717 else |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
718 pf->d_tail = d_ptr->prev; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
719 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
720 d_ptr->prev = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
721 d_ptr->next = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
722 d_ptr->parent = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
723 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
724 // ok, now place in correct place |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
725 DEBUG_INDEX(("Searching for parent\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
726 if (desc_rec.parent_id == 0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
727 DEBUG_INDEX(("No Parent\n")); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
728 if (pf->d_tail) pf->d_tail->next = d_ptr; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
729 if (!pf->d_head) pf->d_head = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
730 d_ptr->prev = pf->d_tail; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
731 pf->d_tail = d_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
732 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
733 // check in the quick list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
734 d_ptr_ptr = d_ptr_head; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
735 while (d_ptr_ptr && (d_ptr_ptr->ptr->id != desc_rec.parent_id)) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
736 d_ptr_ptr = d_ptr_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
737 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
738 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
739 if (!d_ptr_ptr && (d_par = _pst_getDptr(pf, desc_rec.parent_id)) == NULL) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
740 // check in the lost/found list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
741 lf_ptr = lf_head; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
742 while (lf_ptr && lf_ptr->ptr->id != desc_rec.parent_id) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
743 lf_ptr = lf_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
744 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
745 if (!lf_ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
746 DEBUG_WARN(("ERROR -- not found parent with id %#x. Adding to lost/found\n", desc_rec.parent_id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
747 lf_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll)); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
748 lf_ptr->prev = NULL; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
749 lf_ptr->next = lf_head; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
750 lf_ptr->parent = desc_rec.parent_id; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
751 lf_ptr->ptr = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
752 lf_head = lf_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
753 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
754 d_par = lf_ptr->ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
755 DEBUG_INDEX(("Found parent (%#x) in Lost and Found\n", d_par->id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
756 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
757 } |
0 | 758 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
759 if (d_ptr_ptr || d_par) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
760 if (d_ptr_ptr) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
761 d_par = d_ptr_ptr->ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
762 else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
763 //add the d_par to the cache |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
764 DEBUG_INDEX(("Update - Cache addition\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
765 d_ptr_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
766 d_ptr_ptr->prev = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
767 d_ptr_ptr->next = d_ptr_head; |
11 | 768 d_ptr_ptr->ptr = d_par; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
769 d_ptr_head = d_ptr_ptr; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
770 if (!d_ptr_tail) d_ptr_tail = d_ptr_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
771 d_ptr_count++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
772 if (d_ptr_count > 100) { |
11 | 773 //remove on from the end |
774 d_ptr_ptr = d_ptr_tail; | |
775 d_ptr_tail = d_ptr_ptr->prev; | |
776 free (d_ptr_ptr); | |
777 d_ptr_count--; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
778 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
779 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
780 DEBUG_INDEX(("Found a parent\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
781 d_par->no_child++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
782 d_ptr->parent = d_par; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
783 if (d_par->child_tail) d_par->child_tail->next = d_ptr; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
784 if (!d_par->child) d_par->child = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
785 d_ptr->prev = d_par->child_tail; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
786 d_par->child_tail = d_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
787 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
788 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
789 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
790 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
791 if (*high_id < desc_rec.d_id) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
792 DEBUG_INDEX(("Updating New High\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
793 *high_id = desc_rec.d_id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
794 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
795 DEBUG_INDEX(("New Record\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
796 d_ptr = (pst_desc_ll*) xmalloc(sizeof(pst_desc_ll)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
797 d_ptr->id = desc_rec.d_id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
798 d_ptr->list_index = _pst_getID(pf, desc_rec.list_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
799 d_ptr->desc = _pst_getID(pf, desc_rec.desc_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
800 d_ptr->prev = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
801 d_ptr->next = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
802 d_ptr->parent = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
803 d_ptr->child = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
804 d_ptr->child_tail = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
805 d_ptr->no_child = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
806 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
807 DEBUG_INDEX(("Searching for parent\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
808 if (desc_rec.parent_id == 0 || desc_rec.parent_id == desc_rec.d_id) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
809 if (desc_rec.parent_id == 0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
810 DEBUG_INDEX(("No Parent\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
811 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
812 DEBUG_INDEX(("Record is its own parent. What is this world coming to?\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
813 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
814 if (pf->d_tail) pf->d_tail->next = d_ptr; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
815 if (!pf->d_head) pf->d_head = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
816 d_ptr->prev = pf->d_tail; |
11 | 817 pf->d_tail = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
818 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
819 d_ptr_ptr = d_ptr_head; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
820 while (d_ptr_ptr && (d_ptr_ptr->ptr->id != desc_rec.parent_id)) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
821 d_ptr_ptr = d_ptr_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
822 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
823 if (!d_ptr_ptr && (d_par = _pst_getDptr(pf, desc_rec.parent_id)) == NULL) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
824 // check in the lost/found list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
825 lf_ptr = lf_head; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
826 while (lf_ptr && (lf_ptr->ptr->id != desc_rec.parent_id)) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
827 lf_ptr = lf_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
828 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
829 if (!lf_ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
830 DEBUG_WARN(("ERROR -- not found parent with id %#x. Adding to lost/found\n", desc_rec.parent_id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
831 lf_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll)); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
832 lf_ptr->prev = NULL; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
833 lf_ptr->next = lf_head; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
834 lf_ptr->parent = desc_rec.parent_id; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
835 lf_ptr->ptr = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
836 lf_head = lf_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
837 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
838 d_par = lf_ptr->ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
839 DEBUG_INDEX(("Found parent (%#x) in Lost and Found\n", d_par->id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
840 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
841 } |
0 | 842 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
843 if (d_ptr_ptr || d_par) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
844 if (d_ptr_ptr) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
845 d_par = d_ptr_ptr->ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
846 else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
847 //add the d_par to the cache |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
848 DEBUG_INDEX(("Normal - Cache addition\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
849 d_ptr_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
850 d_ptr_ptr->prev = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
851 d_ptr_ptr->next = d_ptr_head; |
11 | 852 d_ptr_ptr->ptr = d_par; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
853 d_ptr_head = d_ptr_ptr; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
854 if (!d_ptr_tail) d_ptr_tail = d_ptr_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
855 d_ptr_count++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
856 if (d_ptr_count > 100) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
857 //remove one from the end |
11 | 858 d_ptr_ptr = d_ptr_tail; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
859 d_ptr_tail = d_ptr_ptr->prev; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
860 free (d_ptr_ptr); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
861 d_ptr_count--; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
862 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
863 } |
0 | 864 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
865 DEBUG_INDEX(("Found a parent\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
866 d_par->no_child++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
867 d_ptr->parent = d_par; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
868 if (d_par->child_tail) d_par->child_tail->next = d_ptr; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
869 if (!d_par->child) d_par->child = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
870 d_ptr->prev = d_par->child_tail; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
871 d_par->child_tail = d_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
872 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
873 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
874 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
875 // check here to see if d_ptr is the parent of any of the items in the lost / found list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
876 lf_ptr = lf_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
877 lf_shd = NULL; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
878 while (lf_ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
879 if (lf_ptr->parent == d_ptr->id) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
880 DEBUG_INDEX(("Found a child (%#x) of the current record. Joining to main structure.\n", lf_ptr->ptr->id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
881 d_par = d_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
882 d_ptr = lf_ptr->ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
883 d_par->no_child++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
884 d_ptr->parent = d_par; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
885 if (d_par->child_tail) d_par->child_tail->next = d_ptr; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
886 if (!d_par->child) d_par->child = d_ptr; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
887 d_ptr->prev = d_par->child_tail; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
888 d_par->child_tail = d_ptr; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
889 if (!lf_shd) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
890 lf_head = lf_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
891 else |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
892 lf_shd->next = lf_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
893 lf_tmp = lf_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
894 free(lf_ptr); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
895 lf_ptr = lf_tmp; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
896 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
897 lf_shd = lf_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
898 lf_ptr = lf_ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
899 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
900 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
901 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
902 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
903 // this node contains node pointers |
11 | 904 DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, ITEM_SIZE); |
905 if (item_count > INDEX_COUNT_MAX) { | |
906 DEBUG_WARN(("Item count %i too large, max is %i\n", item_count, INDEX_COUNT_MAX)); | |
907 if (buf) free(buf); | |
908 DEBUG_RET(); | |
909 return -1; | |
910 } | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
911 x = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
912 while (x < item_count) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
913 memcpy(&table, bptr, sizeof(table)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
914 LE32_CPU(table.start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
915 LE32_CPU(table.u1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
916 LE32_CPU(table.offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
917 bptr += sizeof(table); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
918 x++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
919 if (table.start == 0) break; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
920 if (x < item_count) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
921 memcpy(&table2, bptr, sizeof(table)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
922 LE32_CPU(table2.start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
923 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
924 else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
925 table2.start = end_val; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
926 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
927 DEBUG_INDEX(("[%i] %i Descriptor Table [start id = %#x, u1 = %#x, offset = %#x, end id = %#x]\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
928 depth, x, table.start, table.u1, table.offset, table2.start)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
929 if ((table.start >= end_val) || (table.start < old)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
930 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
931 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
932 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
933 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
934 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
935 old = table.start; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
936 if (x == 1) { // first entry |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
937 if (start_val != -1 && table.start != start_val) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
938 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
939 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
940 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
941 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
942 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
943 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
944 _pst_build_desc_ptr(pf, table.offset, depth+1, table.u1, high_id, table.start, table2.start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
945 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
946 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
947 // ok, lets try freeing the d_ptr_head cache here |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
948 while (d_ptr_head) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
949 d_ptr_ptr = d_ptr_head->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
950 free(d_ptr_head); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
951 d_ptr_head = d_ptr_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
952 } |
11 | 953 // TODO - need to free lost and found list also!! |
954 // TODO - and show error for any remaining lf items | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
955 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
956 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
957 return 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
958 } |
0 | 959 |
960 | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
961 void* _pst_parse_item(pst_file *pf, pst_desc_ll *d_ptr) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
962 pst_num_array * list; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
963 pst_index2_ll *id2_head = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
964 pst_index_ll *id_ptr = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
965 pst_item *item = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
966 pst_item_attach *attach = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
967 int x; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
968 DEBUG_ENT("_pst_parse_item"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
969 if (!d_ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
970 DEBUG_WARN(("you cannot pass me a NULL! I don't want it!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
971 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
972 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
973 } |
0 | 974 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
975 if (d_ptr->list_index) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
976 id2_head = _pst_build_id2(pf, d_ptr->list_index, NULL); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
977 _pst_printID2ptr(id2_head); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
978 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
979 DEBUG_WARN(("Have not been able to fetch any id2 values for this item. Brace yourself!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
980 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
981 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
982 if (!d_ptr->desc) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
983 DEBUG_WARN(("why is d_ptr->desc == NULL? I don't want to do anything else with this record\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
984 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
985 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
986 } |
0 | 987 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
988 if ((list = _pst_parse_block(pf, d_ptr->desc->id, id2_head)) == NULL) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
989 DEBUG_WARN(("_pst_parse_block() returned an error for d_ptr->desc->id [%#x]\n", d_ptr->desc->id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
990 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
991 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
992 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
993 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
994 item = (pst_item*) xmalloc(sizeof(pst_item)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
995 memset(item, 0, sizeof(pst_item)); |
0 | 996 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
997 if (_pst_process(list, item)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
998 DEBUG_WARN(("_pst_process() returned non-zero value. That is an error\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
999 _pst_free_list(list); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1000 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1001 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1002 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1003 _pst_free_list(list); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1004 list = NULL; //_pst_process will free the items in the list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1005 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1006 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1007 if ((id_ptr = _pst_getID2(id2_head, 0x671))) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1008 // attachements exist - so we will process them |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1009 while (item->attach) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1010 attach = item->attach->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1011 free(item->attach); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1012 item->attach = attach; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1013 } |
0 | 1014 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1015 DEBUG_EMAIL(("ATTACHEMENT processing attachement\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1016 if ((list = _pst_parse_block(pf, id_ptr->id, id2_head)) == NULL) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1017 DEBUG_WARN(("ERROR error processing main attachment record\n")); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1018 // DEBUG_RET(); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1019 // return NULL; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1020 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1021 else { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1022 x = 0; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1023 while (x < list->count_array) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1024 attach = (pst_item_attach*) xmalloc (sizeof(pst_item_attach)); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1025 memset (attach, 0, sizeof(pst_item_attach)); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1026 attach->next = item->attach; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1027 item->attach = attach; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1028 x++; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1029 } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1030 item->current_attach = item->attach; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1031 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1032 if (_pst_process(list, item)) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1033 DEBUG_WARN(("ERROR _pst_process() failed with attachments\n")); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1034 _pst_free_list(list); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1035 DEBUG_RET(); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1036 return NULL; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1037 } |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1038 _pst_free_list(list); |
0 | 1039 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1040 // now we will have initial information of each attachment stored in item->attach... |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1041 // we must now read the secondary record for each based on the id2 val associated with |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1042 // each attachment |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1043 attach = item->attach; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1044 while (attach) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1045 if ((id_ptr = _pst_getID2(id2_head, attach->id2_val))) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1046 // id_ptr is a record describing the attachment |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1047 // we pass NULL instead of id2_head cause we don't want it to |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1048 // load all the extra stuff here. |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1049 if ((list = _pst_parse_block(pf, id_ptr->id, NULL)) == NULL) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1050 DEBUG_WARN(("ERROR error processing an attachment record\n")); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1051 attach = attach->next; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1052 continue; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1053 } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1054 item->current_attach = attach; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1055 if (_pst_process(list, item)) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1056 DEBUG_WARN(("ERROR _pst_process() failed with an attachment\n")); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1057 _pst_free_list(list); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1058 attach = attach->next; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1059 continue; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1060 } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1061 _pst_free_list(list); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1062 if ((id_ptr = _pst_getID2(id2_head, attach->id2_val))) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1063 // id2_val has been updated to the ID2 value of the datablock containing the |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1064 // attachment data |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1065 attach->id_val = id_ptr->id; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1066 } else { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1067 DEBUG_WARN(("have not located the correct value for the attachment [%#x]\n", attach->id2_val)); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1068 } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1069 } else { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1070 DEBUG_WARN(("ERROR cannot locate id2 value %#x\n", attach->id2_val)); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1071 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1072 attach = attach->next; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1073 } |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1074 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1075 item->current_attach = item->attach; //reset back to first |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1076 } |
0 | 1077 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1078 _pst_free_id2(id2_head); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1079 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1080 return item; |
0 | 1081 } |
1082 | |
11 | 1083 |
0 | 1084 pst_num_array * _pst_parse_block(pst_file *pf, u_int32_t block_id, pst_index2_ll *i2_head) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1085 unsigned char *buf = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1086 pst_num_array *na_ptr = NULL, *na_head = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1087 pst_block_offset block_offset; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1088 // pst_index_ll *rec = NULL; |
11 | 1089 u_int32_t size = 0, t_ptr = 0, fr_ptr = 0, to_ptr = 0, ind_ptr = 0, x = 0; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1090 u_int32_t num_recs = 0, count_rec = 0, ind2_ptr = 0, list_start = 0, num_list = 0, cur_list = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1091 int32_t block_type, rec_size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1092 size_t read_size=0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1093 pst_x_attrib_ll *mapptr; |
0 | 1094 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1095 struct { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1096 u_int16_t type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1097 u_int16_t ref_type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1098 u_int32_t value; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1099 } table_rec; //for type 1 ("BC") blocks |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1100 struct { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1101 u_int16_t ref_type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1102 u_int16_t type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1103 u_int16_t ind2_off; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1104 u_int16_t u1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1105 } table2_rec; //for type 2 ("7C") blocks |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1106 struct { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1107 u_int16_t index_offset; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1108 u_int16_t type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1109 u_int16_t offset; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1110 } block_hdr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1111 struct { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1112 unsigned char seven_c; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1113 unsigned char item_count; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1114 u_int16_t u1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1115 u_int16_t u2; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1116 u_int16_t u3; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1117 u_int16_t rec_size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1118 u_int16_t b_five_offset; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1119 u_int16_t u5; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1120 u_int16_t ind2_offset; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1121 u_int16_t u6; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1122 u_int16_t u7; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1123 u_int16_t u8; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1124 } seven_c_blk; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1125 struct _type_d_rec { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1126 u_int32_t id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1127 u_int32_t u1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1128 } * type_d_rec; |
0 | 1129 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1130 DEBUG_ENT("_pst_parse_block"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1131 if ((read_size = _pst_ff_getIDblock_dec(pf, block_id, &buf)) == 0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1132 WARN(("Error reading block id %#x\n", block_id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1133 if (buf) free (buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1134 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1135 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1136 } |
0 | 1137 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1138 memcpy(&block_hdr, buf, sizeof(block_hdr)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1139 LE16_CPU(block_hdr.index_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1140 LE16_CPU(block_hdr.type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1141 LE16_CPU(block_hdr.offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1142 DEBUG_EMAIL(("block header (index_offset=%#hx, type=%#hx, offset=%#hx\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset)); |
0 | 1143 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1144 ind_ptr = block_hdr.index_offset; |
8 | 1145 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1146 if (block_hdr.type == 0xBCEC) { //type 1 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1147 block_type = 1; |
8 | 1148 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1149 _pst_getBlockOffset(buf, read_size, ind_ptr, block_hdr.offset, &block_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1150 fr_ptr = block_offset.from; |
8 | 1151 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1152 memcpy(&table_rec, &(buf[fr_ptr]), sizeof(table_rec)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1153 LE16_CPU(table_rec.type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1154 LE16_CPU(table_rec.ref_type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1155 LE32_CPU(table_rec.value); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1156 DEBUG_EMAIL(("table_rec (type=%#hx, ref_type=%#hx, value=%#x\n", table_rec.type, table_rec.ref_type, table_rec.value)); |
0 | 1157 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1158 if (table_rec.type != 0x02B5) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1159 WARN(("Unknown second block constant - %#X for id %#x\n", table_rec.type, block_id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1160 DEBUG_HEXDUMPC(buf, sizeof(table_rec), 0x10); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1161 if (buf) free (buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1162 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1163 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1164 } |
0 | 1165 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1166 _pst_getBlockOffset(buf, read_size, ind_ptr, table_rec.value, &block_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1167 list_start = fr_ptr = block_offset.from; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1168 to_ptr = block_offset.to; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1169 num_list = (to_ptr - fr_ptr)/sizeof(table_rec); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1170 num_recs = 1; // only going to one object in these blocks |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1171 rec_size = 0; // doesn't matter cause there is only one object |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1172 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1173 else if (block_hdr.type == 0x7CEC) { //type 2 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1174 block_type = 2; |
8 | 1175 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1176 _pst_getBlockOffset(buf, read_size, ind_ptr, block_hdr.offset, &block_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1177 fr_ptr = block_offset.from; //now got pointer to "7C block" |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1178 memset(&seven_c_blk, 0, sizeof(seven_c_blk)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1179 memcpy(&seven_c_blk, &(buf[fr_ptr]), sizeof(seven_c_blk)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1180 LE16_CPU(seven_c_blk.u1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1181 LE16_CPU(seven_c_blk.u2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1182 LE16_CPU(seven_c_blk.u3); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1183 LE16_CPU(seven_c_blk.rec_size); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1184 LE16_CPU(seven_c_blk.b_five_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1185 LE16_CPU(seven_c_blk.u5); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1186 LE16_CPU(seven_c_blk.ind2_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1187 LE16_CPU(seven_c_blk.u6); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1188 LE16_CPU(seven_c_blk.u7); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1189 LE16_CPU(seven_c_blk.u8); |
0 | 1190 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1191 list_start = fr_ptr + sizeof(seven_c_blk); // the list of item numbers start after this record |
0 | 1192 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1193 if (seven_c_blk.seven_c != 0x7C) { // this would mean it isn't a 7C block! |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1194 WARN(("Error. There isn't a 7C where I want to see 7C!\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1195 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1196 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1197 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1198 } |
0 | 1199 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1200 rec_size = seven_c_blk.rec_size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1201 num_list = seven_c_blk.item_count; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1202 DEBUG_EMAIL(("b5 offset = %#x\n", seven_c_blk.b_five_offset)); |
0 | 1203 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1204 _pst_getBlockOffset(buf, read_size, ind_ptr, seven_c_blk.b_five_offset, &block_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1205 fr_ptr = block_offset.from; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1206 memcpy(&table_rec, &(buf[fr_ptr]), sizeof(table_rec)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1207 DEBUG_EMAIL(("before convert %#x\n", table_rec.type)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1208 LE16_CPU(table_rec.type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1209 DEBUG_EMAIL(("after convert %#x\n", table_rec.type)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1210 LE16_CPU(table_rec.ref_type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1211 LE32_CPU(table_rec.value); |
0 | 1212 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1213 if (table_rec.type != 0x04B5) { // different constant than a type 1 record |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1214 WARN(("Unknown second block constant - %#X for id %#x\n", table_rec.type, block_id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1215 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1216 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1217 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1218 } |
0 | 1219 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1220 if (table_rec.value == 0) { // this is for the 2nd index offset |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1221 DEBUG_INFO(("reference to second index block is zero. ERROR\n")); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1222 if (buf) free(buf); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1223 DEBUG_RET(); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1224 return NULL; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1225 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1226 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1227 _pst_getBlockOffset(buf, read_size, ind_ptr, table_rec.value, &block_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1228 num_recs = (block_offset.to - block_offset.from) / 6; // this will give the number of records in this block |
8 | 1229 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1230 _pst_getBlockOffset(buf, read_size, ind_ptr, seven_c_blk.ind2_offset, &block_offset); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1231 ind2_ptr = block_offset.from; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1232 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1233 WARN(("ERROR: Unknown block constant - %#X for id %#x\n", block_hdr.type, block_id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1234 DEBUG_HEXDUMPC(buf, read_size,0x10); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1235 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1236 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1237 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1238 } |
0 | 1239 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1240 DEBUG_EMAIL(("Mallocing number of items %i\n", num_recs)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1241 while (count_rec < num_recs) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1242 na_ptr = (pst_num_array*) xmalloc(sizeof(pst_num_array)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1243 memset(na_ptr, 0, sizeof(pst_num_array)); |
11 | 1244 na_ptr->next = na_head; |
1245 na_head = na_ptr; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1246 // allocate an array of count num_recs to contain sizeof(struct_pst_num_item) |
11 | 1247 na_ptr->items = (struct _pst_num_item**) xmalloc(sizeof(struct _pst_num_item)*num_list); |
1248 na_ptr->count_item = num_list; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1249 na_ptr->count_array = num_recs; // each record will have a record of the total number of records |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1250 x = 0; |
0 | 1251 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1252 DEBUG_EMAIL(("going to read %i (%#x) items\n", na_ptr->count_item, na_ptr->count_item)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1253 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1254 fr_ptr = list_start; // init fr_ptr to the start of the list. |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1255 cur_list = 0; |
11 | 1256 while (cur_list < num_list) { //we will increase fr_ptr as we progress through index |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1257 if (block_type == 1) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1258 memcpy(&table_rec, &(buf[fr_ptr]), sizeof(table_rec)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1259 LE16_CPU(table_rec.type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1260 LE16_CPU(table_rec.ref_type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1261 fr_ptr += sizeof(table_rec); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1262 } else if (block_type == 2) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1263 // we will copy the table2_rec values into a table_rec record so that we can keep the rest of the code |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1264 memcpy(&table2_rec, &(buf[fr_ptr]), sizeof(table2_rec)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1265 LE16_CPU(table2_rec.ref_type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1266 LE16_CPU(table2_rec.type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1267 LE16_CPU(table2_rec.ind2_off); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1268 LE16_CPU(table2_rec.u1); |
0 | 1269 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1270 // table_rec and table2_rec are arranged differently, so assign the values across |
11 | 1271 table_rec.type = table2_rec.type; |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1272 table_rec.ref_type = table2_rec.ref_type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1273 if ((ind2_ptr+table2_rec.ind2_off > 0) && |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1274 (ind2_ptr+table2_rec.ind2_off < read_size-sizeof(table_rec.value))) |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1275 memcpy(&(table_rec.value), &(buf[ind2_ptr+table2_rec.ind2_off]), sizeof(table_rec.value)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1276 else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1277 DEBUG_WARN (("trying to read more than blocks size. Size=%#x, Req.=%#x," |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1278 " Req Size=%#x\n", read_size, ind2_ptr+table2_rec.ind2_off, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1279 sizeof(table_rec.value))); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1280 } |
0 | 1281 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1282 fr_ptr += sizeof(table2_rec); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1283 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1284 WARN(("Missing code for block_type %i\n", block_type)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1285 if (buf) free(buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1286 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1287 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1288 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1289 cur_list++; // get ready to read next bit from list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1290 DEBUG_EMAIL(("reading block %i (type=%#x, ref_type=%#x, value=%#x)\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1291 x, table_rec.type, table_rec.ref_type, table_rec.value)); |
8 | 1292 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1293 na_ptr->items[x] = (struct _pst_num_item*) xmalloc(sizeof(struct _pst_num_item)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1294 memset(na_ptr->items[x], 0, sizeof(struct _pst_num_item)); //init it |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1295 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1296 // check here to see if the id of the attribute is a mapped one |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1297 mapptr = pf->x_head; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1298 while (mapptr && (mapptr->map < table_rec.type)) mapptr = mapptr->next; |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1299 if (mapptr && (mapptr->map == table_rec.type)) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1300 if (mapptr->mytype == PST_MAP_ATTRIB) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1301 na_ptr->items[x]->id = *((int*)mapptr->data); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1302 DEBUG_EMAIL(("Mapped attrib %#x to %#x\n", table_rec.type, na_ptr->items[x]->id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1303 } else if (mapptr->mytype == PST_MAP_HEADER) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1304 DEBUG_EMAIL(("Internet Header mapping found %#x\n", table_rec.type)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1305 na_ptr->items[x]->id = PST_ATTRIB_HEADER; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1306 na_ptr->items[x]->extra = mapptr->data; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1307 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1308 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1309 na_ptr->items[x]->id = table_rec.type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1310 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1311 na_ptr->items[x]->type = 0; // checked later before it is set |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1312 /* Reference Types |
0 | 1313 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1314 2 - 0x0002 - Signed 16bit value |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1315 3 - 0x0003 - Signed 32bit value |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1316 4 - 0x0004 - 4-byte floating point |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1317 5 - 0x0005 - Floating point double |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1318 6 - 0x0006 - Signed 64-bit int |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1319 7 - 0x0007 - Application Time |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1320 10 - 0x000A - 32-bit error value |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1321 11 - 0x000B - Boolean (non-zero = true) |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1322 13 - 0x000D - Embedded Object |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1323 20 - 0x0014 - 8-byte signed integer (64-bit) |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1324 30 - 0x001E - Null terminated String |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1325 31 - 0x001F - Unicode string |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1326 64 - 0x0040 - Systime - Filetime structure |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1327 72 - 0x0048 - OLE Guid |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1328 258 - 0x0102 - Binary data |
0 | 1329 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1330 - 0x1003 - Array of 32bit values |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1331 - 0x1014 - Array of 64bit values |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1332 - 0x101E - Array of Strings |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1333 - 0x1102 - Array of Binary data |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1334 */ |
0 | 1335 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1336 if (table_rec.ref_type == 0x0003 || table_rec.ref_type == 0x000b |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1337 || table_rec.ref_type == 0x0002) { //contains data |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1338 na_ptr->items[x]->data = xmalloc(sizeof(int32_t)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1339 memcpy(na_ptr->items[x]->data, &(table_rec.value), sizeof(int32_t)); |
0 | 1340 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1341 na_ptr->items[x]->size = sizeof(int32_t); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1342 na_ptr->items[x]->type = table_rec.ref_type; |
8 | 1343 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1344 } else if (table_rec.ref_type == 0x0005 || table_rec.ref_type == 0x000D |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1345 || table_rec.ref_type == 0x1003 || table_rec.ref_type == 0x0014 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1346 || table_rec.ref_type == 0x001E || table_rec.ref_type == 0x0102 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1347 || table_rec.ref_type == 0x0040 || table_rec.ref_type == 0x101E |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1348 || table_rec.ref_type == 0x0048 || table_rec.ref_type == 0x1102 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1349 || table_rec.ref_type == 0x1014) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1350 //contains index_ref to data |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1351 LE32_CPU(table_rec.value); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1352 if ((table_rec.value & 0x0000000F) == 0xF) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1353 // if value ends in 'F' then this should be an id2 value |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1354 DEBUG_EMAIL(("Found id2 [%#x] value. Will follow it\n", table_rec.value)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1355 if ((na_ptr->items[x]->size = _pst_ff_getID2block(pf, table_rec.value, i2_head, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1356 &(na_ptr->items[x]->data)))==0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1357 DEBUG_WARN(("not able to read the ID2 data. Setting to be read later. %#x\n", table_rec.value)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1358 na_ptr->items[x]->size = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1359 na_ptr->items[x]->data = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1360 na_ptr->items[x]->type = table_rec.value; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1361 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1362 } else if (table_rec.value != 0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1363 if ((table_rec.value >> 4)+ind_ptr > read_size) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1364 // check that we will not be outside the buffer we have read |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1365 DEBUG_WARN(("table_rec.value [%#x] is outside of block [%#x]\n", table_rec.value, read_size)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1366 na_ptr->count_item --; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1367 continue; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1368 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1369 if (_pst_getBlockOffset(buf, read_size, ind_ptr, table_rec.value, &block_offset)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1370 DEBUG_WARN(("failed to get block offset for table_rec.value of %#x\n", table_rec.value)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1371 na_ptr->count_item --; //we will be skipping a row |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1372 continue; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1373 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1374 t_ptr = block_offset.from; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1375 if (t_ptr <= block_offset.to) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1376 na_ptr->items[x]->size = size = block_offset.to - t_ptr; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1377 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1378 DEBUG_WARN(("I don't want to malloc less than zero sized block. from=%#x, to=%#x." |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1379 "Will change to 1 byte\n", block_offset.from, block_offset.to)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1380 na_ptr->items[x]->size = size = 0; // the malloc statement will add one to this |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1381 } |
8 | 1382 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1383 // plus one for good luck (and strings) we will null terminate all reads |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1384 na_ptr->items[x]->data = (char*) xmalloc(size+1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1385 memcpy(na_ptr->items[x]->data, &(buf[t_ptr]), size); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1386 na_ptr->items[x]->data[size] = '\0'; // null terminate buffer |
8 | 1387 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1388 if (table_rec.ref_type == 0xd) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1389 // there is still more to do for the type of 0xD |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1390 type_d_rec = (struct _type_d_rec*) na_ptr->items[x]->data; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1391 LE32_CPU(type_d_rec->id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1392 if ((na_ptr->items[x]->size = _pst_ff_getID2block(pf, type_d_rec->id, i2_head, &(na_ptr->items[x]->data)))==0){ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1393 DEBUG_WARN(("not able to read the ID2 data. Setting to be read later. %#x\n", |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1394 type_d_rec->id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1395 na_ptr->items[x]->size = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1396 na_ptr->items[x]->data = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1397 na_ptr->items[x]->type = type_d_rec->id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1398 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1399 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1400 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1401 DEBUG_EMAIL(("Ignoring 0 value in offset\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1402 if (na_ptr->items[x]->data) |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1403 free (na_ptr->items[x]->data); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1404 na_ptr->items[x]->data = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1405 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1406 free(na_ptr->items[x]); |
8 | 1407 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1408 na_ptr->count_item--; // remove this item from the destination list |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1409 continue; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1410 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1411 if (na_ptr->items[x]->type == 0) |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1412 //it can be used to convey information |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1413 // to later functions |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1414 na_ptr->items[x]->type = table_rec.ref_type; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1415 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1416 WARN(("ERROR Unknown ref_type %#x\n", table_rec.ref_type)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1417 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1418 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1419 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1420 x++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1421 } |
11 | 1422 DEBUG_EMAIL(("increasing ind2_ptr by %i [%#x] bytes. Was %#x, Now %#x\n", rec_size, rec_size, ind2_ptr, ind2_ptr+rec_size)); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1423 ind2_ptr += rec_size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1424 count_rec++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1425 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1426 if (buf) free(buf); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1427 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1428 return na_head; |
0 | 1429 } |
1430 | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1431 |
0 | 1432 // check if item->email is NULL, and init if so |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1433 #define MALLOC_EMAIL(x) { if (!x->email) { x->email = (pst_item_email*) xmalloc(sizeof(pst_item_email)); memset(x->email, 0, sizeof(pst_item_email) );} } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1434 #define MALLOC_FOLDER(x) { if (!x->folder) { x->folder = (pst_item_folder*) xmalloc(sizeof(pst_item_folder)); memset(x->folder, 0, sizeof(pst_item_folder) );} } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1435 #define MALLOC_CONTACT(x) { if (!x->contact) { x->contact = (pst_item_contact*) xmalloc(sizeof(pst_item_contact)); memset(x->contact, 0, sizeof(pst_item_contact) );} } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1436 #define MALLOC_MESSAGESTORE(x) { if (!x->message_store) { x->message_store = (pst_item_message_store*) xmalloc(sizeof(pst_item_message_store)); memset(x->message_store, 0, sizeof(pst_item_message_store));} } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1437 #define MALLOC_JOURNAL(x) { if (!x->journal) { x->journal = (pst_item_journal*) xmalloc(sizeof(pst_item_journal)); memset(x->journal, 0, sizeof(pst_item_journal) );} } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1438 #define MALLOC_APPOINTMENT(x) { if (!x->appointment) { x->appointment = (pst_item_appointment*) xmalloc(sizeof(pst_item_appointment)); memset(x->appointment, 0, sizeof(pst_item_appointment) );} } |
0 | 1439 // malloc space and copy the current item's data -- plus one on the size for good luck (and string termination) |
1440 #define LIST_COPY(targ, type) { \ | |
11 | 1441 targ = type realloc(targ, list->items[x]->size+1); \ |
1442 memset(targ, 0, list->items[x]->size+1); \ | |
1443 memcpy(targ, list->items[x]->data, list->items[x]->size); \ | |
0 | 1444 } |
1445 | |
11 | 1446 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1447 /* free(list->items[x]->data); \ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1448 list->items[x]->data=NULL; \*/ |
0 | 1449 |
1450 //#define INC_CHECK_X() { if (++x >= list->count_item) break; } | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1451 #define NULL_CHECK(x) { if (!x) { DEBUG_EMAIL(("NULL_CHECK: Null Found\n")); break;} } |
0 | 1452 |
1453 #define MOVE_NEXT(targ) { \ | |
11 | 1454 if (next){\ |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1455 if (!targ) {\ |
11 | 1456 DEBUG_EMAIL(("MOVE_NEXT: Target is NULL. Will stop processing this option\n"));\ |
1457 break;\ | |
1458 }\ | |
1459 targ = targ->next;\ | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1460 if (!targ) {\ |
11 | 1461 DEBUG_EMAIL(("MOVE_NEXT: Target is NULL after next. Will stop processing this option\n"));\ |
1462 break;\ | |
1463 }\ | |
1464 next=0;\ | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1465 }\ |
0 | 1466 } |
8 | 1467 |
11 | 1468 |
0 | 1469 int32_t _pst_process(pst_num_array *list , pst_item *item) { |
11 | 1470 int32_t x, t; |
1471 int32_t next = 0; | |
1472 pst_item_attach *attach; | |
1473 pst_item_extra_field *ef; | |
0 | 1474 |
11 | 1475 DEBUG_ENT("_pst_process"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1476 if (!item) { |
11 | 1477 DEBUG_EMAIL(("item cannot be NULL.\n")); |
1478 DEBUG_RET(); | |
1479 return -1; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
1480 } |
11 | 1481 |
1482 attach = item->current_attach; // a working variable | |
1483 | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
1484 while (list) { |
11 | 1485 x = 0; |
1486 while (x < list->count_item) { | |
1487 // check here to see if the id is one that is mapped. | |
1488 DEBUG_EMAIL(("#%d - id: %#x type: %#x length: %#x\n", x, list->items[x]->id, list->items[x]->type, list->items[x]->size)); | |
1489 | |
1490 switch (list->items[x]->id) { | |
1491 case PST_ATTRIB_HEADER: // CUSTOM attribute for saying the Extra Headers | |
1492 DEBUG_EMAIL(("Extra Field - ")); | |
1493 ef = (pst_item_extra_field*) xmalloc(sizeof(pst_item_extra_field)); | |
1494 memset(ef, 0, sizeof(pst_item_extra_field)); | |
1495 ef->field_name = (char*) xmalloc(strlen(list->items[x]->extra)+1); | |
1496 strcpy(ef->field_name, list->items[x]->extra); | |
1497 LIST_COPY(ef->value, (char*)); | |
1498 ef->next = item->extra_fields; | |
1499 item->extra_fields = ef; | |
1500 DEBUG_EMAIL(("\"%s\" = \"%s\"\n", ef->field_name, ef->value)); | |
1501 break; | |
1502 case 0x0002: // PR_ALTERNATE_RECIPIENT_ALLOWED | |
1503 // If set to true, the sender allows this email to be autoforwarded | |
1504 DEBUG_EMAIL(("AutoForward allowed - ")); | |
1505 MALLOC_EMAIL(item); | |
1506 if (*((short int*)list->items[x]->data) != 0) { | |
1507 DEBUG_EMAIL(("True\n")); | |
1508 item->email->autoforward = 1; | |
1509 } else { | |
1510 DEBUG_EMAIL(("False\n")); | |
1511 item->email->autoforward = -1; | |
1512 } | |
1513 // INC_CHECK_X(); | |
1514 break; | |
1515 case 0x0003: // Extended Attributes table | |
1516 DEBUG_EMAIL(("Extended Attributes Table - NOT PROCESSED\n")); | |
1517 break; | |
1518 case 0x0017: // PR_IMPORTANCE | |
1519 // How important the sender deems it to be | |
1520 // 0 - Low | |
1521 // 1 - Normal | |
1522 // 2 - High | |
1523 | |
1524 DEBUG_EMAIL(("Importance Level - ")); | |
1525 MALLOC_EMAIL(item); | |
1526 memcpy(&(item->email->importance), list->items[x]->data, sizeof(item->email->importance)); | |
1527 LE32_CPU(item->email->importance); | |
1528 t = item->email->importance; | |
1529 DEBUG_EMAIL(("%s [%i]\n", (t==0?"Low":(t==1?"Normal":"High")), t)); | |
1530 // INC_CHECK_X(); | |
1531 break; | |
1532 case 0x001A: // PR_MESSAGE_CLASS Ascii type of messages - NOT FOLDERS | |
1533 // must be case insensitive | |
1534 DEBUG_EMAIL(("IPM.x - ")); | |
1535 LIST_COPY(item->ascii_type, (char*)); | |
1536 if (pst_strincmp("IPM.Note", item->ascii_type, 8) == 0) | |
1537 // the string begins with IPM.Note... | |
1538 item->type = PST_TYPE_NOTE; | |
1539 else if (pst_stricmp("IPM", item->ascii_type) == 0) | |
1540 // the whole string is just IPM | |
1541 item->type = PST_TYPE_NOTE; | |
1542 else if (pst_strincmp("IPM.Contact", item->ascii_type, 11) == 0) | |
1543 // the string begins with IPM.Contact... | |
1544 item->type = PST_TYPE_CONTACT; | |
1545 else if (pst_strincmp("REPORT.IPM.Note", item->ascii_type, 15) == 0) | |
1546 // the string begins with the above | |
1547 item->type = PST_TYPE_REPORT; | |
1548 else if (pst_strincmp("IPM.Activity", item->ascii_type, 12) == 0) | |
1549 item->type = PST_TYPE_JOURNAL; | |
1550 else if (pst_strincmp("IPM.Appointment", item->ascii_type, 15) == 0) | |
1551 item->type = PST_TYPE_APPOINTMENT; | |
1552 else | |
1553 item->type = PST_TYPE_OTHER; | |
1554 | |
1555 DEBUG_EMAIL(("%s\n", item->ascii_type)); | |
1556 // INC_CHECK_X(); //increment x here so that the next if statement has a chance of matching the next item | |
1557 break; | |
1558 case 0x0023: // PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED | |
1559 // set if the sender wants a delivery report from all recipients | |
1560 DEBUG_EMAIL(("Global Delivery Report - ")); | |
1561 MALLOC_EMAIL(item); | |
1562 if (*(int16_t*)list->items[x]->data != 0) { | |
1563 DEBUG_EMAIL(("True\n")); | |
1564 item->email->delivery_report = 1; | |
1565 } else { | |
1566 DEBUG_EMAIL(("False\n")); | |
1567 item->email->delivery_report = 0; | |
1568 } | |
1569 // INC_CHECK_X(); | |
1570 break; | |
1571 case 0x0026: // PR_PRIORITY | |
1572 // Priority of a message | |
1573 // -1 NonUrgent | |
1574 // 0 Normal | |
1575 // 1 Urgent | |
1576 DEBUG_EMAIL(("Priority - ")); | |
1577 MALLOC_EMAIL(item); | |
1578 memcpy(&(item->email->priority), list->items[x]->data, sizeof(item->email->priority)); | |
1579 LE32_CPU(item->email->priority); | |
1580 t = item->email->priority; | |
1581 DEBUG_EMAIL(("%s [%i]\n", (t<0?"NonUrgent":(t==0?"Normal":"Urgent")), t)); | |
1582 // INC_CHECK_X(); | |
1583 break; | |
1584 case 0x0029:// PR_READ_RECEIPT_REQUESTED | |
1585 DEBUG_EMAIL(("Read Receipt - ")); | |
1586 MALLOC_EMAIL(item); | |
1587 if (*(short int*)list->items[x]->data != 0) { | |
1588 DEBUG_EMAIL(("True\n")); | |
1589 item->email->read_receipt = 1; | |
1590 } else { | |
1591 DEBUG_EMAIL(("False\n")); | |
1592 item->email->read_receipt = 0; | |
1593 } | |
1594 // INC_CHECK_X(); | |
1595 break; | |
1596 case 0x002B: // PR_RECIPIENT_REASSIGNMENT_PROHIBITED | |
1597 DEBUG_EMAIL(("Reassignment Prohibited (Private) - ")); | |
1598 if (*(short int*)list->items[x]->data != 0) { | |
1599 DEBUG_EMAIL(("True\n")); | |
1600 item->private_member = 1; | |
1601 } else { | |
1602 DEBUG_EMAIL(("False\n")); | |
1603 item->private_member = 0; | |
1604 } | |
1605 break; | |
1606 case 0x002E: // PR_ORIGINAL_SENSITIVITY | |
1607 // the sensitivity of the message before being replied to or forwarded | |
1608 // 0 - None | |
1609 // 1 - Personal | |
1610 // 2 - Private | |
1611 // 3 - Company Confidential | |
1612 DEBUG_EMAIL(("Original Sensitivity - ")); | |
1613 MALLOC_EMAIL(item); | |
1614 memcpy(&(item->email->orig_sensitivity), list->items[x]->data, sizeof(item->email->orig_sensitivity)); | |
1615 LE32_CPU(item->email->orig_sensitivity); | |
1616 t = item->email->orig_sensitivity; | |
1617 DEBUG_EMAIL(("%s [%i]\n", (t==0?"None":(t==1?"Personal": | |
1618 (t==2?"Private":"Company Confidential"))), t)); | |
1619 // INC_CHECK_X(); | |
1620 break; | |
1621 case 0x0036: // PR_SENSITIVITY | |
1622 // sender's opinion of the sensitivity of an email | |
1623 // 0 - None | |
1624 // 1 - Personal | |
1625 // 2 - Private | |
1626 // 3 - Company Confidiential | |
1627 DEBUG_EMAIL(("Sensitivity - ")); | |
1628 MALLOC_EMAIL(item); | |
1629 memcpy(&(item->email->sensitivity), list->items[x]->data, sizeof(item->email->sensitivity)); | |
1630 LE32_CPU(item->email->sensitivity); | |
1631 t = item->email->sensitivity; | |
1632 DEBUG_EMAIL(("%s [%i]\n", (t==0?"None":(t==1?"Personal": | |
1633 (t==2?"Private":"Company Confidential"))), t)); | |
1634 // INC_CHECK_X(); | |
1635 break; | |
1636 case 0x0037: // PR_SUBJECT raw subject | |
1637 // if (list->items[x]->id == 0x0037) { | |
1638 DEBUG_EMAIL(("Raw Subject - ")); | |
1639 MALLOC_EMAIL(item); | |
1640 item->email->subject = (pst_item_email_subject*) realloc(item->email->subject, sizeof(pst_item_email_subject)); | |
1641 memset(item->email->subject, 0, sizeof(pst_item_email_subject)); | |
1642 DEBUG_EMAIL((" [size = %i] ", list->items[x]->size)); | |
1643 if (list->items[x]->size > 0) { | |
1644 if (isprint(list->items[x]->data[0])) { | |
1645 // then there are no control bytes at the front | |
1646 item->email->subject->off1 = 0; | |
1647 item->email->subject->off2 = 0; | |
1648 item->email->subject->subj = realloc(item->email->subject->subj, list->items[x]->size+1); | |
1649 memset(item->email->subject->subj, 0, list->items[x]->size+1); | |
1650 memcpy(item->email->subject->subj, list->items[x]->data, list->items[x]->size); | |
1651 } else { | |
1652 DEBUG_EMAIL(("Raw Subject has control codes\n")); | |
1653 // there might be some control bytes in the first and second bytes | |
1654 item->email->subject->off1 = list->items[x]->data[0]; | |
1655 item->email->subject->off2 = list->items[x]->data[1]; | |
1656 item->email->subject->subj = realloc(item->email->subject->subj, (list->items[x]->size-2)+1); | |
1657 memset(item->email->subject->subj, 0, list->items[x]->size-1); | |
1658 memcpy(item->email->subject->subj, &(list->items[x]->data[2]), list->items[x]->size-2); | |
1659 } | |
1660 DEBUG_EMAIL(("%s\n", item->email->subject->subj)); | |
1661 } else { | |
1662 // obviously outlook has decided not to be straight with this one. | |
1663 item->email->subject->off1 = 0; | |
1664 item->email->subject->off2 = 0; | |
1665 item->email->subject = NULL; | |
1666 DEBUG_EMAIL(("NULL subject detected\n")); | |
1667 } | |
1668 break; | |
1669 // INC_CHECK_X(); | |
1670 case 0x0039: // PR_CLIENT_SUBMIT_TIME Date Email Sent/Created | |
1671 DEBUG_EMAIL(("Date sent - ")); | |
1672 MALLOC_EMAIL(item); | |
1673 LIST_COPY(item->email->sent_date, (FILETIME*)); | |
1674 LE32_CPU(item->email->sent_date->dwLowDateTime); | |
1675 LE32_CPU(item->email->sent_date->dwHighDateTime); | |
1676 DEBUG_EMAIL(("%s", fileTimeToAscii(item->email->sent_date))); | |
1677 // INC_CHECK_X(); | |
1678 break; | |
1679 case 0x003B: // PR_SENT_REPRESENTING_SEARCH_KEY Sender address 1 | |
1680 DEBUG_EMAIL(("Sent on behalf of address 1 - ")); | |
1681 MALLOC_EMAIL(item); | |
1682 LIST_COPY(item->email->outlook_sender, (char*)); | |
1683 DEBUG_EMAIL(("%s\n", item->email->outlook_sender)); | |
1684 // INC_CHECK_X(); | |
1685 break; | |
1686 case 0x003F: // PR_RECEIVED_BY_ENTRYID Structure containing Recipient | |
1687 DEBUG_EMAIL(("Recipient Structure 1 -- NOT HANDLED\n")); | |
1688 // INC_CHECK_X(); | |
1689 break; | |
1690 case 0x0040: // PR_RECEIVED_BY_NAME Name of Recipient Structure | |
1691 DEBUG_EMAIL(("Received By Name 1 -- NOT HANDLED\n")); | |
1692 //INC_CHECK_X(); | |
1693 break; | |
1694 case 0x0041: // PR_SENT_REPRESENTING_ENTRYID Structure containing Sender | |
1695 DEBUG_EMAIL(("Sent on behalf of Structure 1 -- NOT HANDLED\n")); | |
1696 //INC_CHECK_X(); | |
1697 break; | |
1698 case 0x0042: // PR_SENT_REPRESENTING_NAME Name of Sender Structure | |
1699 DEBUG_EMAIL(("Sent on behalf of Structure Name - ")); | |
1700 MALLOC_EMAIL(item); | |
1701 LIST_COPY(item->email->outlook_sender_name, (char*)); | |
1702 DEBUG_EMAIL(("%s\n", item->email->outlook_sender_name)); | |
1703 //INC_CHECK_X(); | |
1704 break; | |
1705 case 0x0043: // PR_RCVD_REPRESENTING_ENTRYID Recipient Structure 2 | |
1706 DEBUG_EMAIL(("Received on behalf of Structure -- NOT HANDLED\n")); | |
1707 //INC_CHECK_X(); | |
1708 break; | |
1709 case 0x0044: // PR_RCVD_REPRESENTING_NAME Name of Recipient Structure 2 | |
1710 DEBUG_EMAIL(("Received on behalf of Structure Name -- NOT HANDLED\n")); | |
1711 //INC_CHECK_X(); | |
1712 break; | |
1713 case 0x004F: // PR_REPLY_RECIPIENT_ENTRIES Reply-To Structure | |
1714 DEBUG_EMAIL(("Reply-To Structure -- NOT HANDLED\n")); | |
1715 //INC_CHECK_X(); | |
1716 break; | |
1717 case 0x0050: // PR_REPLY_RECIPIENT_NAMES Name of Reply-To Structure | |
1718 DEBUG_EMAIL(("Name of Reply-To Structure -")); | |
1719 MALLOC_EMAIL(item); | |
1720 LIST_COPY(item->email->reply_to, (char*)); | |
1721 DEBUG_EMAIL(("%s\n", item->email->reply_to)); | |
1722 //INC_CHECK_X(); | |
1723 break; | |
1724 case 0x0051: // PR_RECEIVED_BY_SEARCH_KEY Recipient Address 1 | |
1725 DEBUG_EMAIL(("Recipient's Address 1 (Search Key) - ")); | |
1726 MALLOC_EMAIL(item); | |
1727 LIST_COPY (item->email->outlook_recipient, (char*)); | |
1728 DEBUG_EMAIL(("%s\n", item->email->outlook_recipient)); | |
1729 //INC_CHECK_X(); | |
1730 break; | |
1731 case 0x0052: // PR_RCVD_REPRESENTING_SEARCH_KEY Recipient Address 2 | |
1732 DEBUG_EMAIL(("Received on behalf of Address (Search Key) - ")); | |
1733 MALLOC_EMAIL(item); | |
1734 LIST_COPY(item->email->outlook_recipient2, (char*)); | |
1735 DEBUG_EMAIL(("%s\n", item->email->outlook_recipient2)); | |
1736 //INC_CHECK_X(); | |
1737 break; | |
1738 case 0x0057: // PR_MESSAGE_TO_ME | |
1739 // this user is listed explicitly in the TO address | |
1740 DEBUG_EMAIL(("My address in TO field - ")); | |
1741 MALLOC_EMAIL(item); | |
1742 if (*(int16_t*)list->items[x]->data != 0) { | |
1743 DEBUG_EMAIL(("True\n")); | |
1744 item->email->message_to_me = 1; | |
1745 } else { | |
1746 DEBUG_EMAIL(("False\n")); | |
1747 item->email->message_to_me = 0; | |
1748 } | |
1749 //INC_CHECK_X(); | |
1750 break; | |
1751 case 0x0058: // PR_MESSAGE_CC_ME | |
1752 // this user is listed explicitly in the CC address | |
1753 DEBUG_EMAIL(("My address in CC field - ")); | |
1754 MALLOC_EMAIL(item); | |
1755 if (*(int16_t*)list->items[x]->data != 0) { | |
1756 DEBUG_EMAIL(("True\n")); | |
1757 item->email->message_cc_me = 1; | |
1758 } else { | |
1759 DEBUG_EMAIL(("False\n")); | |
1760 item->email->message_cc_me = 0; | |
1761 } | |
1762 //INC_CHECK_X(); | |
1763 break; | |
1764 case 0x0059: //PR_MESSAGE_RECIP_ME | |
1765 // this user appears in TO, CC or BCC address list | |
1766 DEBUG_EMAIL(("Message addressed to me - ")); | |
1767 MALLOC_EMAIL(item); | |
1768 if (*(int16_t*)list->items[x]->data != 0) { | |
1769 DEBUG_EMAIL(("True\n")); | |
1770 item->email->message_recip_me = 1; | |
1771 } else { | |
1772 DEBUG_EMAIL(("False\n")); | |
1773 item->email->message_recip_me = 0; | |
1774 } | |
1775 //INC_CHECK_X(); | |
1776 break; | |
1777 case 0x0063: // PR_RESPONSE_REQUESTED | |
1778 DEBUG_EMAIL(("Response requested - ")); | |
1779 if (*(int16_t*)list->items[x]->data != 0) { | |
1780 DEBUG_EMAIL(("True\n")); | |
1781 item->response_requested = 1; | |
1782 } else { | |
1783 DEBUG_EMAIL(("False\n")); | |
1784 item->response_requested = 0; | |
1785 } | |
1786 break; | |
1787 case 0x0064: // PR_SENT_REPRESENTING_ADDRTYPE Access method for Sender Address | |
1788 DEBUG_EMAIL(("Sent on behalf of address type - ")); | |
1789 MALLOC_EMAIL(item); | |
1790 LIST_COPY(item->email->sender_access, (char*)); | |
1791 DEBUG_EMAIL(("%s\n", item->email->sender_access)); | |
1792 //INC_CHECK_X(); | |
1793 break; | |
1794 case 0x0065: // PR_SENT_REPRESENTING_EMAIL_ADDRESS Sender Address | |
1795 DEBUG_EMAIL(("Sent on behalf of Address - ")); | |
1796 MALLOC_EMAIL(item); | |
1797 LIST_COPY(item->email->sender_address, (char*)); | |
1798 DEBUG_EMAIL(("%s\n", item->email->sender_address)); | |
1799 //INC_CHECK_X(); | |
1800 break; | |
1801 case 0x0070: // PR_CONVERSATION_TOPIC Processed Subject | |
1802 DEBUG_EMAIL(("Processed Subject (Conversation Topic) - ")); | |
1803 MALLOC_EMAIL(item); | |
1804 LIST_COPY(item->email->proc_subject, (char*)); | |
1805 DEBUG_EMAIL(("%s\n", item->email->proc_subject)); | |
1806 //INC_CHECK_X(); | |
1807 break; | |
1808 case 0x0071: // PR_CONVERSATION_INDEX Date 2 | |
1809 DEBUG_EMAIL(("Conversation Index - ")); | |
1810 MALLOC_EMAIL(item); | |
1811 memcpy(&(item->email->conv_index), list->items[x]->data, sizeof(item->email->conv_index)); | |
1812 DEBUG_EMAIL(("%i\n", item->email->conv_index)); | |
1813 //INC_CHECK_X(); | |
1814 break; | |
1815 case 0x0075: // PR_RECEIVED_BY_ADDRTYPE Recipient Access Method | |
1816 DEBUG_EMAIL(("Received by Address type - ")); | |
1817 MALLOC_EMAIL(item); | |
1818 LIST_COPY(item->email->recip_access, (char*)); | |
1819 DEBUG_EMAIL(("%s\n", item->email->recip_access)); | |
1820 //INC_CHECK_X(); | |
1821 break; | |
1822 case 0x0076: // PR_RECEIVED_BY_EMAIL_ADDRESS Recipient Address | |
1823 DEBUG_EMAIL(("Received by Address - ")); | |
1824 MALLOC_EMAIL(item); | |
1825 LIST_COPY(item->email->recip_address, (char*)); | |
1826 DEBUG_EMAIL(("%s\n", item->email->recip_address)); | |
1827 //INC_CHECK_X(); | |
1828 break; | |
1829 case 0x0077: // PR_RCVD_REPRESENTING_ADDRTYPE Recipient Access Method 2 | |
1830 DEBUG_EMAIL(("Received on behalf of Address type - ")); | |
1831 MALLOC_EMAIL(item); | |
1832 LIST_COPY(item->email->recip2_access, (char*)); | |
1833 DEBUG_EMAIL(("%s\n", item->email->recip2_access)); | |
1834 //INC_CHECK_X(); | |
1835 break; | |
1836 case 0x0078: // PR_RCVD_REPRESENTING_EMAIL_ADDRESS Recipient Address 2 | |
1837 DEBUG_EMAIL(("Received on behalf of Address -")); | |
1838 MALLOC_EMAIL(item); | |
1839 LIST_COPY(item->email->recip2_address, (char*)); | |
1840 DEBUG_EMAIL(("%s\n", item->email->recip2_address)); | |
1841 //INC_CHECK_X(); | |
1842 break; | |
1843 case 0x007D: // PR_TRANSPORT_MESSAGE_HEADERS Internet Header | |
1844 DEBUG_EMAIL(("Internet Header - ")); | |
1845 MALLOC_EMAIL(item); | |
1846 LIST_COPY(item->email->header, (char*)); | |
1847 //DEBUG_EMAIL(("%s\n", item->email->header)); | |
1848 DEBUG_EMAIL(("NOT PRINTED\n")); | |
1849 //INC_CHECK_X(); | |
1850 break; | |
1851 case 0x0C17: // PR_REPLY_REQUESTED | |
1852 DEBUG_EMAIL(("Reply Requested - ")); | |
1853 MALLOC_EMAIL(item); | |
1854 if (*(int16_t*)list->items[x]->data != 0) { | |
1855 DEBUG_EMAIL(("True\n")); | |
1856 item->email->reply_requested = 1; | |
1857 } else { | |
1858 DEBUG_EMAIL(("False\n")); | |
1859 item->email->reply_requested = 0; | |
1860 } | |
1861 break; | |
1862 case 0x0C19: // PR_SENDER_ENTRYID Sender Structure 2 | |
1863 DEBUG_EMAIL(("Sender Structure 2 -- NOT HANDLED\n")); | |
1864 //INC_CHECK_X(); | |
1865 break; | |
1866 case 0x0C1A: // PR_SENDER_NAME Name of Sender Structure 2 | |
1867 DEBUG_EMAIL(("Name of Sender Structure 2 -- NOT HANDLED\n")); | |
1868 //INC_CHECK_X(); | |
1869 break; | |
1870 case 0x0C1D: // PR_SENDER_SEARCH_KEY Name of Sender Address 2 | |
1871 DEBUG_EMAIL(("Name of Sender Address 2 (Sender search key) - ")); | |
1872 MALLOC_EMAIL(item); | |
1873 LIST_COPY(item->email->outlook_sender2, (char*)); | |
1874 DEBUG_EMAIL(("%s\n", item->email->outlook_sender2)); | |
1875 //INC_CHECK_X(); | |
1876 break; | |
1877 case 0x0C1E: // PR_SENDER_ADDRTYPE Sender Address 2 access method | |
1878 DEBUG_EMAIL(("Sender Address type - ")); | |
1879 MALLOC_EMAIL(item); | |
1880 LIST_COPY(item->email->sender2_access, (char*)); | |
1881 DEBUG_EMAIL(("%s\n", item->email->sender2_access)); | |
1882 //INC_CHECK_X(); | |
1883 break; | |
1884 case 0x0C1F: // PR_SENDER_EMAIL_ADDRESS Sender Address 2 | |
1885 DEBUG_EMAIL(("Sender Address - ")); | |
1886 MALLOC_EMAIL(item); | |
1887 LIST_COPY(item->email->sender2_address, (char*)); | |
1888 DEBUG_EMAIL(("%s\n", item->email->sender2_address)); | |
1889 //INC_CHECK_X(); | |
1890 break; | |
1891 case 0x0E01: // PR_DELETE_AFTER_SUBMIT | |
1892 // I am not too sure how this works | |
1893 DEBUG_EMAIL(("Delete after submit - ")); | |
1894 MALLOC_EMAIL(item); | |
1895 if (*(int16_t*) list->items[x]->data != 0) { | |
1896 DEBUG_EMAIL(("True\n")); | |
1897 item->email->delete_after_submit = 1; | |
1898 } else { | |
1899 DEBUG_EMAIL(("False\n")); | |
1900 item->email->delete_after_submit = 0; | |
1901 } | |
1902 //INC_CHECK_X(); | |
1903 break; | |
1904 case 0x0E03: // PR_DISPLAY_CC CC Addresses | |
1905 DEBUG_EMAIL(("Display CC Addresses - ")); | |
1906 MALLOC_EMAIL(item); | |
1907 LIST_COPY(item->email->cc_address, (char*)); | |
1908 DEBUG_EMAIL(("%s\n", item->email->cc_address)); | |
1909 //INC_CHECK_X(); | |
1910 break; | |
1911 case 0x0E04: // PR_DISPLAY_TO Address Sent-To | |
1912 DEBUG_EMAIL(("Display Sent-To Address - ")); | |
1913 MALLOC_EMAIL(item); | |
1914 LIST_COPY(item->email->sentto_address, (char*)); | |
1915 DEBUG_EMAIL(("%s\n", item->email->sentto_address)); | |
1916 //INC_CHECK_X(); | |
1917 break; | |
1918 case 0x0E06: // PR_MESSAGE_DELIVERY_TIME Date 3 - Email Arrival Date | |
1919 DEBUG_EMAIL(("Date 3 (Delivery Time) - ")); | |
1920 MALLOC_EMAIL(item); | |
1921 LIST_COPY(item->email->arrival_date, (FILETIME*)); | |
1922 DEBUG_EMAIL(("%s", fileTimeToAscii(item->email->arrival_date))); | |
1923 //INC_CHECK_X(); | |
1924 break; | |
1925 case 0x0E07: // PR_MESSAGE_FLAGS Email Flag | |
1926 // 0x01 - Read | |
1927 // 0x02 - Unmodified | |
1928 // 0x04 - Submit | |
1929 // 0x08 - Unsent | |
1930 // 0x10 - Has Attachments | |
1931 // 0x20 - From Me | |
1932 // 0x40 - Associated | |
1933 // 0x80 - Resend | |
1934 // 0x100 - RN Pending | |
1935 // 0x200 - NRN Pending | |
1936 DEBUG_EMAIL(("Message Flags - ")); | |
1937 MALLOC_EMAIL(item); | |
1938 memcpy(&(item->email->flag), list->items[x]->data, sizeof(item->email->flag)); | |
1939 LE32_CPU(item->email->flag); | |
1940 DEBUG_EMAIL(("%i\n", item->email->flag)); | |
1941 //INC_CHECK_X(); | |
1942 break; | |
1943 case 0x0E08: // PR_MESSAGE_SIZE Total size of a message object | |
1944 DEBUG_EMAIL(("Message Size - ")); | |
1945 memcpy(&(item->message_size), list->items[x]->data, sizeof(item->message_size)); | |
1946 LE32_CPU(item->message_size); | |
1947 DEBUG_EMAIL(("%i [%#x]\n", item->message_size, item->message_size)); | |
1948 //INC_CHECK_X(); | |
1949 break; | |
1950 case 0x0E0A: // PR_SENTMAIL_ENTRYID | |
1951 // folder that this message is sent to after submission | |
1952 DEBUG_EMAIL(("Sentmail EntryID - ")); | |
1953 MALLOC_EMAIL(item); | |
1954 LIST_COPY(item->email->sentmail_folder, (pst_entryid*)); | |
1955 LE32_CPU(item->email->sentmail_folder->id); | |
1956 DEBUG_EMAIL(("[id = %#x]\n", item->email->sentmail_folder->id)); | |
1957 //INC_CHECK_X(); | |
1958 break; | |
1959 case 0x0E1F: // PR_RTF_IN_SYNC | |
1960 // True means that the rtf version is same as text body | |
1961 // False means rtf version is more up-to-date than text body | |
1962 // if this value doesn't exist, text body is more up-to-date than rtf and | |
1963 // cannot update to the rtf | |
1964 DEBUG_EMAIL(("Compressed RTF in Sync - ")); | |
1965 MALLOC_EMAIL(item); | |
1966 if (*(int16_t*)list->items[x]->data != 0) { | |
1967 DEBUG_EMAIL(("True\n")); | |
1968 item->email->rtf_in_sync = 1; | |
1969 } else { | |
1970 DEBUG_EMAIL(("False\n")); | |
1971 item->email->rtf_in_sync = 0; | |
1972 } | |
1973 //INC_CHECK_X(); | |
1974 break; | |
1975 case 0x0E20: // PR_ATTACH_SIZE binary Attachment data in record | |
1976 DEBUG_EMAIL(("Attachment Size - ")); | |
1977 NULL_CHECK(attach); | |
1978 MOVE_NEXT(attach); | |
1979 memcpy(&(attach->size), list->items[x]->data, sizeof(attach->size)); | |
1980 DEBUG_EMAIL(("%i\n", attach->size)); | |
1981 //INC_CHECK_X(); | |
1982 break; | |
1983 case 0x0FF9: // PR_RECORD_KEY Record Header 1 | |
1984 DEBUG_EMAIL(("Record Key 1 - ")); | |
1985 LIST_COPY(item->record_key, (char*)); | |
1986 item->record_key_size = list->items[x]->size; | |
1987 DEBUG_EMAIL_HEXPRINT(item->record_key, item->record_key_size); | |
1988 DEBUG_EMAIL(("\n")); | |
1989 //INC_CHECK_X(); | |
1990 break; | |
1991 case 0x1000: // PR_BODY Plain Text body | |
1992 DEBUG_EMAIL(("Plain Text body - ")); | |
1993 MALLOC_EMAIL(item); | |
1994 LIST_COPY(item->email->body, (char*)); | |
1995 //DEBUG_EMAIL("%s\n", item->email->body); | |
1996 DEBUG_EMAIL(("NOT PRINTED\n")); | |
1997 //INC_CHECK_X(); | |
1998 break; | |
1999 case 0x1006: // PR_RTF_SYNC_BODY_CRC | |
2000 DEBUG_EMAIL(("RTF Sync Body CRC - ")); | |
2001 MALLOC_EMAIL(item); | |
2002 memcpy(&(item->email->rtf_body_crc), list->items[x]->data, sizeof(item->email->rtf_body_crc)); | |
2003 LE32_CPU(item->email->rtf_body_crc); | |
2004 DEBUG_EMAIL(("%#x\n", item->email->rtf_body_crc)); | |
2005 //INC_CHECK_X(); | |
2006 break; | |
2007 case 0x1007: // PR_RTF_SYNC_BODY_COUNT | |
2008 // a count of the *significant* charcters in the rtf body. Doesn't count | |
2009 // whitespace and other ignorable characters | |
2010 DEBUG_EMAIL(("RTF Sync Body character count - ")); | |
2011 MALLOC_EMAIL(item); | |
2012 memcpy(&(item->email->rtf_body_char_count), list->items[x]->data, sizeof(item->email->rtf_body_char_count)); | |
2013 LE32_CPU(item->email->rtf_body_char_count); | |
2014 DEBUG_EMAIL(("%i [%#x]\n", item->email->rtf_body_char_count, item->email->rtf_body_char_count)); | |
2015 //INC_CHECK_X(); | |
2016 break; | |
2017 case 0x1008: // PR_RTF_SYNC_BODY_TAG | |
2018 // the first couple of lines of RTF body so that after modification, then beginning can | |
2019 // once again be found | |
2020 DEBUG_EMAIL(("RTF Sync body tag - ")); | |
2021 MALLOC_EMAIL(item); | |
2022 LIST_COPY(item->email->rtf_body_tag, (char*)); | |
2023 DEBUG_EMAIL(("%s\n", item->email->rtf_body_tag)); | |
2024 //INC_CHECK_X(); | |
2025 break; | |
2026 case 0x1009: // PR_RTF_COMPRESSED | |
2027 // some compression algorithm has been applied to this. At present | |
2028 // it is unknown | |
2029 DEBUG_EMAIL(("RTF Compressed body - ")); | |
2030 MALLOC_EMAIL(item); | |
2031 LIST_COPY(item->email->rtf_compressed, (char*)); | |
2032 DEBUG_EMAIL(("NOT PRINTED\n")); | |
2033 //INC_CHECK_X(); | |
2034 break; | |
2035 case 0x1010: // PR_RTF_SYNC_PREFIX_COUNT | |
2036 // a count of the ignored characters before the first significant character | |
2037 DEBUG_EMAIL(("RTF whitespace prefix count - ")); | |
2038 MALLOC_EMAIL(item); | |
2039 memcpy(&(item->email->rtf_ws_prefix_count), list->items[x]->data, sizeof(item->email->rtf_ws_prefix_count)); | |
2040 DEBUG_EMAIL(("%i\n", item->email->rtf_ws_prefix_count)); | |
2041 //INC_CHECK_X(); | |
2042 break; | |
2043 case 0x1011: // PR_RTF_SYNC_TRAILING_COUNT | |
2044 // a count of the ignored characters after the last significant character | |
2045 DEBUG_EMAIL(("RTF whitespace tailing count - ")); | |
2046 MALLOC_EMAIL(item); | |
2047 memcpy(&(item->email->rtf_ws_trailing_count), list->items[x]->data, sizeof(item->email->rtf_ws_trailing_count)); | |
2048 DEBUG_EMAIL(("%i\n", item->email->rtf_ws_trailing_count)); | |
2049 //INC_CHECK_X(); | |
2050 break; | |
2051 case 0x1013: // HTML body | |
2052 DEBUG_EMAIL(("HTML body - ")); | |
2053 MALLOC_EMAIL(item); | |
2054 LIST_COPY(item->email->htmlbody, (char*)); | |
2055 // DEBUG_EMAIL(("%s\n", item->email->htmlbody)); | |
2056 DEBUG_EMAIL(("NOT PRINTED\n")); | |
2057 //INC_CHECK_X(); | |
2058 break; | |
2059 case 0x1035: // Message ID | |
2060 DEBUG_EMAIL(("Message ID - ")); | |
2061 MALLOC_EMAIL(item); | |
2062 LIST_COPY(item->email->messageid, (char*)); | |
2063 DEBUG_EMAIL(("%s\n", item->email->messageid)); | |
2064 //INC_CHECK_X(); | |
2065 break; | |
2066 case 0x1042: // in-reply-to | |
2067 DEBUG_EMAIL(("In-Reply-To - ")); | |
2068 MALLOC_EMAIL(item); | |
2069 LIST_COPY(item->email->in_reply_to, (char*)); | |
2070 DEBUG_EMAIL(("%s\n", item->email->in_reply_to)); | |
2071 //INC_CHECK_X(); | |
2072 break; | |
2073 case 0x1046: // Return Path | |
2074 DEBUG_EMAIL(("Return Path - ")); | |
2075 MALLOC_EMAIL(item); | |
2076 LIST_COPY(item->email->return_path_address, (char*)); | |
2077 DEBUG_EMAIL(("%s\n", item->email->return_path_address)); | |
2078 //INC_CHECK_X(); | |
2079 break; | |
2080 case 0x3001: // PR_DISPLAY_NAME File As | |
2081 DEBUG_EMAIL(("Display Name - ")); | |
2082 LIST_COPY(item->file_as, (char*)); | |
2083 DEBUG_EMAIL(("%s\n", item->file_as)); | |
2084 //INC_CHECK_X(); | |
2085 break; | |
2086 case 0x3002: // PR_ADDRTYPE | |
2087 DEBUG_EMAIL(("Address Type - ")); | |
2088 MALLOC_CONTACT(item); | |
2089 LIST_COPY(item->contact->address1_transport, (char*)); | |
2090 DEBUG_EMAIL(("|%s|\n", item->contact->address1_transport)); | |
2091 //INC_CHECK_X(); | |
2092 break; | |
2093 case 0x3003: // PR_EMAIL_ADDRESS | |
2094 // Contact's email address | |
2095 DEBUG_EMAIL(("Contact Address - ")); | |
2096 MALLOC_CONTACT(item); | |
2097 LIST_COPY(item->contact->address1, (char*)); | |
2098 DEBUG_EMAIL(("|%s|\n", item->contact->address1)); | |
2099 //INC_CHECK_X(); | |
2100 break; | |
2101 case 0x3004: // PR_COMMENT Comment for item - usually folders | |
2102 DEBUG_EMAIL(("Comment - ")); | |
2103 LIST_COPY(item->comment, (char*)); | |
2104 DEBUG_EMAIL(("%s\n", item->comment)); | |
2105 //INC_CHECK_X(); | |
2106 break; | |
2107 case 0x3007: // PR_CREATION_TIME Date 4 - Creation Date? | |
2108 DEBUG_EMAIL(("Date 4 (Item Creation Date) - ")); | |
2109 LIST_COPY(item->create_date, (FILETIME*)); | |
2110 DEBUG_EMAIL(("%s", fileTimeToAscii(item->create_date))); | |
2111 //INC_CHECK_X(); | |
2112 break; | |
2113 case 0x3008: // PR_LAST_MODIFICATION_TIME Date 5 - Modify Date | |
2114 DEBUG_EMAIL(("Date 5 (Modify Date) - ")); | |
2115 LIST_COPY(item->modify_date, (FILETIME*)); | |
2116 DEBUG_EMAIL(("%s", fileTimeToAscii(item->modify_date))); | |
2117 //INC_CHECK_X(); | |
2118 break; | |
2119 case 0x300B: // PR_SEARCH_KEY Record Header 2 | |
2120 DEBUG_EMAIL(("Record Search 2 -- NOT HANDLED\n")); | |
2121 //INC_CHECK_X(); | |
2122 break; | |
2123 case 0x35DF: // PR_VALID_FOLDER_MASK | |
2124 // States which folders are valid for this message store | |
2125 // FOLDER_IPM_SUBTREE_VALID 0x1 | |
2126 // FOLDER_IPM_INBOX_VALID 0x2 | |
2127 // FOLDER_IPM_OUTBOX_VALID 0x4 | |
2128 // FOLDER_IPM_WASTEBOX_VALID 0x8 | |
2129 // FOLDER_IPM_SENTMAIL_VALID 0x10 | |
2130 // FOLDER_VIEWS_VALID 0x20 | |
2131 // FOLDER_COMMON_VIEWS_VALID 0x40 | |
2132 // FOLDER_FINDER_VALID 0x80 | |
2133 DEBUG_EMAIL(("Valid Folder Mask - ")); | |
2134 MALLOC_MESSAGESTORE(item); | |
2135 memcpy(&(item->message_store->valid_mask), list->items[x]->data, sizeof(int)); | |
2136 LE32_CPU(item->message_store->valid_mask); | |
2137 DEBUG_EMAIL(("%i\n", item->message_store->valid_mask)); | |
2138 //INC_CHECK_X(); | |
2139 break; | |
2140 case 0x35E0: // PR_IPM_SUBTREE_ENTRYID Top of Personal Folder Record | |
2141 DEBUG_EMAIL(("Top of Personal Folder Record - ")); | |
2142 MALLOC_MESSAGESTORE(item); | |
2143 LIST_COPY(item->message_store->top_of_personal_folder, (pst_entryid*)); | |
2144 LE32_CPU(item->message_store->top_of_personal_folder->id); | |
2145 DEBUG_EMAIL(("[id = %#x]\n", item->message_store->top_of_personal_folder->id)); | |
2146 //INC_CHECK_X(); | |
2147 break; | |
2148 case 0x35E3: // PR_IPM_WASTEBASKET_ENTRYID Deleted Items Folder Record | |
2149 DEBUG_EMAIL(("Deleted Items Folder record - ")); | |
2150 MALLOC_MESSAGESTORE(item); | |
2151 LIST_COPY(item->message_store->deleted_items_folder, (pst_entryid*)); | |
2152 LE32_CPU(item->message_store->deleted_items_folder->id); | |
2153 DEBUG_EMAIL(("[id = %#x]\n", item->message_store->deleted_items_folder->id)); | |
2154 //INC_CHECK_X(); | |
2155 break; | |
2156 case 0x35E7: // PR_FINDER_ENTRYID Search Root Record | |
2157 DEBUG_EMAIL(("Search Root record - ")); | |
2158 MALLOC_MESSAGESTORE(item); | |
2159 LIST_COPY(item->message_store->search_root_folder, (pst_entryid*)); | |
2160 LE32_CPU(item->message_store->search_root_folder->id); | |
2161 DEBUG_EMAIL(("[id = %#x]\n", item->message_store->search_root_folder->id)); | |
2162 //INC_CHECK_X(); | |
2163 break; | |
2164 case 0x3602: // PR_CONTENT_COUNT Number of emails stored in a folder | |
2165 DEBUG_EMAIL(("Folder Email Count - ")); | |
2166 MALLOC_FOLDER(item); | |
2167 memcpy(&(item->folder->email_count), list->items[x]->data, sizeof(item->folder->email_count)); | |
2168 LE32_CPU(item->folder->email_count); | |
2169 DEBUG_EMAIL(("%i\n", item->folder->email_count)); | |
2170 //INC_CHECK_X(); | |
2171 break; | |
2172 case 0x3603: // PR_CONTENT_UNREAD Number of unread emails | |
2173 DEBUG_EMAIL(("Unread Email Count - ")); | |
2174 MALLOC_FOLDER(item); | |
2175 memcpy(&(item->folder->unseen_email_count), list->items[x]->data, sizeof(item->folder->unseen_email_count)); | |
2176 LE32_CPU(item->folder->unseen_email_count); | |
2177 DEBUG_EMAIL(("%i\n", item->folder->unseen_email_count)); | |
2178 //INC_CHECK_X(); | |
2179 break; | |
2180 case 0x360A: // PR_SUBFOLDERS Has children | |
2181 DEBUG_EMAIL(("Has Subfolders - ")); | |
2182 MALLOC_FOLDER(item); | |
2183 if (*((int32_t*)list->items[x]->data) != 0) { | |
2184 DEBUG_EMAIL(("True\n")); | |
2185 item->folder->subfolder = 1; | |
2186 } else { | |
2187 DEBUG_EMAIL(("False\n")); | |
2188 item->folder->subfolder = 0; | |
2189 } | |
2190 //INC_CHECK_X(); | |
2191 break; | |
2192 case 0x3613: // PR_CONTAINER_CLASS IPF.x | |
2193 DEBUG_EMAIL(("IPF.x - ")); | |
2194 LIST_COPY(item->ascii_type, (char*)); | |
2195 if (strncmp("IPF.Note", item->ascii_type, 8) == 0) | |
2196 item->type = PST_TYPE_NOTE; | |
2197 else if (strncmp("IPF.Contact", item->ascii_type, 11) == 0) | |
2198 item->type = PST_TYPE_CONTACT; | |
2199 else if (strncmp("IPF.Journal", item->ascii_type, 11) == 0) | |
2200 item->type = PST_TYPE_JOURNAL; | |
2201 else if (strncmp("IPF.Appointment", item->ascii_type, 15) == 0) | |
2202 item->type = PST_TYPE_APPOINTMENT; | |
2203 else if (strncmp("IPF.StickyNote", item->ascii_type, 14) == 0) | |
2204 item->type = PST_TYPE_STICKYNOTE; | |
2205 else if (strncmp("IPF.Task", item->ascii_type, 8) == 0) | |
2206 item->type = PST_TYPE_TASK; | |
2207 else | |
2208 item->type = PST_TYPE_OTHER; | |
2209 | |
2210 DEBUG_EMAIL(("%s [%i]\n", item->ascii_type, item->type)); | |
2211 //INC_CHECK_X(); | |
2212 break; | |
2213 case 0x3617: // PR_ASSOC_CONTENT_COUNT | |
2214 // associated content are items that are attached to this folder | |
2215 // but are hidden from users | |
2216 DEBUG_EMAIL(("Associate Content count - ")); | |
2217 MALLOC_FOLDER(item); | |
2218 memcpy(&(item->folder->assoc_count), list->items[x]->data, sizeof(item->folder->assoc_count)); | |
2219 LE32_CPU(item->folder->assoc_count); | |
2220 DEBUG_EMAIL(("%i [%#x]\n", item->folder->assoc_count, item->folder->assoc_count)); | |
2221 //INC_CHECK_X(); | |
2222 break; | |
2223 case 0x3701: // PR_ATTACH_DATA_OBJ binary data of attachment | |
2224 DEBUG_EMAIL(("Binary Data [Size %i] - ", list->items[x]->size)); | |
2225 NULL_CHECK(attach); | |
2226 MOVE_NEXT(attach); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
2227 if (!list->items[x]->data) { //special case |
11 | 2228 attach->id2_val = list->items[x]->type; |
2229 DEBUG_EMAIL(("Seen a Reference. The data hasn't been loaded yet. [%#x][%#x]\n", | |
2230 attach->id2_val, list->items[x]->type)); | |
2231 } else { | |
2232 LIST_COPY(attach->data, (char*)); | |
2233 attach->size = list->items[x]->size; | |
2234 DEBUG_EMAIL(("NOT PRINTED\n")); | |
2235 } | |
2236 //INC_CHECK_X(); | |
2237 break; | |
2238 case 0x3704: // PR_ATTACH_FILENAME Attachment filename (8.3) | |
2239 DEBUG_EMAIL(("Attachment Filename - ")); | |
2240 NULL_CHECK(attach); | |
2241 MOVE_NEXT(attach); | |
2242 LIST_COPY(attach->filename1, (char*)); | |
2243 DEBUG_EMAIL(("%s\n", attach->filename1)); | |
2244 //INC_CHECK_X(); | |
2245 break; | |
2246 case 0x3705: // PR_ATTACH_METHOD | |
2247 // 0 - No Attachment | |
2248 // 1 - Attach by Value | |
2249 // 2 - Attach by reference | |
2250 // 3 - Attach by ref resolve | |
2251 // 4 - Attach by ref only | |
2252 // 5 - Embedded Message | |
2253 // 6 - OLE | |
2254 DEBUG_EMAIL(("Attachement method - ")); | |
2255 NULL_CHECK(attach); | |
2256 MOVE_NEXT(attach); | |
2257 memcpy(&(attach->method), list->items[x]->data, sizeof(attach->method)); | |
2258 LE32_CPU(attach->method); | |
2259 t = attach->method; | |
2260 DEBUG_EMAIL(("%s [%i]\n", (t==0?"No Attachment": | |
2261 (t==1?"Attach By Value": | |
2262 (t==2?"Attach By Reference": | |
2263 (t==3?"Attach by Ref. Resolve": | |
2264 (t==4?"Attach by Ref. Only": | |
2265 (t==5?"Embedded Message":"OLE")))))),t)); | |
2266 //INC_CHECK_X(); | |
2267 break; | |
2268 case 0x370B: // PR_RENDERING_POSITION | |
2269 // position in characters that the attachment appears in the plain text body | |
2270 DEBUG_EMAIL(("Attachment Position - ")); | |
2271 NULL_CHECK(attach); | |
2272 MOVE_NEXT(attach); | |
2273 memcpy(&(attach->position), list->items[x]->data, sizeof(attach->position)); | |
2274 LE32_CPU(attach->position); | |
2275 DEBUG_EMAIL(("%i [%#x]\n", attach->position)); | |
2276 //INC_CHECK_X(); | |
2277 break; | |
2278 case 0x3707: // PR_ATTACH_LONG_FILENAME Attachment filename (long?) | |
2279 DEBUG_EMAIL(("Attachment Filename long - ")); | |
2280 NULL_CHECK(attach); | |
2281 MOVE_NEXT(attach); | |
2282 LIST_COPY(attach->filename2, (char*)); | |
2283 DEBUG_EMAIL(("%s\n", attach->filename2)); | |
2284 //INC_CHECK_X(); | |
2285 break; | |
2286 case 0x370E: // PR_ATTACH_MIME_TAG Mime type of encoding | |
2287 DEBUG_EMAIL(("Attachment mime encoding - ")); | |
2288 NULL_CHECK(attach); | |
2289 MOVE_NEXT(attach); | |
2290 LIST_COPY(attach->mimetype, (char*)); | |
2291 DEBUG_EMAIL(("%s\n", attach->mimetype)); | |
2292 //INC_CHECK_X(); | |
2293 break; | |
2294 case 0x3710: // PR_ATTACH_MIME_SEQUENCE | |
2295 // sequence number for mime parts. Includes body | |
2296 DEBUG_EMAIL(("Attachment Mime Sequence - ")); | |
2297 NULL_CHECK(attach); | |
2298 MOVE_NEXT(attach); | |
2299 memcpy(&(attach->sequence), list->items[x]->data, sizeof(attach->sequence)); | |
2300 LE32_CPU(attach->sequence); | |
2301 DEBUG_EMAIL(("%i\n", attach->sequence)); | |
2302 //INC_CHECK_X(); | |
2303 break; | |
2304 case 0x3A00: // PR_ACCOUNT | |
2305 DEBUG_EMAIL(("Contact's Account name - ")); | |
2306 MALLOC_CONTACT(item); | |
2307 LIST_COPY(item->contact->account_name, (char*)); | |
2308 DEBUG_EMAIL(("%s\n", item->contact->account_name)); | |
2309 break; | |
2310 case 0x3A01: // PR_ALTERNATE_RECIPIENT | |
2311 DEBUG_EMAIL(("Contact Alternate Recipient - NOT PROCESSED\n")); | |
2312 break; | |
2313 case 0x3A02: // PR_CALLBACK_TELEPHONE_NUMBER | |
2314 DEBUG_EMAIL(("Callback telephone number - ")); | |
2315 MALLOC_CONTACT(item); | |
2316 LIST_COPY(item->contact->callback_phone, (char*)); | |
2317 DEBUG_EMAIL(("%s\n", item->contact->callback_phone)); | |
2318 break; | |
2319 case 0x3A03: // PR_CONVERSION_PROHIBITED | |
2320 DEBUG_EMAIL(("Message Conversion Prohibited - ")); | |
2321 MALLOC_EMAIL(item); | |
2322 if (*(int16_t*)list->items[x]->data != 0) { | |
2323 DEBUG_EMAIL(("True\n")); | |
2324 item->email->conversion_prohib = 1; | |
2325 } else { | |
2326 DEBUG_EMAIL(("False\n")); | |
2327 item->email->conversion_prohib = 0; | |
2328 } | |
2329 break; | |
2330 case 0x3A05: // PR_GENERATION suffix | |
2331 DEBUG_EMAIL(("Contacts Suffix - ")); | |
2332 MALLOC_CONTACT(item); | |
2333 LIST_COPY(item->contact->suffix, (char*)); | |
2334 DEBUG_EMAIL(("%s\n", item->contact->suffix)); | |
2335 break; | |
2336 case 0x3A06: // PR_GIVEN_NAME Contact's first name | |
2337 DEBUG_EMAIL(("Contacts First Name - ")); | |
2338 MALLOC_CONTACT(item); | |
2339 LIST_COPY(item->contact->first_name, (char*)); | |
2340 DEBUG_EMAIL(("%s\n", item->contact->first_name)); | |
2341 //INC_CHECK_X(); | |
2342 break; | |
2343 case 0x3A07: // PR_GOVERNMENT_ID_NUMBER | |
2344 DEBUG_EMAIL(("Contacts Government ID Number - ")); | |
2345 MALLOC_CONTACT(item); | |
2346 LIST_COPY(item->contact->gov_id, (char*)); | |
2347 DEBUG_EMAIL(("%s\n", item->contact->gov_id)); | |
2348 break; | |
2349 case 0x3A08: // PR_BUSINESS_TELEPHONE_NUMBER | |
2350 DEBUG_EMAIL(("Business Telephone Number - ")); | |
2351 MALLOC_CONTACT(item); | |
2352 LIST_COPY(item->contact->business_phone, (char*)); | |
2353 DEBUG_EMAIL(("%s\n", item->contact->business_phone)); | |
2354 break; | |
2355 case 0x3A09: // PR_HOME_TELEPHONE_NUMBER | |
2356 DEBUG_EMAIL(("Home Telephone Number - ")); | |
2357 MALLOC_CONTACT(item); | |
2358 LIST_COPY(item->contact->home_phone, (char*)); | |
2359 DEBUG_EMAIL(("%s\n", item->contact->home_phone)); | |
2360 break; | |
2361 case 0x3A0A: // PR_INITIALS Contact's Initials | |
2362 DEBUG_EMAIL(("Contacts Initials - ")); | |
2363 MALLOC_CONTACT(item); | |
2364 LIST_COPY(item->contact->initials, (char*)); | |
2365 DEBUG_EMAIL(("%s\n", item->contact->initials)); | |
2366 //INC_CHECK_X(); | |
2367 break; | |
2368 case 0x3A0B: // PR_KEYWORD | |
2369 DEBUG_EMAIL(("Keyword - ")); | |
2370 MALLOC_CONTACT(item); | |
2371 LIST_COPY(item->contact->keyword, (char*)); | |
2372 DEBUG_EMAIL(("%s\n", item->contact->keyword)); | |
2373 break; | |
2374 case 0x3A0C: // PR_LANGUAGE | |
2375 DEBUG_EMAIL(("Contact's Language - ")); | |
2376 MALLOC_CONTACT(item); | |
2377 LIST_COPY(item->contact->language, (char*)); | |
2378 DEBUG_EMAIL(("%s\n", item->contact->language)); | |
2379 break; | |
2380 case 0x3A0D: // PR_LOCATION | |
2381 DEBUG_EMAIL(("Contact's Location - ")); | |
2382 MALLOC_CONTACT(item); | |
2383 LIST_COPY(item->contact->location, (char*)); | |
2384 DEBUG_EMAIL(("%s\n", item->contact->location)); | |
2385 break; | |
2386 case 0x3A0E: // PR_MAIL_PERMISSION - Can the recipient receive and send email | |
2387 DEBUG_EMAIL(("Mail Permission - ")); | |
2388 MALLOC_CONTACT(item); | |
2389 if (*(int16_t*)list->items[x]->data != 0) { | |
2390 DEBUG_EMAIL(("True\n")); | |
2391 item->contact->mail_permission = 1; | |
2392 } else { | |
2393 DEBUG_EMAIL(("False\n")); | |
2394 item->contact->mail_permission = 0; | |
2395 } | |
2396 break; | |
2397 case 0x3A0F: // PR_MHS_COMMON_NAME | |
2398 DEBUG_EMAIL(("MHS Common Name - ")); | |
2399 MALLOC_EMAIL(item); | |
2400 LIST_COPY(item->email->common_name, (char*)); | |
2401 DEBUG_EMAIL(("%s\n", item->email->common_name)); | |
2402 break; | |
2403 case 0x3A10: // PR_ORGANIZATIONAL_ID_NUMBER | |
2404 DEBUG_EMAIL(("Organizational ID # - ")); | |
2405 MALLOC_CONTACT(item); | |
2406 LIST_COPY(item->contact->org_id, (char*)); | |
2407 DEBUG_EMAIL(("%s\n", item->contact->org_id)); | |
2408 break; | |
2409 case 0x3A11: // PR_SURNAME Contact's Surname | |
2410 DEBUG_EMAIL(("Contacts Surname - ")); | |
2411 MALLOC_CONTACT(item); | |
2412 LIST_COPY(item->contact->surname, (char*)); | |
2413 DEBUG_EMAIL(("%s\n", item->contact->surname)); | |
2414 //INC_CHECK_X(); | |
2415 break; | |
2416 case 0x3A12: // PR_ORIGINAL_ENTRY_ID | |
2417 DEBUG_EMAIL(("Original Entry ID - NOT PROCESSED\n")); | |
2418 break; | |
2419 case 0x3A13: // PR_ORIGINAL_DISPLAY_NAME | |
2420 DEBUG_EMAIL(("Original Display Name - NOT PROCESSED\n")); | |
2421 break; | |
2422 case 0x3A14: // PR_ORIGINAL_SEARCH_KEY | |
2423 DEBUG_EMAIL(("Original Search Key - NOT PROCESSED\n")); | |
2424 break; | |
2425 case 0x3A15: // PR_POSTAL_ADDRESS | |
2426 DEBUG_EMAIL(("Default Postal Address - ")); | |
2427 MALLOC_CONTACT(item); | |
2428 LIST_COPY(item->contact->def_postal_address, (char*)); | |
2429 DEBUG_EMAIL(("%s\n", item->contact->def_postal_address)); | |
2430 break; | |
2431 case 0x3A16: // PR_COMPANY_NAME | |
2432 DEBUG_EMAIL(("Company Name - ")); | |
2433 MALLOC_CONTACT(item); | |
2434 LIST_COPY(item->contact->company_name, (char*)); | |
2435 DEBUG_EMAIL(("%s\n", item->contact->company_name)); | |
2436 break; | |
2437 case 0x3A17: // PR_TITLE - Job Title | |
2438 DEBUG_EMAIL(("Job Title - ")); | |
2439 MALLOC_CONTACT(item); | |
2440 LIST_COPY(item->contact->job_title, (char*)); | |
2441 DEBUG_EMAIL(("%s\n", item->contact->job_title)); | |
2442 break; | |
2443 case 0x3A18: // PR_DEPARTMENT_NAME | |
2444 DEBUG_EMAIL(("Department Name - ")); | |
2445 MALLOC_CONTACT(item); | |
2446 LIST_COPY(item->contact->department, (char*)); | |
2447 DEBUG_EMAIL(("%s\n", item->contact->department)); | |
2448 break; | |
2449 case 0x3A19: // PR_OFFICE_LOCATION | |
2450 DEBUG_EMAIL(("Office Location - ")); | |
2451 MALLOC_CONTACT(item); | |
2452 LIST_COPY(item->contact->office_loc, (char*)); | |
2453 DEBUG_EMAIL(("%s\n", item->contact->office_loc)); | |
2454 break; | |
2455 case 0x3A1A: // PR_PRIMARY_TELEPHONE_NUMBER | |
2456 DEBUG_EMAIL(("Primary Telephone - ")); | |
2457 MALLOC_CONTACT(item); | |
2458 LIST_COPY(item->contact->primary_phone, (char*)); | |
2459 DEBUG_EMAIL(("%s\n", item->contact->primary_phone)); | |
2460 break; | |
2461 case 0x3A1B: // PR_BUSINESS2_TELEPHONE_NUMBER | |
2462 DEBUG_EMAIL(("Business Phone Number 2 - ")); | |
2463 MALLOC_CONTACT(item); | |
2464 LIST_COPY(item->contact->business_phone2, (char*)); | |
2465 DEBUG_EMAIL(("%s\n", item->contact->business_phone2)); | |
2466 break; | |
2467 case 0x3A1C: // PR_MOBILE_TELEPHONE_NUMBER | |
2468 DEBUG_EMAIL(("Mobile Phone Number - ")); | |
2469 MALLOC_CONTACT(item); | |
2470 LIST_COPY(item->contact->mobile_phone, (char*)); | |
2471 DEBUG_EMAIL(("%s\n", item->contact->mobile_phone)); | |
2472 break; | |
2473 case 0x3A1D: // PR_RADIO_TELEPHONE_NUMBER | |
2474 DEBUG_EMAIL(("Radio Phone Number - ")); | |
2475 MALLOC_CONTACT(item); | |
2476 LIST_COPY(item->contact->radio_phone, (char*)); | |
2477 DEBUG_EMAIL(("%s\n", item->contact->radio_phone)); | |
2478 break; | |
2479 case 0x3A1E: // PR_CAR_TELEPHONE_NUMBER | |
2480 DEBUG_EMAIL(("Car Phone Number - ")); | |
2481 MALLOC_CONTACT(item); | |
2482 LIST_COPY(item->contact->car_phone, (char*)); | |
2483 DEBUG_EMAIL(("%s\n", item->contact->car_phone)); | |
2484 break; | |
2485 case 0x3A1F: // PR_OTHER_TELEPHONE_NUMBER | |
2486 DEBUG_EMAIL(("Other Phone Number - ")); | |
2487 MALLOC_CONTACT(item); | |
2488 LIST_COPY(item->contact->other_phone, (char*)); | |
2489 DEBUG_EMAIL(("%s\n", item->contact->other_phone)); | |
2490 break; | |
2491 case 0x3A20: // PR_TRANSMITTABLE_DISPLAY_NAME | |
2492 DEBUG_EMAIL(("Transmittable Display Name - ")); | |
2493 MALLOC_CONTACT(item); | |
2494 LIST_COPY(item->contact->transmittable_display_name, (char*)); | |
2495 DEBUG_EMAIL(("%s\n", item->contact->transmittable_display_name)); | |
2496 break; | |
2497 case 0x3A21: // PR_PAGER_TELEPHONE_NUMBER | |
2498 DEBUG_EMAIL(("Pager Phone Number - ")); | |
2499 MALLOC_CONTACT(item); | |
2500 LIST_COPY(item->contact->pager_phone, (char*)); | |
2501 DEBUG_EMAIL(("%s\n", item->contact->pager_phone)); | |
2502 break; | |
2503 case 0x3A22: // PR_USER_CERTIFICATE | |
2504 DEBUG_EMAIL(("User Certificate - NOT PROCESSED")); | |
2505 break; | |
2506 case 0x3A23: // PR_PRIMARY_FAX_NUMBER | |
2507 DEBUG_EMAIL(("Primary Fax Number - ")); | |
2508 MALLOC_CONTACT(item); | |
2509 LIST_COPY(item->contact->primary_fax, (char*)); | |
2510 DEBUG_EMAIL(("%s\n", item->contact->primary_fax)); | |
2511 break; | |
2512 case 0x3A24: // PR_BUSINESS_FAX_NUMBER | |
2513 DEBUG_EMAIL(("Business Fax Number - ")); | |
2514 MALLOC_CONTACT(item); | |
2515 LIST_COPY(item->contact->business_fax, (char*)); | |
2516 DEBUG_EMAIL(("%s\n", item->contact->business_fax)); | |
2517 break; | |
2518 case 0x3A25: // PR_HOME_FAX_NUMBER | |
2519 DEBUG_EMAIL(("Home Fax Number - ")); | |
2520 MALLOC_CONTACT(item); | |
2521 LIST_COPY(item->contact->home_fax, (char*)); | |
2522 DEBUG_EMAIL(("%s\n", item->contact->home_fax)); | |
2523 break; | |
2524 case 0x3A26: // PR_BUSINESS_ADDRESS_COUNTRY | |
2525 DEBUG_EMAIL(("Business Address Country - ")); | |
2526 MALLOC_CONTACT(item); | |
2527 LIST_COPY(item->contact->business_country, (char*)); | |
2528 DEBUG_EMAIL(("%s\n", item->contact->business_country)); | |
2529 break; | |
2530 case 0x3A27: // PR_BUSINESS_ADDRESS_CITY | |
2531 DEBUG_EMAIL(("Business Address City - ")); | |
2532 MALLOC_CONTACT(item); | |
2533 LIST_COPY(item->contact->business_city, (char*)); | |
2534 DEBUG_EMAIL(("%s\n", item->contact->business_city)); | |
2535 break; | |
2536 case 0x3A28: // PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE | |
2537 DEBUG_EMAIL(("Business Address State - ")); | |
2538 MALLOC_CONTACT(item); | |
2539 LIST_COPY(item->contact->business_state, (char*)); | |
2540 DEBUG_EMAIL(("%s\n", item->contact->business_state)); | |
2541 break; | |
2542 case 0x3A29: // PR_BUSINESS_ADDRESS_STREET | |
2543 DEBUG_EMAIL(("Business Address Street - ")); | |
2544 MALLOC_CONTACT(item); | |
2545 LIST_COPY(item->contact->business_street, (char*)); | |
2546 DEBUG_EMAIL(("%s\n", item->contact->business_street)); | |
2547 break; | |
2548 case 0x3A2A: // PR_BUSINESS_POSTAL_CODE | |
2549 DEBUG_EMAIL(("Business Postal Code - ")); | |
2550 MALLOC_CONTACT(item); | |
2551 LIST_COPY(item->contact->business_postal_code, (char*)); | |
2552 DEBUG_EMAIL(("%s\n", item->contact->business_postal_code)); | |
2553 break; | |
2554 case 0x3A2B: // PR_BUSINESS_PO_BOX | |
2555 DEBUG_EMAIL(("Business PO Box - ")); | |
2556 MALLOC_CONTACT(item); | |
2557 LIST_COPY(item->contact->business_po_box, (char*)); | |
2558 DEBUG_EMAIL(("%s\n", item->contact->business_po_box)); | |
2559 break; | |
2560 case 0x3A2C: // PR_TELEX_NUMBER | |
2561 DEBUG_EMAIL(("Telex Number - ")); | |
2562 MALLOC_CONTACT(item); | |
2563 LIST_COPY(item->contact->telex, (char*)); | |
2564 DEBUG_EMAIL(("%s\n", item->contact->telex)); | |
2565 break; | |
2566 case 0x3A2D: // PR_ISDN_NUMBER | |
2567 DEBUG_EMAIL(("ISDN Number - ")); | |
2568 MALLOC_CONTACT(item); | |
2569 LIST_COPY(item->contact->isdn_phone, (char*)); | |
2570 DEBUG_EMAIL(("%s\n", item->contact->isdn_phone)); | |
2571 break; | |
2572 case 0x3A2E: // PR_ASSISTANT_TELEPHONE_NUMBER | |
2573 DEBUG_EMAIL(("Assistant Phone Number - ")); | |
2574 MALLOC_CONTACT(item); | |
2575 LIST_COPY(item->contact->assistant_phone, (char*)); | |
2576 DEBUG_EMAIL(("%s\n", item->contact->assistant_phone)); | |
2577 break; | |
2578 case 0x3A2F: // PR_HOME2_TELEPHONE_NUMBER | |
2579 DEBUG_EMAIL(("Home Phone 2 - ")); | |
2580 MALLOC_CONTACT(item); | |
2581 LIST_COPY(item->contact->home_phone2, (char*)); | |
2582 DEBUG_EMAIL(("%s\n", item->contact->home_phone2)); | |
2583 break; | |
2584 case 0x3A30: // PR_ASSISTANT | |
2585 DEBUG_EMAIL(("Assistant's Name - ")); | |
2586 MALLOC_CONTACT(item); | |
2587 LIST_COPY(item->contact->assistant_name, (char*)); | |
2588 DEBUG_EMAIL(("%s\n", item->contact->assistant_name)); | |
2589 break; | |
2590 case 0x3A40: // PR_SEND_RICH_INFO | |
2591 DEBUG_EMAIL(("Can receive Rich Text - ")); | |
2592 MALLOC_CONTACT(item); | |
2593 if(*(int16_t*)list->items[x]->data != 0) { | |
2594 DEBUG_EMAIL(("True\n")); | |
2595 item->contact->rich_text = 1; | |
2596 } else { | |
2597 DEBUG_EMAIL(("False\n")); | |
2598 item->contact->rich_text = 0; | |
2599 } | |
2600 break; | |
2601 case 0x3A41: // PR_WEDDING_ANNIVERSARY | |
2602 DEBUG_EMAIL(("Wedding Anniversary - ")); | |
2603 MALLOC_CONTACT(item); | |
2604 LIST_COPY(item->contact->wedding_anniversary, (FILETIME*)); | |
2605 DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->contact->wedding_anniversary))); | |
2606 break; | |
2607 case 0x3A42: // PR_BIRTHDAY | |
2608 DEBUG_EMAIL(("Birthday - ")); | |
2609 MALLOC_CONTACT(item); | |
2610 LIST_COPY(item->contact->birthday, (FILETIME*)); | |
2611 DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->contact->birthday))); | |
2612 break; | |
2613 case 0x3A43: // PR_HOBBIES | |
2614 DEBUG_EMAIL(("Hobbies - ")); | |
2615 MALLOC_CONTACT(item); | |
2616 LIST_COPY(item->contact->hobbies, (char*)); | |
2617 DEBUG_EMAIL(("%s\n", item->contact->hobbies)); | |
2618 break; | |
2619 case 0x3A44: // PR_MIDDLE_NAME | |
2620 DEBUG_EMAIL(("Middle Name - ")); | |
2621 MALLOC_CONTACT(item); | |
2622 LIST_COPY(item->contact->middle_name, (char*)); | |
2623 DEBUG_EMAIL(("%s\n", item->contact->middle_name)); | |
2624 break; | |
2625 case 0x3A45: // PR_DISPLAY_NAME_PREFIX | |
2626 DEBUG_EMAIL(("Display Name Prefix (Title) - ")); | |
2627 MALLOC_CONTACT(item); | |
2628 LIST_COPY(item->contact->display_name_prefix, (char*)); | |
2629 DEBUG_EMAIL(("%s\n", item->contact->display_name_prefix)); | |
2630 break; | |
2631 case 0x3A46: // PR_PROFESSION | |
2632 DEBUG_EMAIL(("Profession - ")); | |
2633 MALLOC_CONTACT(item); | |
2634 LIST_COPY(item->contact->profession, (char*)); | |
2635 DEBUG_EMAIL(("%s\n", item->contact->profession)); | |
2636 break; | |
2637 case 0x3A47: // PR_PREFERRED_BY_NAME | |
2638 DEBUG_EMAIL(("Preferred By Name - ")); | |
2639 MALLOC_CONTACT(item); | |
2640 LIST_COPY(item->contact->pref_name, (char*)); | |
2641 DEBUG_EMAIL(("%s\n", item->contact->pref_name)); | |
2642 break; | |
2643 case 0x3A48: // PR_SPOUSE_NAME | |
2644 DEBUG_EMAIL(("Spouse's Name - ")); | |
2645 MALLOC_CONTACT(item); | |
2646 LIST_COPY(item->contact->spouse_name, (char*)); | |
2647 DEBUG_EMAIL(("%s\n", item->contact->spouse_name)); | |
2648 break; | |
2649 case 0x3A49: // PR_COMPUTER_NETWORK_NAME | |
2650 DEBUG_EMAIL(("Computer Network Name - ")); | |
2651 MALLOC_CONTACT(item); | |
2652 LIST_COPY(item->contact->computer_name, (char*)); | |
2653 DEBUG_EMAIL(("%s\n", item->contact->computer_name)); | |
2654 break; | |
2655 case 0x3A4A: // PR_CUSTOMER_ID | |
2656 DEBUG_EMAIL(("Customer ID - ")); | |
2657 MALLOC_CONTACT(item); | |
2658 LIST_COPY(item->contact->customer_id, (char*)); | |
2659 DEBUG_EMAIL(("%s\n", item->contact->customer_id)); | |
2660 break; | |
2661 case 0x3A4B: // PR_TTYTDD_PHONE_NUMBER | |
2662 DEBUG_EMAIL(("TTY/TDD Phone - ")); | |
2663 MALLOC_CONTACT(item); | |
2664 LIST_COPY(item->contact->ttytdd_phone, (char*)); | |
2665 DEBUG_EMAIL(("%s\n", item->contact->ttytdd_phone)); | |
2666 break; | |
2667 case 0x3A4C: // PR_FTP_SITE | |
2668 DEBUG_EMAIL(("Ftp Site - ")); | |
2669 MALLOC_CONTACT(item); | |
2670 LIST_COPY(item->contact->ftp_site, (char*)); | |
2671 DEBUG_EMAIL(("%s\n", item->contact->ftp_site)); | |
2672 break; | |
2673 case 0x3A4D: // PR_GENDER | |
2674 DEBUG_EMAIL(("Gender - ")); | |
2675 MALLOC_CONTACT(item); | |
2676 memcpy(&item->contact->gender, list->items[x]->data, sizeof(int16_t)); | |
2677 LE16_CPU(item->contact->gender); | |
2678 switch(item->contact->gender) { | |
2679 case 0: | |
2680 DEBUG_EMAIL(("Unspecified\n")); | |
2681 break; | |
2682 case 1: | |
2683 DEBUG_EMAIL(("Female\n")); | |
2684 break; | |
2685 case 2: | |
2686 DEBUG_EMAIL(("Male\n")); | |
2687 break; | |
2688 default: | |
2689 DEBUG_EMAIL(("Error processing\n")); | |
2690 } | |
2691 break; | |
2692 case 0x3A4E: // PR_MANAGER_NAME | |
2693 DEBUG_EMAIL(("Manager's Name - ")); | |
2694 MALLOC_CONTACT(item); | |
2695 LIST_COPY(item->contact->manager_name, (char*)); | |
2696 DEBUG_EMAIL(("%s\n", item->contact->manager_name)); | |
2697 break; | |
2698 case 0x3A4F: // PR_NICKNAME | |
2699 DEBUG_EMAIL(("Nickname - ")); | |
2700 MALLOC_CONTACT(item); | |
2701 LIST_COPY(item->contact->nickname, (char*)); | |
2702 DEBUG_EMAIL(("%s\n", item->contact->nickname)); | |
2703 break; | |
2704 case 0x3A50: // PR_PERSONAL_HOME_PAGE | |
2705 DEBUG_EMAIL(("Personal Home Page - ")); | |
2706 MALLOC_CONTACT(item); | |
2707 LIST_COPY(item->contact->personal_homepage, (char*)); | |
2708 DEBUG_EMAIL(("%s\n", item->contact->personal_homepage)); | |
2709 break; | |
2710 case 0x3A51: // PR_BUSINESS_HOME_PAGE | |
2711 DEBUG_EMAIL(("Business Home Page - ")); | |
2712 MALLOC_CONTACT(item); | |
2713 LIST_COPY(item->contact->business_homepage, (char*)); | |
2714 DEBUG_EMAIL(("%s\n", item->contact->business_homepage)); | |
2715 break; | |
2716 case 0x3A57: // PR_COMPANY_MAIN_PHONE_NUMBER | |
2717 DEBUG_EMAIL(("Company Main Phone - ")); | |
2718 MALLOC_CONTACT(item); | |
2719 LIST_COPY(item->contact->company_main_phone, (char*)); | |
2720 DEBUG_EMAIL(("%s\n", item->contact->company_main_phone)); | |
2721 break; | |
2722 case 0x3A58: // PR_CHILDRENS_NAMES | |
2723 DEBUG_EMAIL(("Children's Names - NOT PROCESSED\n")); | |
2724 break; | |
2725 case 0x3A59: // PR_HOME_ADDRESS_CITY | |
2726 DEBUG_EMAIL(("Home Address City - ")); | |
2727 MALLOC_CONTACT(item); | |
2728 LIST_COPY(item->contact->home_city, (char*)); | |
2729 DEBUG_EMAIL(("%s\n", item->contact->home_city)); | |
2730 break; | |
2731 case 0x3A5A: // PR_HOME_ADDRESS_COUNTRY | |
2732 DEBUG_EMAIL(("Home Address Country - ")); | |
2733 MALLOC_CONTACT(item); | |
2734 LIST_COPY(item->contact->home_country, (char*)); | |
2735 DEBUG_EMAIL(("%s\n", item->contact->home_country)); | |
2736 break; | |
2737 case 0x3A5B: // PR_HOME_ADDRESS_POSTAL_CODE | |
2738 DEBUG_EMAIL(("Home Address Postal Code - ")); | |
2739 MALLOC_CONTACT(item); | |
2740 LIST_COPY(item->contact->home_postal_code, (char*)); | |
2741 DEBUG_EMAIL(("%s\n", item->contact->home_postal_code)); | |
2742 break; | |
2743 case 0x3A5C: // PR_HOME_ADDRESS_STATE_OR_PROVINCE | |
2744 DEBUG_EMAIL(("Home Address State or Province - ")); | |
2745 MALLOC_CONTACT(item); | |
2746 LIST_COPY(item->contact->home_state, (char*)); | |
2747 DEBUG_EMAIL(("%s\n", item->contact->home_state)); | |
2748 break; | |
2749 case 0x3A5D: // PR_HOME_ADDRESS_STREET | |
2750 DEBUG_EMAIL(("Home Address Street - ")); | |
2751 MALLOC_CONTACT(item); | |
2752 LIST_COPY(item->contact->home_street, (char*)); | |
2753 DEBUG_EMAIL(("%s\n", item->contact->home_street)); | |
2754 break; | |
2755 case 0x3A5E: // PR_HOME_ADDRESS_POST_OFFICE_BOX | |
2756 DEBUG_EMAIL(("Home Address Post Office Box - ")); | |
2757 MALLOC_CONTACT(item); | |
2758 LIST_COPY(item->contact->home_po_box, (char*)); | |
2759 DEBUG_EMAIL(("%s\n", item->contact->home_po_box)); | |
2760 break; | |
2761 case 0x3A5F: // PR_OTHER_ADDRESS_CITY | |
2762 DEBUG_EMAIL(("Other Address City - ")); | |
2763 MALLOC_CONTACT(item); | |
2764 LIST_COPY(item->contact->other_city, (char*)); | |
2765 DEBUG_EMAIL(("%s\n", item->contact->other_city)); | |
2766 break; | |
2767 case 0x3A60: // PR_OTHER_ADDRESS_COUNTRY | |
2768 DEBUG_EMAIL(("Other Address Country - ")); | |
2769 MALLOC_CONTACT(item); | |
2770 LIST_COPY(item->contact->other_country, (char*)); | |
2771 DEBUG_EMAIL(("%s\n", item->contact->other_country)); | |
2772 break; | |
2773 case 0x3A61: // PR_OTHER_ADDRESS_POSTAL_CODE | |
2774 DEBUG_EMAIL(("Other Address Postal Code - ")); | |
2775 MALLOC_CONTACT(item); | |
2776 LIST_COPY(item->contact->other_postal_code, (char*)); | |
2777 DEBUG_EMAIL(("%s\n", item->contact->other_postal_code)); | |
2778 break; | |
2779 case 0x3A62: // PR_OTHER_ADDRESS_STATE_OR_PROVINCE | |
2780 DEBUG_EMAIL(("Other Address State - ")); | |
2781 MALLOC_CONTACT(item); | |
2782 LIST_COPY(item->contact->other_state, (char*)); | |
2783 DEBUG_EMAIL(("%s\n", item->contact->other_state)); | |
2784 break; | |
2785 case 0x3A63: // PR_OTHER_ADDRESS_STREET | |
2786 DEBUG_EMAIL(("Other Address Street - ")); | |
2787 MALLOC_CONTACT(item); | |
2788 LIST_COPY(item->contact->other_street, (char*)); | |
2789 DEBUG_EMAIL(("%s\n", item->contact->other_street)); | |
2790 break; | |
2791 case 0x3A64: // PR_OTHER_ADDRESS_POST_OFFICE_BOX | |
2792 DEBUG_EMAIL(("Other Address Post Office box - ")); | |
2793 MALLOC_CONTACT(item); | |
2794 LIST_COPY(item->contact->other_po_box, (char*)); | |
2795 DEBUG_EMAIL(("%s\n", item->contact->other_po_box)); | |
2796 break; | |
2797 case 0x65E3: // Entry ID? | |
2798 DEBUG_EMAIL(("Entry ID - ")); | |
2799 item->record_key = (char*) xmalloc(16+1); | |
2800 memcpy(item->record_key, &(list->items[x]->data[1]), 16); //skip first byte | |
2801 item->record_key[16]='\0'; | |
2802 item->record_key_size=16; | |
2803 DEBUG_EMAIL_HEXPRINT((char*)item->record_key, 16); | |
2804 //INC_CHECK_X(); | |
2805 break; | |
2806 case 0x67F2: // ID2 value of the attachments proper record | |
2807 DEBUG_EMAIL(("Attachment ID2 value - ")); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
2808 if (attach){ |
11 | 2809 MOVE_NEXT(attach); |
2810 memcpy(&(attach->id2_val), list->items[x]->data, sizeof(attach->id2_val)); | |
2811 LE32_CPU(attach->id2_val); | |
2812 DEBUG_EMAIL(("%#x\n", attach->id2_val)); | |
2813 } else { | |
2814 DEBUG_EMAIL(("NOT AN ATTACHMENT: %#x\n", list->items[x]->id)); | |
2815 } | |
2816 //INC_CHECK_X(); | |
2817 break; | |
2818 case 0x67FF: // Extra Property Identifier (Password CheckSum) | |
2819 DEBUG_EMAIL(("Password checksum [0x67FF] - ")); | |
2820 MALLOC_MESSAGESTORE(item); | |
2821 memcpy(&(item->message_store->pwd_chksum), list->items[x]->data, | |
2822 sizeof(item->message_store->pwd_chksum)); | |
2823 DEBUG_EMAIL(("%#x\n", item->message_store->pwd_chksum)); | |
2824 //INC_CHECK_X(); | |
2825 break; | |
2826 case 0x6F02: // Secure HTML Body | |
2827 DEBUG_EMAIL(("Secure HTML Body - ")); | |
2828 MALLOC_EMAIL(item); | |
2829 LIST_COPY(item->email->encrypted_htmlbody, (char*)); | |
2830 item->email->encrypted_htmlbody_size = list->items[x]->size; | |
2831 DEBUG_EMAIL(("Not Printed\n")); | |
2832 //INC_CHECK_X(); | |
2833 break; | |
2834 case 0x6F04: // Secure Text Body | |
2835 DEBUG_EMAIL(("Secure Text Body - ")); | |
2836 MALLOC_EMAIL(item); | |
2837 LIST_COPY(item->email->encrypted_body, (char*)); | |
2838 item->email->encrypted_body_size = list->items[x]->size; | |
2839 DEBUG_EMAIL(("Not Printed\n")); | |
2840 //INC_CHECK_X(); | |
2841 break; | |
2842 case 0x7C07: // top of folders ENTRYID | |
2843 DEBUG_EMAIL(("Top of folders RecID [0x7c07] - ")); | |
2844 MALLOC_MESSAGESTORE(item); | |
2845 item->message_store->top_of_folder = (pst_entryid*) xmalloc(sizeof(pst_entryid)); | |
2846 memcpy(item->message_store->top_of_folder, list->items[x]->data, sizeof(pst_entryid)); | |
2847 LE32_CPU(item->message_store->top_of_folder->u1); | |
2848 LE32_CPU(item->message_store->top_of_folder->id); | |
2849 DEBUG_EMAIL_HEXPRINT((char*)item->message_store->top_of_folder->entryid, 16); | |
2850 //INC_CHECK_X(); | |
2851 break; | |
2852 case 0x8005: // Contact's Fullname | |
2853 DEBUG_EMAIL(("Contact Fullname - ")); | |
2854 MALLOC_CONTACT(item); | |
2855 LIST_COPY(item->contact->fullname, (char*)); | |
2856 DEBUG_EMAIL(("%s\n", item->contact->fullname)); | |
2857 break; | |
2858 case 0x801A: // Full Home Address | |
2859 DEBUG_EMAIL(("Home Address - ")); | |
2860 MALLOC_CONTACT(item); | |
2861 LIST_COPY(item->contact->home_address, (char*)); | |
2862 DEBUG_EMAIL(("%s\n", item->contact->home_address)); | |
2863 break; | |
2864 case 0x801B: // Full Business Address | |
2865 DEBUG_EMAIL(("Business Address - ")); | |
2866 MALLOC_CONTACT(item); | |
2867 LIST_COPY(item->contact->business_address, (char*)); | |
2868 DEBUG_EMAIL(("%s\n", item->contact->business_address)); | |
2869 break; | |
2870 case 0x801C: // Full Other Address | |
2871 DEBUG_EMAIL(("Other Address - ")); | |
2872 MALLOC_CONTACT(item); | |
2873 LIST_COPY(item->contact->other_address, (char*)); | |
2874 DEBUG_EMAIL(("%s\n", item->contact->other_address)); | |
2875 break; | |
2876 case 0x8082: // Email Address 1 Transport | |
2877 DEBUG_EMAIL(("Email Address 1 Transport - ")); | |
2878 MALLOC_CONTACT(item); | |
2879 LIST_COPY(item->contact->address1_transport, (char*)); | |
2880 DEBUG_EMAIL(("|%s|\n", item->contact->address1_transport)); | |
2881 break; | |
2882 case 0x8083: // Email Address 1 Address | |
2883 DEBUG_EMAIL(("Email Address 1 Address - ")); | |
2884 MALLOC_CONTACT(item); | |
2885 LIST_COPY(item->contact->address1, (char*)); | |
2886 DEBUG_EMAIL(("|%s|\n", item->contact->address1)); | |
2887 break; | |
2888 case 0x8084: // Email Address 1 Description | |
2889 DEBUG_EMAIL(("Email Address 1 Description - ")); | |
2890 MALLOC_CONTACT(item); | |
2891 LIST_COPY(item->contact->address1_desc, (char*)); | |
2892 DEBUG_EMAIL(("|%s|\n", item->contact->address1_desc)); | |
2893 break; | |
2894 case 0x8085: // Email Address 1 Record | |
2895 DEBUG_EMAIL(("Email Address 1 Record - ")); | |
2896 MALLOC_CONTACT(item); | |
2897 LIST_COPY(item->contact->address1a, (char*)); | |
2898 DEBUG_EMAIL(("|%s|\n", item->contact->address1a)); | |
2899 break; | |
2900 case 0x8092: // Email Address 2 Transport | |
2901 DEBUG_EMAIL(("Email Address 2 Transport - ")); | |
2902 MALLOC_CONTACT(item); | |
2903 LIST_COPY(item->contact->address2_transport, (char*)); | |
2904 DEBUG_EMAIL(("|%s|\n", item->contact->address2_transport)); | |
2905 break; | |
2906 case 0x8093: // Email Address 2 Address | |
2907 DEBUG_EMAIL(("Email Address 2 Address - ")); | |
2908 MALLOC_CONTACT(item); | |
2909 LIST_COPY(item->contact->address2, (char*)); | |
2910 DEBUG_EMAIL(("|%s|\n", item->contact->address2)); | |
2911 break; | |
2912 case 0x8094: // Email Address 2 Description | |
2913 DEBUG_EMAIL (("Email Address 2 Description - ")); | |
2914 MALLOC_CONTACT(item); | |
2915 LIST_COPY(item->contact->address2_desc, (char*)); | |
2916 DEBUG_EMAIL(("|%s|\n", item->contact->address2_desc)); | |
2917 break; | |
2918 case 0x8095: // Email Address 2 Record | |
2919 DEBUG_EMAIL(("Email Address 2 Record - ")); | |
2920 MALLOC_CONTACT(item); | |
2921 LIST_COPY(item->contact->address2a, (char*)); | |
2922 DEBUG_EMAIL(("|%s|\n", item->contact->address2a)); | |
2923 break; | |
2924 case 0x80A2: // Email Address 3 Transport | |
2925 DEBUG_EMAIL (("Email Address 3 Transport - ")); | |
2926 MALLOC_CONTACT(item); | |
2927 LIST_COPY(item->contact->address3_transport, (char*)); | |
2928 DEBUG_EMAIL(("|%s|\n", item->contact->address3_transport)); | |
2929 break; | |
2930 case 0x80A3: // Email Address 3 Address | |
2931 DEBUG_EMAIL(("Email Address 3 Address - ")); | |
2932 MALLOC_CONTACT(item); | |
2933 LIST_COPY(item->contact->address3, (char*)); | |
2934 DEBUG_EMAIL(("|%s|\n", item->contact->address3)); | |
2935 break; | |
2936 case 0x80A4: // Email Address 3 Description | |
2937 DEBUG_EMAIL(("Email Address 3 Description - ")); | |
2938 MALLOC_CONTACT(item); | |
2939 LIST_COPY(item->contact->address3_desc, (char*)); | |
2940 DEBUG_EMAIL(("|%s|\n", item->contact->address3_desc)); | |
2941 break; | |
2942 case 0x80A5: // Email Address 3 Record | |
2943 DEBUG_EMAIL(("Email Address 3 Record - ")); | |
2944 MALLOC_CONTACT(item); | |
2945 LIST_COPY(item->contact->address3a, (char*)); | |
2946 DEBUG_EMAIL(("|%s|\n", item->contact->address3a)); | |
2947 break; | |
2948 case 0x80D8: // Internet Free/Busy | |
2949 DEBUG_EMAIL(("Internet Free/Busy - ")); | |
2950 MALLOC_CONTACT(item); | |
2951 LIST_COPY(item->contact->free_busy_address, (char*)); | |
2952 DEBUG_EMAIL(("%s\n", item->contact->free_busy_address)); | |
2953 break; | |
2954 case 0x8205: // Show on Free/Busy as | |
2955 // 0: Free | |
2956 // 1: Tentative | |
2957 // 2: Busy | |
2958 // 3: Out Of Office | |
2959 DEBUG_EMAIL(("Appointment shows as - ")); | |
2960 MALLOC_APPOINTMENT(item); | |
2961 memcpy(&(item->appointment->showas), list->items[x]->data, sizeof(item->appointment->showas)); | |
2962 LE32_CPU(item->appointment->showas); | |
2963 switch (item->appointment->showas) { | |
2964 case PST_FREEBUSY_FREE: | |
2965 DEBUG_EMAIL(("Free\n")); break; | |
2966 case PST_FREEBUSY_TENTATIVE: | |
2967 DEBUG_EMAIL(("Tentative\n")); break; | |
2968 case PST_FREEBUSY_BUSY: | |
2969 DEBUG_EMAIL(("Busy\n")); break; | |
2970 case PST_FREEBUSY_OUT_OF_OFFICE: | |
2971 DEBUG_EMAIL(("Out Of Office\n")); break; | |
2972 default: | |
2973 DEBUG_EMAIL(("Unknown Value: %d\n", item->appointment->showas)); break; | |
2974 } | |
2975 break; | |
2976 case 0x8208: // Location of an appointment | |
2977 DEBUG_EMAIL(("Appointment Location - ")); | |
2978 MALLOC_APPOINTMENT(item); | |
2979 LIST_COPY(item->appointment->location, (char*)); | |
2980 DEBUG_EMAIL(("%s\n", item->appointment->location)); | |
2981 break; | |
2982 case 0x8214: // Label for an appointment | |
2983 DEBUG_EMAIL(("Label for appointment - ")); | |
2984 MALLOC_APPOINTMENT(item); | |
2985 memcpy(&(item->appointment->label), list->items[x]->data, sizeof(item->appointment->label)); | |
2986 LE32_CPU(item->appointment->label); | |
2987 switch (item->appointment->label) { | |
2988 case PST_APP_LABEL_NONE: | |
2989 DEBUG_EMAIL(("None\n")); break; | |
2990 case PST_APP_LABEL_IMPORTANT: | |
2991 DEBUG_EMAIL(("Important\n")); break; | |
2992 case PST_APP_LABEL_BUSINESS: | |
2993 DEBUG_EMAIL(("Business\n")); break; | |
2994 case PST_APP_LABEL_PERSONAL: | |
2995 DEBUG_EMAIL(("Personal\n")); break; | |
2996 case PST_APP_LABEL_VACATION: | |
2997 DEBUG_EMAIL(("Vacation\n")); break; | |
2998 case PST_APP_LABEL_MUST_ATTEND: | |
2999 DEBUG_EMAIL(("Must Attend\n")); break; | |
3000 case PST_APP_LABEL_TRAVEL_REQ: | |
3001 DEBUG_EMAIL(("Travel Required\n")); break; | |
3002 case PST_APP_LABEL_NEEDS_PREP: | |
3003 DEBUG_EMAIL(("Needs Preparation\n")); break; | |
3004 case PST_APP_LABEL_BIRTHDAY: | |
3005 DEBUG_EMAIL(("Birthday\n")); break; | |
3006 case PST_APP_LABEL_ANNIVERSARY: | |
3007 DEBUG_EMAIL(("Anniversary\n")); break; | |
3008 case PST_APP_LABEL_PHONE_CALL: | |
3009 DEBUG_EMAIL(("Phone Call\n")); break; | |
3010 } | |
3011 break; | |
3012 case 0x8234: // TimeZone as String | |
3013 DEBUG_EMAIL(("TimeZone of times - ")); | |
3014 MALLOC_APPOINTMENT(item); | |
3015 LIST_COPY(item->appointment->timezonestring, (char*)); | |
3016 DEBUG_EMAIL(("%s\n", item->appointment->timezonestring)); | |
3017 break; | |
3018 case 0x8235: // Appointment start time | |
3019 DEBUG_EMAIL(("Appointment Start Time - ")); | |
3020 MALLOC_APPOINTMENT(item); | |
3021 LIST_COPY(item->appointment->start, (FILETIME*)); | |
3022 DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)item->appointment->start))); | |
3023 break; | |
3024 case 0x8236: // Appointment end time | |
3025 DEBUG_EMAIL(("Appointment End Time - ")); | |
3026 MALLOC_APPOINTMENT(item); | |
3027 LIST_COPY(item->appointment->end, (FILETIME*)); | |
3028 DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)item->appointment->start))); | |
3029 break; | |
3030 case 0x8516: // Journal time start | |
3031 DEBUG_EMAIL(("Duplicate Time Start - ")); | |
3032 DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)list->items[x]->data))); | |
3033 break; | |
3034 case 0x8517: // Journal time end | |
3035 DEBUG_EMAIL(("Duplicate Time End - ")); | |
3036 DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)list->items[x]->data))); | |
3037 break; | |
3038 case 0x8530: // Followup | |
3039 DEBUG_EMAIL(("Followup String - ")); | |
3040 MALLOC_CONTACT(item); | |
3041 LIST_COPY(item->contact->followup, (char*)); | |
3042 DEBUG_EMAIL(("%s\n", item->contact->followup)); | |
3043 break; | |
3044 case 0x8534: // Mileage | |
3045 DEBUG_EMAIL(("Mileage - ")); | |
3046 MALLOC_CONTACT(item); | |
3047 LIST_COPY(item->contact->mileage, (char*)); | |
3048 DEBUG_EMAIL(("%s\n", item->contact->mileage)); | |
3049 break; | |
3050 case 0x8535: // Billing Information | |
3051 DEBUG_EMAIL(("Billing Information - ")); | |
3052 MALLOC_CONTACT(item); | |
3053 LIST_COPY(item->contact->billing_information, (char*)); | |
3054 DEBUG_EMAIL(("%s\n", item->contact->billing_information)); | |
3055 break; | |
3056 case 0x8554: // Outlook Version | |
3057 DEBUG_EMAIL(("Outlook Version - ")); | |
3058 LIST_COPY(item->outlook_version, (char*)); | |
3059 DEBUG_EMAIL(("%s\n", item->outlook_version)); | |
3060 break; | |
3061 case 0x8560: // Appointment Reminder Time | |
3062 DEBUG_EMAIL(("Appointment Reminder Time - ")); | |
3063 MALLOC_APPOINTMENT(item); | |
3064 LIST_COPY(item->appointment->reminder, (FILETIME*)); | |
3065 DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->appointment->reminder))); | |
3066 break; | |
3067 case 0x8700: // Journal Type | |
3068 DEBUG_EMAIL(("Journal Entry Type - ")); | |
3069 MALLOC_JOURNAL(item); | |
3070 LIST_COPY(item->journal->type, (char*)); | |
3071 DEBUG_EMAIL(("%s\n", item->journal->type)); | |
3072 break; | |
3073 case 0x8706: // Journal Start date/time | |
3074 DEBUG_EMAIL(("Start Timestamp - ")); | |
3075 MALLOC_JOURNAL(item); | |
3076 LIST_COPY(item->journal->start, (FILETIME*)); | |
3077 DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->journal->start))); | |
3078 break; | |
3079 case 0x8708: // Journal End date/time | |
3080 DEBUG_EMAIL(("End Timestamp - ")); | |
3081 MALLOC_JOURNAL(item); | |
3082 LIST_COPY(item->journal->end, (FILETIME*)); | |
3083 DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->journal->end))); | |
3084 break; | |
3085 case 0x8712: // Title? | |
3086 DEBUG_EMAIL(("Journal Entry Type - ")); | |
3087 MALLOC_JOURNAL(item); | |
3088 LIST_COPY(item->journal->type, (char*)); | |
3089 DEBUG_EMAIL(("%s\n", item->journal->type)); | |
3090 break; | |
3091 default: | |
3092 /* Reference Types | |
3093 | |
3094 2 - 0x0002 - Signed 16bit value | |
3095 3 - 0x0003 - Signed 32bit value | |
3096 11 - 0x000B - Boolean (non-zero = true) | |
3097 13 - 0x000D - Embedded Object | |
3098 30 - 0x001E - Null terminated String | |
3099 31 - 0x001F - Unicode string | |
3100 64 - 0x0040 - Systime - Filetime structure | |
3101 72 - 0x0048 - OLE Guid | |
3102 258 - 0x0102 - Binary data | |
3103 | |
3104 - 0x1003 - Array of 32bit values | |
3105 - 0x101E - Array of Strings | |
3106 - 0x1102 - Array of Binary data | |
3107 */ | |
3108 // DEBUG_EMAIL(("Unknown id [%#x, size=%#x]\n", list->items[x]->id, list->items[x]->size)); | |
3109 if (list->items[x]->type == 0x02) { | |
3110 DEBUG_EMAIL(("Unknown 16bit int = %hi\n", *(int16_t*)list->items[x]->data)); | |
3111 } else if (list->items[x]->type == 0x03) { | |
3112 DEBUG_EMAIL(("Unknown 32bit int = %i\n", *(int32_t*)list->items[x]->data)); | |
3113 } else if (list->items[x]->type == 0x0b) { | |
3114 DEBUG_EMAIL(("Unknown 16bit boolean = %s [%hi]\n", | |
3115 (*((int16_t*)list->items[x]->data)!=0?"True":"False"), | |
3116 *((int16_t*)list->items[x]->data))); | |
3117 } else if (list->items[x]->type == 0x1e) { | |
3118 DEBUG_EMAIL(("Unknown String Data = \"%s\" [%#x]\n", | |
3119 list->items[x]->data, list->items[x]->type)); | |
3120 } else if (list->items[x]->type == 0x40) { | |
3121 DEBUG_EMAIL(("Unknown Date = \"%s\" [%#x]\n", | |
3122 fileTimeToAscii((FILETIME*)list->items[x]->data), | |
3123 list->items[x]->type)); | |
3124 } else if (list->items[x]->type == 0x102) { | |
3125 DEBUG_EMAIL(("Unknown Binary Data [size = %#x]\n", | |
3126 list->items[x]->size)); | |
3127 DEBUG_HEXDUMP(list->items[x]->data, list->items[x]->size); | |
3128 } else if (list->items[x]->type == 0x101E) { | |
3129 DEBUG_EMAIL(("Unknown Array of Strings [%#x]\n", | |
3130 list->items[x]->type)); | |
3131 } else { | |
3132 DEBUG_EMAIL(("Unknown Not Printable [%#x]\n", | |
3133 list->items[x]->type)); | |
3134 } | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3135 if (list->items[x]->data) { |
11 | 3136 free(list->items[x]->data); |
3137 list->items[x]->data = NULL; | |
3138 } | |
3139 //INC_CHECK_X(); | |
3140 } | |
3141 x++; | |
3142 } | |
3143 x = 0; | |
3144 list = list->next; | |
3145 next = 1; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3146 } |
11 | 3147 DEBUG_RET(); |
3148 return 0; | |
0 | 3149 } |
3150 | |
11 | 3151 |
0 | 3152 int32_t _pst_free_list(pst_num_array *list) { |
11 | 3153 int32_t x = 0; |
3154 pst_num_array *l; | |
3155 DEBUG_ENT("_pst_free_list"); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3156 while (list) { |
11 | 3157 while (x < list->count_item) { |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3158 if (list->items[x]->data) { |
11 | 3159 free (list->items[x]->data); |
3160 } | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3161 if (list->items[x]) { |
11 | 3162 free (list->items[x]); |
3163 } | |
3164 x++; | |
3165 } | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3166 if (list->items) { |
11 | 3167 free(list->items); |
3168 } | |
3169 l = list; | |
3170 list = list->next; | |
3171 free (l); | |
3172 x = 0; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3173 } |
11 | 3174 DEBUG_RET(); |
3175 return 1; | |
0 | 3176 } |
3177 | |
11 | 3178 |
0 | 3179 int32_t _pst_free_id2(pst_index2_ll * head) { |
11 | 3180 pst_index2_ll *t; |
3181 DEBUG_ENT("_pst_free_id2"); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3182 while (head) { |
11 | 3183 t = head->next; |
3184 free (head); | |
3185 head = t; | |
3186 } | |
3187 DEBUG_RET(); | |
3188 return 1; | |
0 | 3189 } |
3190 | |
11 | 3191 |
0 | 3192 int32_t _pst_free_id (pst_index_ll *head) { |
11 | 3193 pst_index_ll *t; |
3194 DEBUG_ENT("_pst_free_id"); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3195 while (head) { |
11 | 3196 t = head->next; |
3197 free(head); | |
3198 head = t; | |
3199 } | |
3200 DEBUG_RET(); | |
3201 return 1; | |
0 | 3202 } |
3203 | |
11 | 3204 |
0 | 3205 int32_t _pst_free_desc (pst_desc_ll *head) { |
11 | 3206 pst_desc_ll *t; |
3207 DEBUG_ENT("_pst_free_desc"); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3208 while (head) { |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3209 while (head->child) { |
11 | 3210 head = head->child; |
3211 } | |
8 | 3212 |
11 | 3213 // point t to the next item |
3214 t = head->next; | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3215 if (!t && head->parent) { |
11 | 3216 t = head->parent; |
3217 t->child = NULL; // set the child to NULL so we don't come back here again! | |
3218 } | |
3219 | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3220 if (head) free(head); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3221 else DIE(("head is NULL")); |
11 | 3222 |
3223 head = t; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3224 } |
11 | 3225 DEBUG_RET(); |
3226 return 1; | |
3227 } | |
0 | 3228 |
3229 | |
3230 int32_t _pst_free_xattrib(pst_x_attrib_ll *x) { | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3231 pst_x_attrib_ll *t; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3232 DEBUG_ENT("_pst_free_xattrib"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3233 while (x) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3234 if (x->data) free(x->data); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3235 t = x->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3236 free(x); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3237 x = t; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3238 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3239 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3240 return 1; |
0 | 3241 } |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3242 |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3243 |
0 | 3244 pst_index2_ll * _pst_build_id2(pst_file *pf, pst_index_ll* list, pst_index2_ll* head_ptr) { |
11 | 3245 pst_block_header block_head; |
3246 pst_index2_ll *head = NULL, *tail = NULL; | |
3247 int32_t x = 0, b_ptr = 0; | |
3248 char *buf = NULL; | |
3249 pst_id2_assoc id2_rec; | |
3250 pst_index_ll *i_ptr = NULL; | |
3251 pst_index2_ll *i2_ptr = NULL; | |
3252 DEBUG_ENT("_pst_build_id2"); | |
3253 if (head_ptr) { | |
3254 head = head_ptr; | |
3255 while (head_ptr) head_ptr = (tail = head_ptr)->next; | |
3256 } | |
3257 if (_pst_read_block_size(pf, list->offset, list->size, &buf, PST_NO_ENC, 0) < list->size) { | |
3258 //an error occured in block read | |
3259 WARN(("block read error occured. offset = %#x, size = %#x\n", list->offset, list->size)); | |
3260 DEBUG_RET(); | |
3261 return NULL; | |
3262 } | |
3263 DEBUG_HEXDUMPC(buf, list->size, 16); | |
0 | 3264 |
11 | 3265 memcpy(&block_head, buf, sizeof(block_head)); |
3266 LE16_CPU(block_head.type); | |
3267 LE16_CPU(block_head.count); | |
0 | 3268 |
11 | 3269 if (block_head.type != 0x0002) { // some sort of constant? |
3270 WARN(("Unknown constant [%#x] at start of id2 values [offset %#x].\n", block_head.type, list->offset)); | |
3271 DEBUG_RET(); | |
3272 return NULL; | |
3273 } | |
0 | 3274 |
11 | 3275 DEBUG_INDEX(("ID %#x is likely to be a description record. Count is %i (offset %#x)\n", |
3276 list->id, block_head.count, list->offset)); | |
3277 x = 0; | |
3278 b_ptr = 0x04; | |
3279 while (x < block_head.count) { | |
3280 memcpy(&id2_rec, &(buf[b_ptr]), sizeof(id2_rec)); | |
3281 LE32_CPU(id2_rec.id2); | |
3282 LE32_CPU(id2_rec.id); | |
3283 LE32_CPU(id2_rec.table2); | |
0 | 3284 |
11 | 3285 b_ptr += sizeof(id2_rec); |
3286 DEBUG_INDEX(("\tid2 = %#x, id = %#x, table2 = %#x\n", id2_rec.id2, id2_rec.id, id2_rec.table2)); | |
3287 if ((i_ptr = _pst_getID(pf, id2_rec.id)) == NULL) { | |
3288 DEBUG_WARN(("\t\t%#x - Not Found\n", id2_rec.id)); | |
3289 } else { | |
3290 DEBUG_INDEX(("\t\t%#x - Offset %#x, u1 %#x, Size %i(%#x)\n", i_ptr->id, i_ptr->offset, i_ptr->u1, i_ptr->size, i_ptr->size)); | |
3291 // add it to the linked list | |
3292 i2_ptr = (pst_index2_ll*) xmalloc(sizeof(pst_index2_ll)); | |
3293 i2_ptr->id2 = id2_rec.id2; | |
3294 i2_ptr->id = i_ptr; | |
3295 i2_ptr->next = NULL; | |
3296 if (!head) head = i2_ptr; | |
3297 if (tail) tail->next = i2_ptr; | |
3298 tail = i2_ptr; | |
3299 if (id2_rec.table2 != 0) { | |
3300 if ((i_ptr = _pst_getID(pf, id2_rec.table2)) == NULL) { | |
3301 DEBUG_WARN(("\tTable2 [%#x] not found\n", id2_rec.table2)); | |
3302 } | |
3303 else { | |
3304 DEBUG_INDEX(("\tGoing deeper for table2 [%#x]\n", id2_rec.table2)); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3305 if ((i2_ptr = _pst_build_id2(pf, i_ptr, head))) { |
11 | 3306 // DEBUG_INDEX(("_pst_build_id2(): \t\tAdding new list onto end of current\n")); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3307 // if (!head) |
11 | 3308 // head = i2_ptr; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3309 // if (tail) |
11 | 3310 // tail->next = i2_ptr; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3311 // while (i2_ptr->next) |
11 | 3312 // i2_ptr = i2_ptr->next; |
3313 // tail = i2_ptr; | |
3314 } | |
3315 // need to re-establish tail | |
3316 DEBUG_INDEX(("Returned from depth\n")); | |
3317 if (tail) { | |
3318 while (tail->next) tail = tail->next; | |
3319 } | |
3320 } | |
3321 } | |
3322 } | |
3323 x++; | |
3324 } | |
3325 if (buf) free (buf); | |
3326 DEBUG_RET(); | |
3327 return head; | |
3328 } | |
0 | 3329 |
3330 | |
3331 // This version of free does NULL check first | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3332 #define SAFE_FREE(x) {if (x) free(x);} |
0 | 3333 |
3334 void _pst_freeItem(pst_item *item) { | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3335 pst_item_attach *t; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3336 pst_item_extra_field *et; |
0 | 3337 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3338 DEBUG_ENT("_pst_freeItem"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3339 if (item) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3340 if (item->email) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3341 SAFE_FREE(item->email->arrival_date); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3342 SAFE_FREE(item->email->body); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3343 SAFE_FREE(item->email->cc_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3344 SAFE_FREE(item->email->common_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3345 SAFE_FREE(item->email->encrypted_body); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3346 SAFE_FREE(item->email->encrypted_htmlbody); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3347 SAFE_FREE(item->email->header); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3348 SAFE_FREE(item->email->htmlbody); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3349 SAFE_FREE(item->email->in_reply_to); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3350 SAFE_FREE(item->email->messageid); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3351 SAFE_FREE(item->email->outlook_recipient); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3352 SAFE_FREE(item->email->outlook_recipient2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3353 SAFE_FREE(item->email->outlook_sender); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3354 SAFE_FREE(item->email->outlook_sender_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3355 SAFE_FREE(item->email->outlook_sender2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3356 SAFE_FREE(item->email->proc_subject); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3357 SAFE_FREE(item->email->recip_access); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3358 SAFE_FREE(item->email->recip_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3359 SAFE_FREE(item->email->recip2_access); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3360 SAFE_FREE(item->email->recip2_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3361 SAFE_FREE(item->email->reply_to); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3362 SAFE_FREE(item->email->rtf_body_tag); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3363 SAFE_FREE(item->email->rtf_compressed); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3364 SAFE_FREE(item->email->return_path_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3365 SAFE_FREE(item->email->sender_access); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3366 SAFE_FREE(item->email->sender_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3367 SAFE_FREE(item->email->sender2_access); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3368 SAFE_FREE(item->email->sender2_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3369 SAFE_FREE(item->email->sent_date); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3370 SAFE_FREE(item->email->sentmail_folder); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3371 SAFE_FREE(item->email->sentto_address); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3372 if (item->email->subject) |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3373 SAFE_FREE(item->email->subject->subj); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3374 SAFE_FREE(item->email->subject); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3375 free(item->email); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3376 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3377 if (item->folder) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3378 free(item->folder); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3379 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3380 if (item->message_store) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3381 SAFE_FREE(item->message_store->deleted_items_folder); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3382 SAFE_FREE(item->message_store->search_root_folder); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3383 SAFE_FREE(item->message_store->top_of_personal_folder); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3384 SAFE_FREE(item->message_store->top_of_folder); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3385 free(item->message_store); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3386 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3387 if (item->contact) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3388 SAFE_FREE(item->contact->access_method); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3389 SAFE_FREE(item->contact->account_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3390 SAFE_FREE(item->contact->address1); |
11 | 3391 SAFE_FREE(item->contact->address1a); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3392 SAFE_FREE(item->contact->address1_desc); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3393 SAFE_FREE(item->contact->address1_transport); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3394 SAFE_FREE(item->contact->address2); |
11 | 3395 SAFE_FREE(item->contact->address2a); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3396 SAFE_FREE(item->contact->address2_desc); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3397 SAFE_FREE(item->contact->address2_transport); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3398 SAFE_FREE(item->contact->address3); |
11 | 3399 SAFE_FREE(item->contact->address3a); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3400 SAFE_FREE(item->contact->address3_desc); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3401 SAFE_FREE(item->contact->address3_transport); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3402 SAFE_FREE(item->contact->assistant_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3403 SAFE_FREE(item->contact->assistant_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3404 SAFE_FREE(item->contact->billing_information); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3405 SAFE_FREE(item->contact->birthday); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3406 SAFE_FREE(item->contact->business_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3407 SAFE_FREE(item->contact->business_city); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3408 SAFE_FREE(item->contact->business_country); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3409 SAFE_FREE(item->contact->business_fax); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3410 SAFE_FREE(item->contact->business_homepage); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3411 SAFE_FREE(item->contact->business_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3412 SAFE_FREE(item->contact->business_phone2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3413 SAFE_FREE(item->contact->business_po_box); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3414 SAFE_FREE(item->contact->business_postal_code); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3415 SAFE_FREE(item->contact->business_state); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3416 SAFE_FREE(item->contact->business_street); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3417 SAFE_FREE(item->contact->callback_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3418 SAFE_FREE(item->contact->car_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3419 SAFE_FREE(item->contact->company_main_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3420 SAFE_FREE(item->contact->company_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3421 SAFE_FREE(item->contact->computer_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3422 SAFE_FREE(item->contact->customer_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3423 SAFE_FREE(item->contact->def_postal_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3424 SAFE_FREE(item->contact->department); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3425 SAFE_FREE(item->contact->display_name_prefix); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3426 SAFE_FREE(item->contact->first_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3427 SAFE_FREE(item->contact->followup); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3428 SAFE_FREE(item->contact->free_busy_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3429 SAFE_FREE(item->contact->ftp_site); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3430 SAFE_FREE(item->contact->fullname); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3431 SAFE_FREE(item->contact->gov_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3432 SAFE_FREE(item->contact->hobbies); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3433 SAFE_FREE(item->contact->home_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3434 SAFE_FREE(item->contact->home_city); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3435 SAFE_FREE(item->contact->home_country); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3436 SAFE_FREE(item->contact->home_fax); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3437 SAFE_FREE(item->contact->home_po_box); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3438 SAFE_FREE(item->contact->home_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3439 SAFE_FREE(item->contact->home_phone2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3440 SAFE_FREE(item->contact->home_postal_code); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3441 SAFE_FREE(item->contact->home_state); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3442 SAFE_FREE(item->contact->home_street); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3443 SAFE_FREE(item->contact->initials); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3444 SAFE_FREE(item->contact->isdn_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3445 SAFE_FREE(item->contact->job_title); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3446 SAFE_FREE(item->contact->keyword); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3447 SAFE_FREE(item->contact->language); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3448 SAFE_FREE(item->contact->location); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3449 SAFE_FREE(item->contact->manager_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3450 SAFE_FREE(item->contact->middle_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3451 SAFE_FREE(item->contact->mileage); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3452 SAFE_FREE(item->contact->mobile_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3453 SAFE_FREE(item->contact->nickname); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3454 SAFE_FREE(item->contact->office_loc); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3455 SAFE_FREE(item->contact->org_id); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3456 SAFE_FREE(item->contact->other_address); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3457 SAFE_FREE(item->contact->other_city); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3458 SAFE_FREE(item->contact->other_country); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3459 SAFE_FREE(item->contact->other_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3460 SAFE_FREE(item->contact->other_po_box); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3461 SAFE_FREE(item->contact->other_postal_code); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3462 SAFE_FREE(item->contact->other_state); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3463 SAFE_FREE(item->contact->other_street); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3464 SAFE_FREE(item->contact->pager_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3465 SAFE_FREE(item->contact->personal_homepage); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3466 SAFE_FREE(item->contact->pref_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3467 SAFE_FREE(item->contact->primary_fax); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3468 SAFE_FREE(item->contact->primary_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3469 SAFE_FREE(item->contact->profession); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3470 SAFE_FREE(item->contact->radio_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3471 SAFE_FREE(item->contact->spouse_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3472 SAFE_FREE(item->contact->suffix); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3473 SAFE_FREE(item->contact->surname); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3474 SAFE_FREE(item->contact->telex); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3475 SAFE_FREE(item->contact->transmittable_display_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3476 SAFE_FREE(item->contact->ttytdd_phone); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3477 SAFE_FREE(item->contact->wedding_anniversary); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3478 free(item->contact); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3479 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3480 while (item->attach) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3481 SAFE_FREE(item->attach->filename1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3482 SAFE_FREE(item->attach->filename2); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3483 SAFE_FREE(item->attach->mimetype); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3484 SAFE_FREE(item->attach->data); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3485 t = item->attach->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3486 free(item->attach); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3487 item->attach = t; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3488 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3489 while (item->extra_fields) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3490 SAFE_FREE(item->extra_fields->field_name); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3491 SAFE_FREE(item->extra_fields->value); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3492 et = item->extra_fields->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3493 free(item->extra_fields); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3494 item->extra_fields = et; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3495 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3496 if (item->journal) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3497 SAFE_FREE(item->journal->end); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3498 SAFE_FREE(item->journal->start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3499 SAFE_FREE(item->journal->type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3500 free(item->journal); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3501 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3502 if (item->appointment) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3503 SAFE_FREE(item->appointment->location); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3504 SAFE_FREE(item->appointment->reminder); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3505 SAFE_FREE(item->appointment->start); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3506 SAFE_FREE(item->appointment->end); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3507 SAFE_FREE(item->appointment->timezonestring); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3508 free(item->appointment); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3509 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3510 SAFE_FREE(item->ascii_type); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3511 SAFE_FREE(item->comment); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3512 SAFE_FREE(item->create_date); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3513 SAFE_FREE(item->file_as); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3514 SAFE_FREE(item->modify_date); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3515 SAFE_FREE(item->outlook_version); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3516 SAFE_FREE(item->record_key); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3517 free(item); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3518 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3519 DEBUG_RET(); |
8 | 3520 } |
0 | 3521 |
11 | 3522 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3523 int32_t _pst_getBlockOffset(char *buf, int32_t read_size, int32_t i_offset, int32_t offset, pst_block_offset *p) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3524 int32_t of1 = offset>>4; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3525 DEBUG_ENT("_pst_getBlockOffset"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3526 if (!p || !buf || (i_offset == 0) || (i_offset+2+of1+sizeof(*p) > read_size)) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3527 DEBUG_WARN(("p is NULL or buf is NULL or offset is 0 (%p, %p, %#x, %i, %i)\n", p, buf, offset, read_size, i_offset)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3528 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3529 return -1; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3530 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3531 memcpy(&(p->from), &(buf[(i_offset+2)+of1]), sizeof(p->from)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3532 memcpy(&(p->to), &(buf[(i_offset+2)+of1+sizeof(p->from)]), sizeof(p->to)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3533 LE16_CPU(p->from); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3534 LE16_CPU(p->to); |
11 | 3535 DEBUG_WARN(("get block offset finds from=%i(%#x), to=%i(%#x)", p->from, p->from, p->to, p->to)); |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3536 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3537 return 0; |
0 | 3538 } |
3539 | |
11 | 3540 |
0 | 3541 pst_index_ll * _pst_getID(pst_file* pf, u_int32_t id) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3542 pst_index_ll *ptr = NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3543 DEBUG_ENT("_pst_getID"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3544 if (id == 0) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3545 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3546 return NULL; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3547 } |
0 | 3548 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3549 /* if (id & 0x3) { // if either of the last two bits on the id are set |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3550 DEBUG_INDEX(("ODD_INDEX (not even) is this a pointer to a table?\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3551 }*/ |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3552 // Dave: I don't think I should do this. next bit. I really think it doesn't work |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3553 // it isn't based on sound principles either. |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3554 // update: seems that the last two sig bits are flags. u tell me! |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3555 id &= 0xFFFFFFFE; // remove least sig. bit. seems that it might work if I do this |
0 | 3556 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3557 DEBUG_INDEX(("Trying to find %#x\n", id)); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3558 if (!ptr) ptr = pf->i_head; |
11 | 3559 while (ptr && (ptr->id != id)) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3560 ptr = ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3561 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3562 if (ptr) {DEBUG_INDEX(("Found Value %#x\n", ptr->id));} |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3563 else {DEBUG_INDEX(("ERROR: Value not found\n")); } |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3564 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3565 return ptr; |
0 | 3566 } |
3567 | |
11 | 3568 |
0 | 3569 pst_index_ll * _pst_getID2(pst_index2_ll *ptr, u_int32_t id) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3570 DEBUG_ENT("_pst_getID2"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3571 DEBUG_INDEX(("Head = %p\n", ptr)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3572 DEBUG_INDEX(("Trying to find %#x\n", id)); |
11 | 3573 while (ptr && (ptr->id2 != id)) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3574 ptr = ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3575 } |
11 | 3576 if (ptr) { |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3577 if (ptr->id) {DEBUG_INDEX(("Found value %#x\n", ptr->id->id)); } |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3578 else {DEBUG_INDEX(("Found value, though it is NULL!\n"));} |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3579 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3580 return ptr->id; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3581 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3582 DEBUG_INDEX(("ERROR Not Found\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3583 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3584 return NULL; |
0 | 3585 } |
3586 | |
11 | 3587 |
0 | 3588 pst_desc_ll * _pst_getDptr(pst_file *pf, u_int32_t id) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3589 pst_desc_ll *ptr = pf->d_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3590 DEBUG_ENT("_pst_getDptr"); |
11 | 3591 while (ptr && (ptr->id != id)) { |
3592 if (ptr->child) { | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3593 ptr = ptr->child; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3594 continue; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3595 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3596 while (!ptr->next && ptr->parent) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3597 ptr = ptr->parent; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3598 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3599 ptr = ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3600 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3601 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3602 return ptr; // will be NULL or record we are looking for |
0 | 3603 } |
3604 | |
11 | 3605 |
0 | 3606 int32_t _pst_printDptr(pst_file *pf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3607 pst_desc_ll *ptr = pf->d_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3608 int32_t depth = 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3609 char spaces[100]; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3610 DEBUG_ENT("_pst_printDptr"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3611 memset(spaces, ' ', 99); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3612 spaces[99] = '\0'; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3613 while (ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3614 DEBUG_INDEX(("%s%#x [%i] desc=%#x, list=%#x\n", &(spaces[(99-depth<0?0:99-depth)]), ptr->id, ptr->no_child, |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3615 (ptr->desc==NULL?0:ptr->desc->id), |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3616 (ptr->list_index==NULL?0:ptr->list_index->id))); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3617 if (ptr->child) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3618 depth++; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3619 ptr = ptr->child; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3620 continue; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3621 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3622 while (!ptr->next && ptr->parent) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3623 depth--; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3624 ptr = ptr->parent; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3625 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3626 ptr = ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3627 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3628 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3629 return 0; |
0 | 3630 } |
3631 | |
11 | 3632 |
0 | 3633 int32_t _pst_printIDptr(pst_file* pf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3634 pst_index_ll *ptr = pf->i_head; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3635 DEBUG_ENT("_pst_printIDptr"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3636 while (ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3637 DEBUG_INDEX(("%#x offset=%#x size=%#x\n", ptr->id, ptr->offset, ptr->size)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3638 ptr = ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3639 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3640 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3641 return 0; |
0 | 3642 } |
3643 | |
11 | 3644 |
0 | 3645 int32_t _pst_printID2ptr(pst_index2_ll *ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3646 DEBUG_ENT("_pst_printID2ptr"); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3647 while (ptr) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3648 DEBUG_INDEX(("%#x id=%#x\n", ptr->id2, (ptr->id!=NULL?ptr->id->id:0))); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3649 ptr = ptr->next; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3650 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3651 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3652 return 0; |
0 | 3653 } |
3654 | |
11 | 3655 |
0 | 3656 size_t _pst_read_block(FILE *fp, int32_t offset, void **buf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3657 size_t size; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3658 int32_t fpos; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3659 DEBUG_ENT("_pst_read_block"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3660 DEBUG_READ(("Reading block from %#x\n", offset)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3661 fpos = ftell(fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3662 fseek(fp, offset, SEEK_SET); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3663 fread(&size, sizeof(int16_t), 1, fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3664 fseek(fp, offset, SEEK_SET); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3665 DEBUG_READ(("Allocating %i bytes\n", size)); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3666 if (*buf) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3667 DEBUG_READ(("Freeing old memory\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3668 free(*buf); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3669 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3670 *buf = (void*)xmalloc(size); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3671 size = fread(*buf, 1, size, fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3672 fseek(fp, fpos, SEEK_SET); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3673 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3674 return size; |
0 | 3675 } |
3676 | |
11 | 3677 |
8 | 3678 // when the first byte of the block being read is 01, then we can assume |
0 | 3679 // that it is a list of further ids to read and we will follow those ids |
3680 // recursively calling this function until we have all the data | |
3681 // we could do decryption of the encrypted PST files here | |
11 | 3682 size_t _pst_read_block_size(pst_file *pf, int32_t offset, size_t size, char ** buf, int32_t do_enc, unsigned char is_index) { |
3683 u_int32_t fpos, x; | |
3684 int16_t count, y; | |
3685 char *buf2 = NULL, *buf3 = NULL; | |
3686 unsigned char fdepth; | |
3687 pst_index_ll *ptr = NULL; | |
3688 size_t rsize, z; | |
3689 DEBUG_ENT("_pst_read_block_size"); | |
3690 DEBUG_READ(("Reading block from %#x, %i bytes\n", offset, size)); | |
3691 fpos = ftell(pf->fp); | |
3692 fseek(pf->fp, offset, SEEK_SET); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3693 if (*buf) { |
11 | 3694 DEBUG_READ(("Freeing old memory\n")); |
3695 free(*buf); | |
3696 } | |
0 | 3697 |
11 | 3698 *buf = (void*) xmalloc(size+1); //plus one so that we can NULL terminate it later |
3699 rsize = fread(*buf, 1, size, pf->fp); | |
3700 if (rsize != size) { | |
3701 DEBUG_WARN(("Didn't read all that I could. fread returned less [%i instead of %i]\n", rsize, size)); | |
3702 if (feof(pf->fp)) { | |
3703 DEBUG_WARN(("We tried to read past the end of the file at [offset %#x, size %#x]\n", offset, size)); | |
3704 } else if (ferror(pf->fp)) { | |
3705 DEBUG_WARN(("Error is set on file stream.\n")); | |
3706 } else { | |
3707 DEBUG_WARN(("I can't tell why it failed\n")); | |
3708 } | |
3709 size = rsize; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3710 } |
11 | 3711 |
3712 // DEBUG_HEXDUMP(*buf, size); | |
0 | 3713 |
11 | 3714 /* if (is_index) { |
3715 DEBUG_READ(("_pst_read_block_size: ODD_BLOCK should be here\n")); | |
3716 DEBUG_READ(("\t: byte 0-1: %#x %#x\n", (*buf)[0], (*buf)[1])); | |
3717 }*/ | |
0 | 3718 |
11 | 3719 if ((*buf)[0] == 0x01 && (*buf)[1] != 0x00 && is_index) { |
3720 //don't do this recursion if we should be at a leaf node | |
3721 memcpy(&count, &((*buf)[2]), sizeof(int16_t)); | |
3722 LE16_CPU(count); | |
3723 memcpy(&fdepth, &((*buf)[1]), sizeof(fdepth)); | |
3724 DEBUG_READ(("Seen indexes to blocks. Depth is %i\n", fdepth)); | |
3725 // do fancy stuff! :) | |
3726 DEBUG_READ(("There are %i ids\n", count)); | |
3727 // if first 2 blocks are 01 01 then index to blocks | |
3728 size = 0; | |
3729 y = 0; | |
3730 while (y < count) { | |
3731 memcpy(&x, &(*buf)[0x08+(y*4)], sizeof(int32_t)); | |
3732 LE32_CPU(x); | |
3733 if ((ptr = _pst_getID(pf, x)) == NULL) { | |
3734 WARN(("Error. Cannot find ID [%#x] during multi-block read\n", x)); | |
3735 buf3 = (char*) realloc(buf3, size+1); | |
3736 buf3[size] = '\0'; | |
3737 *buf = buf3; | |
3738 fseek(pf->fp, fpos, SEEK_SET); | |
3739 DEBUG_RET(); | |
3740 return size; | |
3741 } | |
3742 if ((z = _pst_read_block_size(pf, ptr->offset, ptr->size, &buf2, do_enc, fdepth-1)) < ptr->size) { | |
3743 buf3 = (char*) realloc(buf3, size+1); | |
3744 buf3[size] = '\0'; | |
3745 *buf = buf3; | |
3746 fseek(pf->fp, fpos, SEEK_SET); | |
3747 DEBUG_RET(); | |
3748 return size; | |
3749 } | |
3750 DEBUG_READ(("Melding newley retrieved block with bigger one. New size is %i\n", size+z)); | |
3751 buf3 = (char*) realloc(buf3, size+z+1); //plus one so that we can null terminate it later | |
3752 DEBUG_READ(("Doing copy. Start pos is %i, length is %i\n", size, z)); | |
3753 memcpy(&(buf3[size]), buf2, z); | |
3754 size += z; | |
3755 y++; | |
3756 } | |
3757 free(*buf); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3758 if (buf2) free(buf2); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3759 if (!buf3) { |
11 | 3760 // this can happen if count == 0. We should create an empty buffer so we don't |
3761 // confuse any clients | |
3762 buf3 = (char*) xmalloc(1); | |
3763 } | |
3764 *buf = buf3; | |
3765 } else if (do_enc && pf->encryption) | |
3766 _pst_decrypt(*buf, size, pf->encryption); | |
0 | 3767 |
11 | 3768 (*buf)[size] = '\0'; //should be byte after last one read |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3769 fseek(pf->fp, fpos, SEEK_SET); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3770 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3771 return size; |
11 | 3772 } |
0 | 3773 |
3774 | |
3775 int32_t _pst_decrypt(unsigned char *buf, size_t size, int32_t type) { | |
11 | 3776 size_t x = 0; |
3777 unsigned char y; | |
3778 DEBUG_ENT("_pst_decrypt"); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3779 if (!buf) { |
11 | 3780 DEBUG_RET(); |
3781 return -1; | |
3782 } | |
0 | 3783 |
11 | 3784 if (type == PST_COMP_ENCRYPT) { |
3785 x = 0; | |
3786 while (x < size) { | |
3787 y = buf[x]; | |
3788 DEBUG_DECRYPT(("Transposing %#hhx to %#hhx [%#x]\n", buf[x], comp_enc[y], y)); | |
3789 buf[x] = comp_enc[y]; // transpose from encrypt array | |
3790 x++; | |
3791 } | |
3792 } else { | |
3793 WARN(("Unknown encryption: %i. Cannot decrypt\n", type)); | |
3794 DEBUG_RET(); | |
3795 return -1; | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3796 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3797 DEBUG_RET(); |
11 | 3798 return 0; |
0 | 3799 } |
3800 | |
8 | 3801 |
11 | 3802 int32_t _pst_getAtPos(FILE *fp, int32_t pos, void* buf, u_int32_t size) { |
3803 DEBUG_ENT("_pst_getAtPos"); | |
3804 if (fseek(fp, pos, SEEK_SET) == -1) { | |
3805 DEBUG_RET(); | |
3806 return 1; | |
3807 } | |
3808 | |
3809 if (fread(buf, 1, size, fp) < size) { | |
3810 DEBUG_RET(); | |
3811 return 2; | |
3812 } | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3813 DEBUG_RET(); |
11 | 3814 return 0; |
0 | 3815 } |
3816 | |
11 | 3817 |
0 | 3818 int32_t _pst_get (FILE *fp, void *buf, u_int32_t size) { |
11 | 3819 DEBUG_ENT("_pst_get"); |
3820 if (fread(buf, 1, size, fp) < size) { | |
3821 DEBUG_RET(); | |
3822 return 1; | |
3823 } | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3824 DEBUG_RET(); |
11 | 3825 return 0; |
0 | 3826 } |
3827 | |
11 | 3828 |
0 | 3829 size_t _pst_ff_getIDblock_dec(pst_file *pf, u_int32_t id, unsigned char **b) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3830 size_t r; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3831 DEBUG_ENT("_pst_ff_getIDblock_dec"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3832 r = _pst_ff_getIDblock(pf, id, b); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3833 if (pf->encryption) _pst_decrypt(*b, r, pf->encryption); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3834 DEBUG_HEXDUMPC(*b, r, 16); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3835 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3836 return r; |
0 | 3837 } |
3838 | |
11 | 3839 |
0 | 3840 /** the get ID function for the default file format that I am working with |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3841 ie the one in the PST files */ |
0 | 3842 size_t _pst_ff_getIDblock(pst_file *pf, u_int32_t id, unsigned char** b) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3843 pst_index_ll *rec; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3844 size_t rsize = 0;//, re_size=0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3845 DEBUG_ENT("_pst_ff_getIDblock"); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3846 if ((rec = _pst_getID(pf, id)) == NULL) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3847 DEBUG_INDEX(("Cannot find ID %#x\n", id)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3848 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3849 return 0; |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3850 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3851 fseek(pf->fp, rec->offset, SEEK_SET); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3852 if (*b) { |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3853 DEBUG_INDEX(("freeing old memory in b\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3854 free(*b); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3855 } |
0 | 3856 |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3857 DEBUG_INDEX(("id = %#x, record size = %#x, offset = %#x\n", id, rec->size, rec->offset)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3858 *b = (char*) xmalloc(rec->size+1); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3859 rsize = fread(*b, 1, rec->size, pf->fp); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3860 if (rsize != rec->size) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3861 DEBUG_WARN(("Didn't read all the size. fread returned less [%i instead of %i]\n", rsize, rec->size)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3862 if (feof(pf->fp)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3863 DEBUG_WARN(("We tried to read past the end of the file [offset %#x, size %#x]\n", rec->offset, rec->size)); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3864 } else if (ferror(pf->fp)) { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3865 DEBUG_WARN(("Some error occured on the file stream\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3866 } else { |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3867 DEBUG_WARN(("No error has been set on the file stream\n")); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3868 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3869 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3870 DEBUG_RET(); |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3871 return rsize; |
0 | 3872 } |
3873 | |
11 | 3874 |
0 | 3875 #define PST_PTR_BLOCK_SIZE 0x120 |
3876 size_t _pst_ff_getID2block(pst_file *pf, u_int32_t id2, pst_index2_ll *id2_head, unsigned char** buf) { | |
11 | 3877 pst_index_ll* ptr; |
3878 // size_t ret; | |
3879 struct holder h = {buf, NULL, 0}; | |
3880 DEBUG_ENT("_pst_ff_getID2block"); | |
3881 ptr = _pst_getID2(id2_head, id2); | |
0 | 3882 |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3883 if (!ptr) { |
11 | 3884 DEBUG_INDEX(("Cannot find id2 value %#x\n", id2)); |
3885 DEBUG_RET(); | |
3886 return 0; | |
3887 } | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3888 DEBUG_RET(); |
11 | 3889 return _pst_ff_getID2data(pf, ptr, &h); |
0 | 3890 } |
3891 | |
11 | 3892 |
0 | 3893 size_t _pst_ff_getID2data(pst_file *pf, pst_index_ll *ptr, struct holder *h) { |
11 | 3894 // if the attachment begins with 01 01, <= 256 bytes, it is stored in the record |
3895 int32_t ret; | |
3896 unsigned char *b = NULL, *t; | |
3897 DEBUG_ENT("_pst_ff_getID2data"); | |
3898 if (!(ptr->id & 0x02)) { | |
3899 ret = _pst_ff_getIDblock_dec(pf, ptr->id, &b); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3900 if (h->buf) { |
11 | 3901 *(h->buf) = b; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3902 } else if ((h->base64 == 1) && h->fp) { |
11 | 3903 t = base64_encode(b, ret); |
3904 pst_fwrite(t, 1, strlen(t), h->fp); | |
3905 free(b); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3906 } else if (h->fp) { |
11 | 3907 pst_fwrite(b, 1, ret, h->fp); |
3908 free(b); | |
3909 } | |
3910 //if ((*buf)[0] == 0x1) { | |
3911 // DEBUG_WARN(("WARNING: buffer starts with 0x1, but I didn't expect it to!\n")); | |
3912 //} | |
3913 } else { | |
3914 // here we will assume it is a block that points to others | |
3915 DEBUG_READ(("Assuming it is a multi-block record because of it's id\n")); | |
3916 ret = _pst_ff_compile_ID(pf, ptr->id, h, 0); | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
3917 } |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3918 if (h->buf && *h->buf) |
11 | 3919 (*(h->buf))[ret]='\0'; |
3920 DEBUG_RET(); | |
3921 return ret; | |
0 | 3922 } |
3923 | |
11 | 3924 |
0 | 3925 size_t _pst_ff_compile_ID(pst_file *pf, u_int32_t id, struct holder *h, int32_t size) { |
11 | 3926 size_t z, a; |
3927 u_int16_t count, y; | |
3928 u_int32_t x, b; | |
3929 unsigned char * buf3 = NULL, *buf2 = NULL, *t; | |
3930 unsigned char fdepth; | |
3931 | |
3932 DEBUG_ENT("_pst_ff_compile_ID"); | |
3933 if ((a = _pst_ff_getIDblock(pf, id, &buf3))==0) | |
3934 return 0; | |
3935 if ((buf3[0] != 0x1)) { // if bit 8 is set) { | |
3936 // if ((buf3)[0] != 0x1 && (buf3)[1] > 4) { | |
3937 DEBUG_WARN(("WARNING: buffer doesn't start with 0x1, but I expected it to or doesn't have it's two-bit set!\n")); | |
3938 DEBUG_WARN(("Treating as normal buffer\n")); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3939 if (pf->encryption) _pst_decrypt(buf3, a, pf->encryption); |
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3940 if (h->buf) |
11 | 3941 *(h->buf) = buf3; |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3942 else if (h->base64 == 1 && h->fp) { |
11 | 3943 t = base64_encode(buf3, a); |
3944 pst_fwrite(t, 1, strlen(t), h->fp); | |
3945 free(buf3); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3946 } else if (h->fp) { |
11 | 3947 pst_fwrite(buf3, 1, a, h->fp); |
3948 free(buf3); | |
3949 } | |
3950 DEBUG_RET(); | |
3951 return a; | |
3952 } | |
3953 memcpy (&count, &(buf3[2]), sizeof(int16_t)); | |
3954 LE16_CPU(count); | |
3955 memcpy (&fdepth, &(buf3[1]), sizeof(char)); | |
3956 DEBUG_READ(("Seen index to blocks. Depth is %i\n", fdepth)); | |
3957 DEBUG_READ(("There are %i ids here\n", count)); | |
0 | 3958 |
11 | 3959 y = 0; |
3960 while (y < count) { | |
3961 memcpy(&x, &buf3[0x08+(y*4)], sizeof(int32_t)); | |
3962 LE32_CPU(x); | |
3963 if (fdepth == 0x1) { | |
3964 if ((z = _pst_ff_getIDblock(pf, x, &buf2)) == 0) { | |
3965 DEBUG_WARN(("call to getIDblock returned zero %i\n", z)); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3966 if (buf2) free(buf2); |
11 | 3967 free(buf3); |
3968 return z; | |
3969 } | |
3970 if (pf->encryption) _pst_decrypt(buf2, z, pf->encryption); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3971 if (h->buf) { |
11 | 3972 *(h->buf) = realloc(*(h->buf), size+z+1); |
3973 DEBUG_READ(("appending read data of size %i onto main buffer from pos %i\n", z, size)); | |
3974 memcpy(&((*(h->buf))[size]), buf2, z); | |
3975 } | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3976 else if ((h->base64 == 1) && h->fp) { |
11 | 3977 // include any byte left over from the last one encoding |
3978 buf2 = (char*)realloc(buf2, z+h->base64_extra); | |
3979 memmove(buf2+h->base64_extra, buf2, z); | |
3980 memcpy(buf2, h->base64_extra_chars, h->base64_extra); | |
3981 z+= h->base64_extra; | |
3982 | |
3983 b = z % 3; // find out how many bytes will be left over after the encoding. | |
3984 // and save them | |
3985 memcpy(h->base64_extra_chars, &(buf2[z-b]), b); | |
3986 h->base64_extra = b; | |
3987 t = base64_encode(buf2, z-b); | |
3988 pst_fwrite(t, 1, strlen(t), h->fp); | |
3989 DEBUG_READ(("writing %i bytes to file as base64 [%i]. Currently %i\n", | |
3990 z, strlen(t), size)); | |
3991 } | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
3992 else if (h->fp) { |
11 | 3993 DEBUG_READ(("writing %i bytes to file. Currently %i\n", z, size)); |
3994 pst_fwrite(buf2, 1, z, h->fp); | |
3995 } | |
3996 size += z; | |
3997 y++; | |
3998 } | |
3999 else { | |
4000 if ((z = _pst_ff_compile_ID(pf, x, h, size)) == 0) { | |
4001 DEBUG_WARN(("recursive called returned zero %i\n", z)); | |
4002 free(buf3); | |
4003 DEBUG_RET(); | |
4004 return z; | |
4005 } | |
4006 size = z; | |
4007 y++; | |
4008 } | |
10
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
4009 } |
a818f3c2e589
fix tree walk, we now use the item counts in the node blocks
carl
parents:
8
diff
changeset
|
4010 free(buf3); |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
4011 if (buf2) free(buf2); |
11 | 4012 DEBUG_RET(); |
4013 return size; | |
4014 } | |
0 | 4015 |
4016 | |
4017 #ifdef _MSC_VER | |
4018 char * fileTimeToAscii(const FILETIME* filetime) { | |
11 | 4019 time_t t; |
4020 DEBUG_ENT("fileTimeToAscii"); | |
4021 t = fileTimeToUnixTime(filetime, 0); | |
4022 if (t == -1) | |
4023 DEBUG_WARN(("ERROR time_t varible that was produced, is -1\n")); | |
4024 DEBUG_RET(); | |
4025 return ctime(&t); | |
0 | 4026 } |
4027 | |
11 | 4028 |
0 | 4029 time_t fileTimeToUnixTime(const FILETIME* filetime, DWORD *x) { |
11 | 4030 SYSTEMTIME s; |
4031 struct tm t; | |
4032 DEBUG_ENT("fileTimeToUnixTime"); | |
4033 memset (&t, 0, sizeof(struct tm)); | |
4034 FileTimeToSystemTime(filetime, &s); | |
4035 t.tm_year = s.wYear-1900; // this is what is required | |
4036 t.tm_mon = s.wMonth-1; // also required! It made me a bit confused | |
4037 t.tm_mday = s.wDay; | |
4038 t.tm_hour = s.wHour; | |
4039 t.tm_min = s.wMinute; | |
4040 t.tm_sec = s.wSecond; | |
4041 DEBUG_RET(); | |
4042 return mktime(&t); | |
0 | 4043 } |
4044 | |
11 | 4045 |
0 | 4046 struct tm * fileTimeToStructTM (const FILETIME *filetime) { |
11 | 4047 time_t t1; |
4048 t1 = fileTimeToUnixTime(filetime, 0); | |
4049 return gmtime(&t1); | |
0 | 4050 } |
4051 | |
11 | 4052 |
0 | 4053 #endif //_MSC_VER |
4054 | |
4055 int32_t pst_stricmp(char *a, char *b) { | |
11 | 4056 // compare strings case-insensitive. |
4057 // returns -1 if a < b, 0 if a==b, 1 if a > b | |
4058 while(*a != '\0' && *b != '\0' && toupper(*a)==toupper(*b)) { | |
4059 a++; b++; | |
4060 } | |
4061 if (toupper(*a) == toupper(*b)) | |
4062 return 0; | |
4063 else if (toupper(*a) < toupper(*b)) | |
4064 return -1; | |
4065 else | |
4066 return 1; | |
0 | 4067 } |
4068 | |
11 | 4069 |
0 | 4070 int32_t pst_strincmp(char *a, char *b, int32_t x) { |
11 | 4071 // compare upto x chars in string a and b case-insensitively |
4072 // returns -1 if a < b, 0 if a==b, 1 if a > b | |
4073 int32_t y = 0; | |
4074 while (*a != '\0' && *b != '\0' && y < x && toupper(*a)==toupper(*b)) { | |
4075 a++; b++; y++; | |
4076 } | |
4077 // if we have reached the end of either string, or a and b still match | |
4078 if (*a == '\0' || *b == '\0' || toupper(*a)==toupper(*b)) | |
4079 return 0; | |
4080 else if (toupper(*a) < toupper(*b)) | |
4081 return -1; | |
4082 else | |
4083 return 1; | |
0 | 4084 } |
4085 | |
11 | 4086 |
0 | 4087 size_t pst_fwrite(const void*ptr, size_t size, size_t nmemb, FILE*stream) { |
11 | 4088 size_t r; |
4089 DEBUG_ENT("pst_fwrite"); | |
12
3f627519a92d
properly ignore (second block zero) errors. that will just drop some unknown attachments, but the rest of the data is still found
carl
parents:
11
diff
changeset
|
4090 if (ptr) |
11 | 4091 r = fwrite(ptr, size, nmemb, stream); |
4092 else { | |
4093 r = 0; | |
4094 DEBUG_WARN(("An attempt to write a NULL Pointer was made\n")); | |
4095 } | |
4096 DEBUG_RET(); | |
4097 return r; | |
0 | 4098 } |
8 | 4099 |
11 | 4100 |
0 | 4101 char * _pst_wide_to_single(char *wt, int32_t size) { |
11 | 4102 // returns the first byte of each wide char. the size is the number of bytes in source |
4103 char *x, *y; | |
4104 DEBUG_ENT("_pst_wide_to_single"); | |
4105 x = xmalloc((size/2)+1); | |
4106 y = x; | |
4107 while (size != 0 && *wt != '\0') { | |
4108 *y = *wt; | |
4109 wt+=2; | |
4110 size -= 2; | |
4111 y++; | |
4112 } | |
4113 *y = '\0'; | |
4114 DEBUG_RET(); | |
4115 return x; | |
0 | 4116 } |
4117 |