libpst: libpst.c comparison

comparison libpst.c @ 8:2b58cf15aaf7

pst is case sensitive, ldap is not

author	carl
date	Thu, 23 Dec 2004 15:49:19 -0800
parents	6b1b602514db
children	a818f3c2e589

comparison

equal deleted inserted replaced

-:3e3d8b576630
+:2b58cf15aaf7
 int32_t id2;
 int32_t id;
 int32_t table2;
 } pst_id2_assoc;
 // this is an array of the un-encrypted values. the un-encrypyed value is in the position
 // of the encrypted value. ie the encrypted value 0x13 represents 0x02
 //                     0     1     2     3     4     5     6     7
 //                     8     9     a     b     c     d     e     f
 unsigned char comp_enc [] =
 { 0x47, 0xf1, 0xb4, 0xe6, 0x0b, 0x6a, 0x72, 0x48,
 0x85, 0x4e, 0x9e, 0xeb, 0xe2, 0xf8, 0x94, 0x53, /*0x0f*/
 0xe0, 0xbb, 0xa0, 0x02, 0xe8, 0x5a, 0x09, 0xab,
 0xdb, 0xe3, 0xba, 0xc6, 0x7c, 0xc3, 0x10, 0xdd, /*0x1f*/
 0x39, 0x05, 0x96, 0x30, 0xf5, 0x37, 0x60, 0x82,
 0x8c, 0xc9, 0x13, 0x4a, 0x6b, 0x1d, 0xf3, 0xfb, /*0x2f*/
 0x8f, 0x26, 0x97, 0xca, 0x91, 0x17, 0x01, 0xc4,
 0x32, 0x2d, 0x6e, 0x31, 0x95, 0xff, 0xd9, 0x23, /*0x3f*/
 0xd1, 0x00, 0x5e, 0x79, 0xdc, 0x44, 0x3b, 0x1a,
 0x28, 0xc5, 0x61, 0x57, 0x20, 0x90, 0x3d, 0x83, /*0x4f*/
 0xb9, 0x43, 0xbe, 0x67, 0xd2, 0x46, 0x42, 0x76,
 0xc0, 0x6d, 0x5b, 0x7e, 0xb2, 0x0f, 0x16, 0x29, /*0x5f*/
 0x3c, 0xa9, 0x03, 0x54, 0x0d, 0xda, 0x5d, 0xdf,
 0xf6, 0xb7, 0xc7, 0x62, 0xcd, 0x8d, 0x06, 0xd3, /*0x6f*/
 0x69, 0x5c, 0x86, 0xd6, 0x14, 0xf7, 0xa5, 0x66,
 WARN (("cannot be passed a NULL pst_file\n"));
 DEBUG_RET();
 return -1;
 }
 memset(pf, 0, sizeof(pst_file));
 if ((pf->fp = fopen(name, mode)) == NULL) {
 WARN(("cannot open PST file. Error\n"));
 DEBUG_RET();
 return -1;
 }
 }
 _pst_getAtPos(pf->fp, ENC_OFFSET, &(pf->encryption), sizeof(unsigned char));
 DEBUG_INFO(("encrypt = %i\n", pf->encryption));
 //  pf->encryption = encrypt;
 _pst_getAtPos(pf->fp, SECOND_POINTER-4, &(pf->index2_count), sizeof(pf->index2_count));
 _pst_getAtPos(pf->fp, SECOND_POINTER, &(pf->index2), sizeof(pf->index2));
 LE32_CPU(pf->index2_count);
 LE32_CPU(pf->index2);
 LE32_CPU(pf->size);
 // very tempting to leave these values set way too high and let the exploration of the tables set them...
 pf->index1_depth = pf->index2_depth = 255;
 DEBUG_INFO(("Pointer2 is %#X, count %i[%#x], depth %#x\n",
 pf->index2, pf->index2_count, pf->index2_count, pf->index2_depth));
 _pst_getAtPos(pf->fp, INDEX_POINTER-4, &(pf->index1_count), sizeof(pf->index1_count));
 _pst_getAtPos(pf->fp, INDEX_POINTER, &(pf->index1), sizeof(pf->index1));
 LE32_CPU(pf->index1_count);
 LE32_CPU(pf->index1);
 DEBUG_INFO(("Pointer1 is %#X, count %i[%#x], depth %#x\n",
 pf->index1, pf->index1_count, pf->index1_count, pf->index1_depth));
 pf->id_depth_ok = 0;
 pf->desc_depth_ok = 0;
 DEBUG_RET();
 return 0;
 //  pst_item *i;
 //  char *a, *b;
 //  int x,z;
 DEBUG_ENT("pst_getTopOfFolders");
 if (root == NULL || root->message_store == NULL
 /*      || (root->message_store->top_of_personal_folder == NULL
-	      && root->message_store->top_of_folder == NULL)*/) {
+&& root->message_store->top_of_folder == NULL)*/) {
 DEBUG_INDEX(("There isn't a top of folder record here.\n"));
 ret = NULL;
 } else if (root->message_store->top_of_personal_folder == NULL) {
 // this is the OST way
 // ASSUMPTION: Top Of Folders record in PST files is *always* descid 0x2142
 ret = _pst_getDptr(pf, 0x2142);
 } else {
 ret = _pst_getDptr(pf, root->message_store->top_of_personal_folder->id);
 return -1;
 }
 x = _pst_build_id_ptr(pf, pf->index1, 0, -1, INT32_MAX);
 if (x == -1 || x == 4) {
 if (x == -1)
 pf->index1_depth = 0; //only do this for -1
 DEBUG_INDEX(("Re-calling _pst_build_id_ptr cause we started with too grand an idea!!!\n"));
 if (_pst_build_id_ptr(pf, pf->index1, 0, 0x4, INT32_MAX) == -1) {
 //we must call twice for testing the depth of the index
 DEBUG_RET();
 return -1;
 }
 }
 DEBUG_INDEX(("Second Table\n"));
 y = -1;
 x = _pst_build_desc_ptr(pf, pf->index2, 0, &y, 0x21, INT32_MAX);
 if (x == -1 || x == 4) {
 if (x == -1)
 pf->index2_depth = 0; //only if -1 is return val
 pst_desc_ll* r = NULL;
 DEBUG_ENT("pst_getNextDptr");
 if (d != NULL) {
 if ((r = d->child) == NULL) {
 while(d->next == NULL && d->parent != NULL)
-	d = d->parent;
+d = d->parent;
 r = d->next;
 }
 }
 DEBUG_RET();
 return r;
 LE16_CPU(xattrib.extended);
 LE16_CPU(xattrib.zero);
 LE16_CPU(xattrib.type);
 LE16_CPU(xattrib.map);
 bptr += sizeof(xattrib);
 while (xattrib.type != 0 && bptr < bsize) {
 ptr = (pst_x_attrib_ll*) xmalloc(sizeof(pst_x_attrib_ll));
 memset(ptr, 0, sizeof(pst_x_attrib_ll));
 ptr->type = xattrib.type;
 ptr->map = xattrib.map+0x8000;
 ptr->next = NULL;
 DEBUG_INDEX(("xattrib: ext = %#hx, zero = %#hx, type = %#hx, map = %#hx\n",
-		 xattrib.extended, xattrib.zero, xattrib.type, xattrib.map));
+xattrib.extended, xattrib.zero, xattrib.type, xattrib.map));
 err=0;
 if (xattrib.type & 0x0001) { // if the Bit 1 is set
 // pointer to Unicode field in buffer
 if (xattrib.extended < hsize) {
-	// copy the size of the header. It is 32 bit int
+// copy the size of the header. It is 32 bit int
-	memcpy(&tint, &(headerbuffer[xattrib.extended]), sizeof(tint));
+memcpy(&tint, &(headerbuffer[xattrib.extended]), sizeof(tint));
-	LE32_CPU(tint);
+LE32_CPU(tint);
-	wt = (char*) xmalloc(tint+2); // plus 2 for a uni-code zero
+wt = (char*) xmalloc(tint+2); // plus 2 for a uni-code zero
-	memset(wt, 0, tint+2);
+memset(wt, 0, tint+2);
-	memcpy(wt, &(headerbuffer[xattrib.extended+sizeof(tint)]), tint);
+memcpy(wt, &(headerbuffer[xattrib.extended+sizeof(tint)]), tint);
-	ptr->data = _pst_wide_to_single(wt, tint);
+ptr->data = _pst_wide_to_single(wt, tint);
-	DEBUG_INDEX(("Read string (converted from UTF-16): %s\n", ptr->data));
+DEBUG_INDEX(("Read string (converted from UTF-16): %s\n", ptr->data));
 } else {
-	DEBUG_INDEX(("Cannot read outside of buffer [%i !< %i]\n", xattrib.extended, hsize));
+DEBUG_INDEX(("Cannot read outside of buffer [%i !< %i]\n", xattrib.extended, hsize));
 }
 ptr->mytype = PST_MAP_HEADER;
 } else {
 // contains the attribute code to map to.
 ptr->data = (int*)xmalloc(sizeof(int32_t));
 if (err==0) {
 // add it to the list
 p_sh = p_head;
 p_sh2 = NULL;
 while (p_sh != NULL && ptr->map > p_sh->map) {
-	p_sh2 = p_sh;
+p_sh2 = p_sh;
-	p_sh = p_sh->next;
+p_sh = p_sh->next;
 }
 if (p_sh2 == NULL) {
-	// needs to go before first item
+// needs to go before first item
-	ptr->next = p_head;
+ptr->next = p_head;
-	p_head = ptr;
+p_head = ptr;
 } else {
-	// it will go after p_sh2
+// it will go after p_sh2
-	ptr->next = p_sh2->next;
+ptr->next = p_sh2->next;
-	p_sh2->next = ptr;
+p_sh2->next = ptr;
 }
 } else {
 free(ptr);
 ptr = NULL;
 }
 bptr += sizeof(index);
 while(index.id != 0 && x < 42 && bptr < buf+BLOCK_SIZE && index.id < end_val) {
 DEBUG_INDEX(("[%i]%i Item [id = %#x, offset = %#x, u1 = %#x, size = %i(%#x)]\n", depth, ++x, index.id, index.offset, index.u1, index.size, index.size));
 if (index.id & 0x02) {
-	DEBUG_INDEX(("two-bit set!!\n"));
+DEBUG_INDEX(("two-bit set!!\n"));
 }
 if (start_val != -1 && index.id != start_val) {
-	DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n"));
+DEBUG_WARN(("This item isn't right. Must be corruption, or I got it wrong!\n"));
-	DEBUG_HEXDUMPC(buf, BLOCK_SIZE, 12);
+DEBUG_HEXDUMPC(buf, BLOCK_SIZE, 12);
-	//	fseek(pf->fp, fpos, SEEK_SET);
+//  fseek(pf->fp, fpos, SEEK_SET);
-	if (buf) free(buf);
+if (buf) free(buf);
-	DEBUG_RET();
+DEBUG_RET();
-	return -1;
+return -1;
 } else {
-	start_val = -1;
+start_val = -1;
-	pf->id_depth_ok = 1;
+pf->id_depth_ok = 1;
 }
 // u1 could be a flag. if bit 0x2 is not set, it might be deleted
 //      if (index.u1 & 0x2 || index.u1 & 0x4) {
 // ignore the above condition. it doesn't appear to hold
 if (old > index.id) { // then we have back-slid on the new values
-	DEBUG_INDEX(("Back slider detected - Old value [%#x] greater than new [%#x]. Progressing to next table\n", old, index.id));
+DEBUG_INDEX(("Back slider detected - Old value [%#x] greater than new [%#x]. Progressing to next table\n", old, index.id));
-	DEBUG_RET();
+DEBUG_RET();
-	return 2;
+return 2;
 }
 old = index.id;
 i_ptr = (pst_index_ll*) xmalloc(sizeof(pst_index_ll));
 i_ptr->id = index.id;
 i_ptr->offset = index.offset;
 i_ptr->u1 = index.u1;
 i_ptr->size = index.size;
 i_ptr->next = NULL;
 if (pf->i_tail != NULL)
-	pf->i_tail->next = i_ptr;
+pf->i_tail->next = i_ptr;
 if (pf->i_head == NULL)
-	pf->i_head = i_ptr;
+pf->i_head = i_ptr;
 pf->i_tail = i_ptr;
 memcpy(&index, bptr, sizeof(index));
 LE32_CPU(index.id);
 LE32_CPU(index.offset);
 LE16_CPU(index.size);
 bptr += sizeof(index);
 }
 //    fseek(pf->fp, fpos, SEEK_SET);
 if (x < 42) { // we have stopped prematurley. Why?
 if (index.id == 0) {
-	DEBUG_INDEX(("Found index.id == 0\n"));
+DEBUG_INDEX(("Found index.id == 0\n"));
 } else if (!(bptr < buf+BLOCK_SIZE)) {
-	DEBUG_INDEX(("Read past end of buffer\n"));
+DEBUG_INDEX(("Read past end of buffer\n"));
 } else if (index.id >= end_val) {
-	DEBUG_INDEX(("index.id[%x] > end_val[%x]\n",
+DEBUG_INDEX(("index.id[%x] > end_val[%x]\n",
-		    index.id, end_val));
+index.id, end_val));
 } else {
-	DEBUG_INDEX(("Stopped for unknown reason\n"));
+DEBUG_INDEX(("Stopped for unknown reason\n"));
 }
 }
 if (buf) free (buf);
 DEBUG_RET();
 return 2;
 } else {
 // this is then probably a table of offsets to more tables.
 DEBUG_INDEX(("Reading Table Items\n"));
 x = 0;
 DEBUG_WARN(("This table isn't right. Must be corruption, or I got it wrong!\n"));
 DEBUG_HEXDUMPC(buf, BLOCK_SIZE, 12);
 if (buf) free(buf);
 DEBUG_RET();
 return -1;
 }
 while (table.start != 0 && bptr < buf+BLOCK_SIZE && table.start < end_val) {
 DEBUG_INDEX(("[%i] %i Table [start id = %#x, u1 = %#x, offset = %#x]\n", depth, ++x, table.start, table.u1, table.offset));
 if (table2.start <= table.start)
-	// this should only be the case when we come to the end of the table
+// this should only be the case when we come to the end of the table
-	// and table2.start == 0
+// and table2.start == 0
-	table2.start = end_val;
+table2.start = end_val;
 if ((ret = _pst_build_id_ptr(pf, table.offset, depth+1, table.start, table2.start)) == -1 && pf->id_depth_ok == 0) {
-	// it would appear that if the table below us isn't a table, but data, then we are actually the table. hmmm
+// it would appear that if the table below us isn't a table, but data, then we are actually the table. hmmm
-	DEBUG_INDEX(("Setting max depth to %i\n", depth));
+DEBUG_INDEX(("Setting max depth to %i\n", depth));
-	pf->index1_depth = depth; //set max depth to this level
+pf->index1_depth = depth; //set max depth to this level
-	if (buf) free (buf);
+if (buf) free (buf);
-	//	fseek(pf->fp, fpos, SEEK_SET);
+//  fseek(pf->fp, fpos, SEEK_SET);
-	DEBUG_RET();
+DEBUG_RET();
-	return 4; // this will indicate that we want to be called again with the same parameters
+return 4; // this will indicate that we want to be called again with the same parameters
 } else if (ret == 4) {
-	//we shan't bother with checking return value?
+//we shan't bother with checking return value?
-	DEBUG_INDEX(("Seen that a max depth has been set. Calling build again\n"));
+DEBUG_INDEX(("Seen that a max depth has been set. Calling build again\n"));
-	_pst_build_id_ptr(pf, table.offset, depth+1, table.start, table2.start);
+_pst_build_id_ptr(pf, table.offset, depth+1, table.start, table2.start);
 } else if (ret == 2) {
-	DEBUG_INDEX(("child returned successfully\n"));
+DEBUG_INDEX(("child returned successfully\n"));
 } else {
-	DEBUG_INDEX(("child has returned without a known error [%i]\n", ret));
+DEBUG_INDEX(("child has returned without a known error [%i]\n", ret));
 }
 memcpy(&table, bptr, sizeof(table));
 LE32_CPU(table.start);
 LE32_CPU(table.u1);
 LE32_CPU(table.offset);
 DEBUG_INDEX(("Table.start == 0\n"));
 } else if (bptr >= buf+BLOCK_SIZE) {
 DEBUG_INDEX(("Read past end of buffer\n"));
 } else if (table.start >= end_val) {
 DEBUG_INDEX(("Table.start[%x] > end_val[%x]\n",
-		   table.start, end_val));
+table.start, end_val));
 } else {
 DEBUG_INDEX(("Table reading stopped for an unknown reason\n"));
 }
 if (buf) free (buf);
 DEBUG_RET();
 return 1;
 }
 #define DESC_BLOCK_SIZE 520
 int32_t _pst_build_desc_ptr (pst_file *pf, int32_t offset, int32_t depth, int32_t *high_id, int32_t start_id,
-			     int32_t end_val) {
+int32_t end_val) {
 struct _pst_table_ptr_struct table, table2;
 pst_desc desc_rec;
 pst_desc_ll *d_ptr=NULL, *d_par=NULL;
 int32_t i = 0, y, prev_id=-1;
 char *buf = NULL, *bptr;
 struct _pst_d_ptr_ll {
 pst_desc_ll * ptr;
 int32_t parent; // used for lost and found lists
 struct _pst_d_ptr_ll * next;
 struct _pst_d_ptr_ll * prev;
 DEBUG_WARN(("I didn't get all the index that I wanted. _pst_read_block_size returned less than requested\n"));
 DEBUG_RET();
 return -1;
 }
 bptr = buf;
 //DEBUG_HEXDUMPC(buf, DESC_BLOCK_SIZE, 16);
 memcpy(&desc_rec, bptr, sizeof(desc_rec));
 LE32_CPU(desc_rec.d_id);
 LE32_CPU(desc_rec.desc_id);
 LE32_CPU(desc_rec.parent_id);
 bptr+= sizeof(desc_rec);
 if (end_val <= start_id) {
 DEBUG_WARN(("The end value is BEFORE the start value. This function will quit. Soz. [start:%#x, end:%#x]\n",
-		  start_id, end_val));
+start_id, end_val));
 }
 while (i < 0x1F && desc_rec.d_id < end_val && (prev_id == -1 || desc_rec.d_id > prev_id)) {
 DEBUG_INDEX(("[%i] Item(%#x) = [d_id = %#x, desc_id = %#x, "
-		  "list_id = %#x, parent_id = %#x]\n", depth, i, desc_rec.d_id,
+"list_id = %#x, parent_id = %#x]\n", depth, i, desc_rec.d_id,
-		  desc_rec.desc_id, desc_rec.list_id, desc_rec.parent_id));
+desc_rec.desc_id, desc_rec.list_id, desc_rec.parent_id));
 i++;
 if (start_id != -1 && desc_rec.d_id != start_id) {
-	DEBUG_INDEX(("Error: This table appears to be corrupt. Perhaps"
+DEBUG_INDEX(("Error: This table appears to be corrupt. Perhaps"
-		    " we are looking too deep!\n"));
+" we are looking too deep!\n"));
-	if (buf) free(buf);
+if (buf) free(buf);
-	DEBUG_RET();
+DEBUG_RET();
-	return -1;
+return -1;
 } else {
-	start_id = -1;
+start_id = -1;
-	pf->desc_depth_ok = 1;
+pf->desc_depth_ok = 1;
 }
 if (desc_rec.d_id == 0) {
-	memcpy(&desc_rec, bptr, sizeof(desc_rec));
+memcpy(&desc_rec, bptr, sizeof(desc_rec));
-	LE32_CPU(desc_rec.d_id);
+LE32_CPU(desc_rec.d_id);
-	LE32_CPU(desc_rec.desc_id);
+LE32_CPU(desc_rec.desc_id);
-	LE32_CPU(desc_rec.list_id);
+LE32_CPU(desc_rec.list_id);
-	LE32_CPU(desc_rec.parent_id);
+LE32_CPU(desc_rec.parent_id);
-	bptr+=sizeof(desc_rec);
+bptr+=sizeof(desc_rec);
-	continue;
+continue;
 }
 prev_id = desc_rec.d_id;
 // When duplicates found, just update the info.... perhaps this is correct functionality
 DEBUG_INDEX(("Searching for existing record\n"));
 if (desc_rec.d_id <= *high_id && (d_ptr = _pst_getDptr(pf, desc_rec.d_id)) !=  NULL) {
-	DEBUG_INDEX(("Updating Existing Values\n"));
+DEBUG_INDEX(("Updating Existing Values\n"));
-	d_ptr->list_index = _pst_getID(pf, desc_rec.list_id);
+d_ptr->list_index = _pst_getID(pf, desc_rec.list_id);
-	d_ptr->desc = _pst_getID(pf, desc_rec.desc_id);
+d_ptr->desc = _pst_getID(pf, desc_rec.desc_id);
-	DEBUG_INDEX(("\tdesc = %#x\tlist_index=%#x\n",
+DEBUG_INDEX(("\tdesc = %#x\tlist_index=%#x\n",
-		    (d_ptr->desc==NULL?0:d_ptr->desc->id),
+(d_ptr->desc==NULL?0:d_ptr->desc->id),
-		    (d_ptr->list_index==NULL?0:d_ptr->list_index->id)));
+(d_ptr->list_index==NULL?0:d_ptr->list_index->id)));
-	if (d_ptr->parent != NULL && desc_rec.parent_id != d_ptr->parent->id) {
+if (d_ptr->parent != NULL && desc_rec.parent_id != d_ptr->parent->id) {
-	  DEBUG_INDEX(("WARNING -- Parent of record has changed. Moving it\n"));
+DEBUG_INDEX(("WARNING -- Parent of record has changed. Moving it\n"));
-	  //hmmm, we must move the record.
+//hmmm, we must move the record.
-	  // first we must remove from current location
+// first we must remove from current location
-	  //   change previous record to point next to our next
+//   change previous record to point next to our next
-	  //     if no previous, then use parent's child
+//     if no previous, then use parent's child
-	  //     if no parent then change pf->d_head;
+//     if no parent then change pf->d_head;
-	  //   change next's prev to our prev
+//   change next's prev to our prev
-	  //     if no next then change parent's child_tail
+//     if no next then change parent's child_tail
-	  //     if no parent then change pf->d_tail
+//     if no parent then change pf->d_tail
-	  if (d_ptr->prev != NULL)
+if (d_ptr->prev != NULL)
-	    d_ptr->prev->next = d_ptr->next;
+d_ptr->prev->next = d_ptr->next;
-	  else if (d_ptr->parent != NULL)
+else if (d_ptr->parent != NULL)
-	    d_ptr->parent->child = d_ptr->next;
+d_ptr->parent->child = d_ptr->next;
-	  else
+else
-	    pf->d_head = d_ptr->next;
+pf->d_head = d_ptr->next;
-	  if (d_ptr->next != NULL)
+if (d_ptr->next != NULL)
-	    d_ptr->next->prev = d_ptr->prev;
+d_ptr->next->prev = d_ptr->prev;
-	  else if (d_ptr->parent != NULL)
+else if (d_ptr->parent != NULL)
-	    d_ptr->parent->child_tail = d_ptr->prev;
+d_ptr->parent->child_tail = d_ptr->prev;
-	  else
+else
-	    pf->d_tail = d_ptr->prev;
+pf->d_tail = d_ptr->prev;
-	  d_ptr->prev = NULL;
+d_ptr->prev = NULL;
-	  d_ptr->next = NULL;
+d_ptr->next = NULL;
-	  d_ptr->parent = NULL;
+d_ptr->parent = NULL;
-	  // ok, now place in correct place
+// ok, now place in correct place
-	  DEBUG_INDEX(("Searching for parent\n"));
+DEBUG_INDEX(("Searching for parent\n"));
-	  if (desc_rec.parent_id == 0) {
+if (desc_rec.parent_id == 0) {
-	    DEBUG_INDEX(("No Parent\n"));
+DEBUG_INDEX(("No Parent\n"));
-	    if (pf->d_tail != NULL)
+if (pf->d_tail != NULL)
-	      pf->d_tail->next = d_ptr;
+pf->d_tail->next = d_ptr;
-	    if (pf->d_head == NULL)
+if (pf->d_head == NULL)
-	      pf->d_head = d_ptr;
+pf->d_head = d_ptr;
-	    d_ptr->prev = pf->d_tail;
+d_ptr->prev = pf->d_tail;
-	    pf->d_tail = d_ptr;
+pf->d_tail = d_ptr;
-	  } else {
+} else {
-	    // check in the quick list
+// check in the quick list
-	    d_ptr_ptr = d_ptr_head;
+d_ptr_ptr = d_ptr_head;
-	    while (d_ptr_ptr != NULL && d_ptr_ptr->ptr->id != desc_rec.parent_id) {
+while (d_ptr_ptr != NULL && d_ptr_ptr->ptr->id != desc_rec.parent_id) {
-	      d_ptr_ptr = d_ptr_ptr->next;
+d_ptr_ptr = d_ptr_ptr->next;
-	    }
+}
-	    if (d_ptr_ptr == NULL && (d_par = _pst_getDptr(pf, desc_rec.parent_id)) == NULL) {
+if (d_ptr_ptr == NULL && (d_par = _pst_getDptr(pf, desc_rec.parent_id)) == NULL) {
-	      // check in the lost/found list
+// check in the lost/found list
-	      lf_ptr = lf_head;
+lf_ptr = lf_head;
-	      while (lf_ptr != NULL && lf_ptr->ptr->id != desc_rec.parent_id) {
+while (lf_ptr != NULL && lf_ptr->ptr->id != desc_rec.parent_id) {
-		lf_ptr = lf_ptr->next;
+lf_ptr = lf_ptr->next;
-	      }
+}
-	      if (lf_ptr == NULL) {
+if (lf_ptr == NULL) {
-		DEBUG_WARN(("ERROR -- not found parent with id %#x. Adding to lost/found\n", desc_rec.parent_id));
+DEBUG_WARN(("ERROR -- not found parent with id %#x. Adding to lost/found\n", desc_rec.parent_id));
-		lf_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
+lf_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
-		lf_ptr->prev = NULL;
+lf_ptr->prev = NULL;
-		lf_ptr->next = lf_head;
+lf_ptr->next = lf_head;
-		lf_ptr->parent = desc_rec.parent_id;
+lf_ptr->parent = desc_rec.parent_id;
-		lf_ptr->ptr = d_ptr;
+lf_ptr->ptr = d_ptr;
-		lf_head = lf_ptr;
+lf_head = lf_ptr;
-	      } else {
+} else {
-		d_par = lf_ptr->ptr;
+d_par = lf_ptr->ptr;
-		DEBUG_INDEX(("Found parent (%#x) in Lost and Found\n", d_par->id));
+DEBUG_INDEX(("Found parent (%#x) in Lost and Found\n", d_par->id));
-	      }
+}
-	    }
+}
-	    if (d_ptr_ptr != NULL || d_par != NULL) {
+if (d_ptr_ptr != NULL || d_par != NULL) {
-	      if (d_ptr_ptr != NULL)
+if (d_ptr_ptr != NULL)
-		d_par = d_ptr_ptr->ptr;
+d_par = d_ptr_ptr->ptr;
-	      else {
+else {
-		//add the d_par to the cache
+//add the d_par to the cache
-		DEBUG_INDEX(("Update - Cache addition\n"));
+DEBUG_INDEX(("Update - Cache addition\n"));
-		d_ptr_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
+d_ptr_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
-		d_ptr_ptr->prev = NULL;
+d_ptr_ptr->prev = NULL;
-		d_ptr_ptr->next = d_ptr_head;
+d_ptr_ptr->next = d_ptr_head;
-		d_ptr_ptr->ptr = d_par;
+d_ptr_ptr->ptr = d_par;
-		d_ptr_head = d_ptr_ptr;
+d_ptr_head = d_ptr_ptr;
-		if (d_ptr_tail == NULL)
+if (d_ptr_tail == NULL)
-		  d_ptr_tail = d_ptr_ptr;
+d_ptr_tail = d_ptr_ptr;
-		d_ptr_count++;
+d_ptr_count++;
-		if (d_ptr_count > 100) {
+if (d_ptr_count > 100) {
-		  //remove on from the end
+//remove on from the end
-		  d_ptr_ptr = d_ptr_tail;
+d_ptr_ptr = d_ptr_tail;
-		  d_ptr_tail = d_ptr_ptr->prev;
+d_ptr_tail = d_ptr_ptr->prev;
-		  free (d_ptr_ptr);
+free (d_ptr_ptr);
-		  d_ptr_count--;
+d_ptr_count--;
-		}
+}
-	      }
+}
-	      DEBUG_INDEX(("Found a parent\n"));
+DEBUG_INDEX(("Found a parent\n"));
-	      d_par->no_child++;
+d_par->no_child++;
-	      d_ptr->parent = d_par;
+d_ptr->parent = d_par;
-	      if (d_par->child_tail != NULL)
+if (d_par->child_tail != NULL)
-		d_par->child_tail->next = d_ptr;
+d_par->child_tail->next = d_ptr;
-	      if (d_par->child == NULL)
+if (d_par->child == NULL)
-		d_par->child = d_ptr;
+d_par->child = d_ptr;
-	      d_ptr->prev = d_par->child_tail;
+d_ptr->prev = d_par->child_tail;
-	      d_par->child_tail = d_ptr;
+d_par->child_tail = d_ptr;
-	    }
+}
-	  }
+}
-	}
+}
 } else {
-	if (*high_id < desc_rec.d_id) {
+if (*high_id < desc_rec.d_id) {
-	  DEBUG_INDEX(("Updating New High\n"));
+DEBUG_INDEX(("Updating New High\n"));
-	  *high_id = desc_rec.d_id;
+*high_id = desc_rec.d_id;
-	}
+}
-	DEBUG_INDEX(("New Record\n"));
+DEBUG_INDEX(("New Record\n"));
-	d_ptr = (pst_desc_ll*) xmalloc(sizeof(pst_desc_ll));
+d_ptr = (pst_desc_ll*) xmalloc(sizeof(pst_desc_ll));
-	//	DEBUG_INDEX(("Item pointer is %p\n", d_ptr));
+//  DEBUG_INDEX(("Item pointer is %p\n", d_ptr));
-	d_ptr->id = desc_rec.d_id;
+d_ptr->id = desc_rec.d_id;
-	d_ptr->list_index = _pst_getID(pf, desc_rec.list_id);
+d_ptr->list_index = _pst_getID(pf, desc_rec.list_id);
-	d_ptr->desc = _pst_getID(pf, desc_rec.desc_id);
+d_ptr->desc = _pst_getID(pf, desc_rec.desc_id);
-	d_ptr->prev = NULL;
+d_ptr->prev = NULL;
-	d_ptr->next = NULL;
+d_ptr->next = NULL;
-	d_ptr->parent = NULL;
+d_ptr->parent = NULL;
-	d_ptr->child = NULL;
+d_ptr->child = NULL;
-	d_ptr->child_tail = NULL;
+d_ptr->child_tail = NULL;
-	d_ptr->no_child = 0;
+d_ptr->no_child = 0;
 DEBUG_INDEX(("Searching for parent\n"));
-	if (desc_rec.parent_id == 0 || desc_rec.parent_id == desc_rec.d_id) {
+if (desc_rec.parent_id == 0 || desc_rec.parent_id == desc_rec.d_id) {
-	  if (desc_rec.parent_id == 0) {
+if (desc_rec.parent_id == 0) {
-	    DEBUG_INDEX(("No Parent\n"));
+DEBUG_INDEX(("No Parent\n"));
-	  } else {
+} else {
-	    DEBUG_INDEX(("Record is its own parent. What is this world coming to?\n"));
+DEBUG_INDEX(("Record is its own parent. What is this world coming to?\n"));
-	  }
+}
-	  if (pf->d_tail != NULL)
+if (pf->d_tail != NULL)
-	    pf->d_tail->next = d_ptr;
+pf->d_tail->next = d_ptr;
-	  if (pf->d_head == NULL)
+if (pf->d_head == NULL)
-	    pf->d_head = d_ptr;
+pf->d_head = d_ptr;
-	  d_ptr->prev = pf->d_tail;
+d_ptr->prev = pf->d_tail;
-	  pf->d_tail = d_ptr;
+pf->d_tail = d_ptr;
 } else {
-	  d_ptr_ptr = d_ptr_head;
+d_ptr_ptr = d_ptr_head;
-	  while (d_ptr_ptr != NULL && d_ptr_ptr->ptr->id != desc_rec.parent_id) {
+while (d_ptr_ptr != NULL && d_ptr_ptr->ptr->id != desc_rec.parent_id) {
-	    d_ptr_ptr = d_ptr_ptr->next;
+d_ptr_ptr = d_ptr_ptr->next;
-	  }
+}
-	  if (d_ptr_ptr == NULL && (d_par = _pst_getDptr(pf, desc_rec.parent_id)) == NULL) {
+if (d_ptr_ptr == NULL && (d_par = _pst_getDptr(pf, desc_rec.parent_id)) == NULL) {
-	    // check in the lost/found list
+// check in the lost/found list
-	    lf_ptr = lf_head;
+lf_ptr = lf_head;
-	    while (lf_ptr != NULL && lf_ptr->ptr->id != desc_rec.parent_id) {
+while (lf_ptr != NULL && lf_ptr->ptr->id != desc_rec.parent_id) {
-	      lf_ptr = lf_ptr->next;
+lf_ptr = lf_ptr->next;
-	    }
+}
-	    if (lf_ptr == NULL) {
+if (lf_ptr == NULL) {
-	      DEBUG_WARN(("ERROR -- not found parent with id %#x. Adding to lost/found\n", desc_rec.parent_id));
+DEBUG_WARN(("ERROR -- not found parent with id %#x. Adding to lost/found\n", desc_rec.parent_id));
-	      lf_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
+lf_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
-	      lf_ptr->prev = NULL;
+lf_ptr->prev = NULL;
-	      lf_ptr->next = lf_head;
+lf_ptr->next = lf_head;
-	      lf_ptr->parent = desc_rec.parent_id;
+lf_ptr->parent = desc_rec.parent_id;
-	      lf_ptr->ptr = d_ptr;
+lf_ptr->ptr = d_ptr;
-	      lf_head = lf_ptr;
+lf_head = lf_ptr;
-	    } else {
+} else {
-	      d_par = lf_ptr->ptr;
+d_par = lf_ptr->ptr;
-	      DEBUG_INDEX(("Found parent (%#x) in Lost and Found\n", d_par->id));
+DEBUG_INDEX(("Found parent (%#x) in Lost and Found\n", d_par->id));
-	    }
+}
-	  }
+}
-	  if (d_ptr_ptr != NULL || d_par != NULL) {
+if (d_ptr_ptr != NULL || d_par != NULL) {
-	    if (d_ptr_ptr != NULL)
+if (d_ptr_ptr != NULL)
-	      d_par = d_ptr_ptr->ptr;
+d_par = d_ptr_ptr->ptr;
-	    else {
+else {
-	      //add the d_par to the cache
+//add the d_par to the cache
-	      DEBUG_INDEX(("Normal - Cache addition\n"));
+DEBUG_INDEX(("Normal - Cache addition\n"));
-	      d_ptr_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
+d_ptr_ptr = (struct _pst_d_ptr_ll*) xmalloc(sizeof(struct _pst_d_ptr_ll));
-	      d_ptr_ptr->prev = NULL;
+d_ptr_ptr->prev = NULL;
-	      d_ptr_ptr->next = d_ptr_head;
+d_ptr_ptr->next = d_ptr_head;
-	      d_ptr_ptr->ptr = d_par;
+d_ptr_ptr->ptr = d_par;
-	      d_ptr_head = d_ptr_ptr;
+d_ptr_head = d_ptr_ptr;
-	      if (d_ptr_tail == NULL)
+if (d_ptr_tail == NULL)
-		d_ptr_tail = d_ptr_ptr;
+d_ptr_tail = d_ptr_ptr;
-	      d_ptr_count++;
+d_ptr_count++;
-	      if (d_ptr_count > 100) {
+if (d_ptr_count > 100) {
-		//remove one from the end
+//remove one from the end
-		d_ptr_ptr = d_ptr_tail;
+d_ptr_ptr = d_ptr_tail;
-		d_ptr_tail = d_ptr_ptr->prev;
+d_ptr_tail = d_ptr_ptr->prev;
-		free (d_ptr_ptr);
+free (d_ptr_ptr);
-		d_ptr_count--;
+d_ptr_count--;
-	      }
+}
-	    }
+}
-	    DEBUG_INDEX(("Found a parent\n"));
+DEBUG_INDEX(("Found a parent\n"));
-	    d_par->no_child++;
+d_par->no_child++;
-	    d_ptr->parent = d_par;
+d_ptr->parent = d_par;
-	    if (d_par->child_tail != NULL)
+if (d_par->child_tail != NULL)
-	      d_par->child_tail->next = d_ptr;
+d_par->child_tail->next = d_ptr;
-	    if (d_par->child == NULL)
+if (d_par->child == NULL)
-	      d_par->child = d_ptr;
+d_par->child = d_ptr;
-	    d_ptr->prev = d_par->child_tail;
+d_ptr->prev = d_par->child_tail;
-	    d_par->child_tail = d_ptr;
+d_par->child_tail = d_ptr;
-	  }
+}
-	}
+}
 }
 // check here to see if d_ptr is the parent of any of the items in the lost / found list
 lf_ptr = lf_head; lf_shd = NULL;
 while (lf_ptr != NULL) {
-	if (lf_ptr->parent == d_ptr->id) {
+if (lf_ptr->parent == d_ptr->id) {
-	  DEBUG_INDEX(("Found a child  (%#x) of the current record. Joining to main structure.\n", lf_ptr->ptr->id));
+DEBUG_INDEX(("Found a child  (%#x) of the current record. Joining to main structure.\n", lf_ptr->ptr->id));
-	  d_par = d_ptr;
+d_par = d_ptr;
-	  d_ptr = lf_ptr->ptr;
+d_ptr = lf_ptr->ptr;
-	  d_par->no_child++;
+d_par->no_child++;
-	  d_ptr->parent = d_par;
+d_ptr->parent = d_par;
-	  if (d_par->child_tail != NULL)
+if (d_par->child_tail != NULL)
-	    d_par->child_tail->next = d_ptr;
+d_par->child_tail->next = d_ptr;
-	  if (d_par->child == NULL)
+if (d_par->child == NULL)
-	    d_par->child = d_ptr;
+d_par->child = d_ptr;
-	  d_ptr->prev = d_par->child_tail;
+d_ptr->prev = d_par->child_tail;
-	  d_par->child_tail = d_ptr;
+d_par->child_tail = d_ptr;
-	  if (lf_shd == NULL)
+if (lf_shd == NULL)
-	    lf_head = lf_ptr->next;
+lf_head = lf_ptr->next;
-	  else
+else
-	    lf_shd->next = lf_ptr->next;
+lf_shd->next = lf_ptr->next;
-	  lf_tmp = lf_ptr->next;
+lf_tmp = lf_ptr->next;
-	  free(lf_ptr);
+free(lf_ptr);
-	  lf_ptr = lf_tmp;
+lf_ptr = lf_tmp;
-	} else {
+} else {
-	  lf_shd = lf_ptr;
+lf_shd = lf_ptr;
-	  lf_ptr = lf_ptr->next;
+lf_ptr = lf_ptr->next;
-	}
+}
 }
 memcpy(&desc_rec, bptr, sizeof(desc_rec));
 LE32_CPU(desc_rec.d_id);
 LE32_CPU(desc_rec.desc_id);
 LE32_CPU(desc_rec.list_id);
 return -1;
 }
 y = 0;
 while(table.start != 0 /*&& y < 0x1F && table.start < end_val*/) {
 DEBUG_INDEX(("[%i] %i Pointer Table = [start = %#x, u1 = %#x, offset = %#x]\n",
-		  depth, ++y, table.start, table.u1, table.offset));
+depth, ++y, table.start, table.u1, table.offset));
 if (table2.start <= table.start) {
-	// for the end of our table, table2.start may equal 0
+// for the end of our table, table2.start may equal 0
-	DEBUG_WARN(("2nd value in index table is less than current value. Setting to higher value [%#x, %#x, %#x]\n",
+DEBUG_WARN(("2nd value in index table is less than current value. Setting to higher value [%#x, %#x, %#x]\n",
-		    table.start, table2.start, INT32_MAX));
+table.start, table2.start, INT32_MAX));
-	table2.start = INT32_MAX;
+table2.start = INT32_MAX;
 }
 if ((i = _pst_build_desc_ptr(pf, table.offset, depth+1, high_id, table.start, table2.start)) == -1 && pf->desc_depth_ok == 0) { //the table beneath isn't a table
-	pf->index2_depth = depth; //set the max depth to this level
+pf->index2_depth = depth; //set the max depth to this level
-	if (buf) free(buf);
+if (buf) free(buf);
-	DEBUG_RET();
+DEBUG_RET();
-	return 4;
+return 4;
 } else if (i == 4) { //repeat with last tried values, but lower depth
-	_pst_build_desc_ptr(pf, table.offset, depth+1, high_id, table.start, table2.start);
+_pst_build_desc_ptr(pf, table.offset, depth+1, high_id, table.start, table2.start);
 }
 memcpy(&table, bptr, sizeof(table));
 LE32_CPU(table.start);
 LE32_CPU(table.u1);
 // we must now read the secondary record for each based on the id2 val associated with
 // each attachment
 attach = item->attach;
 while (attach != NULL) {
 if ((id_ptr = _pst_getID2(id2_head, attach->id2_val)) != NULL) {
-	// id_ptr is a record describing the attachment
+// id_ptr is a record describing the attachment
-	// we pass NULL instead of id2_head cause we don't want it to
+// we pass NULL instead of id2_head cause we don't want it to
-	// load all the extra stuff here.
+// load all the extra stuff here.
-	if ((list = _pst_parse_block(pf, id_ptr->id, NULL)) == NULL) {
+if ((list = _pst_parse_block(pf, id_ptr->id, NULL)) == NULL) {
-	  DEBUG_WARN(("ERROR error processing an attachment record\n"));
+DEBUG_WARN(("ERROR error processing an attachment record\n"));
-	  attach = attach->next;
+attach = attach->next;
-	  continue;
+continue;
-	}
+}
-	item->current_attach = attach;
+item->current_attach = attach;
-	if (_pst_process(list, item)) {
+if (_pst_process(list, item)) {
-	  DEBUG_WARN(("ERROR _pst_process() failed with an attachment\n"));
+DEBUG_WARN(("ERROR _pst_process() failed with an attachment\n"));
-	  _pst_free_list(list);
+_pst_free_list(list);
-	  attach = attach->next;
+attach = attach->next;
-	  continue;
+continue;
-	}
+}
-	_pst_free_list(list);
+_pst_free_list(list);
-	if ((id_ptr = _pst_getID2(id2_head, attach->id2_val)) != NULL) {
+if ((id_ptr = _pst_getID2(id2_head, attach->id2_val)) != NULL) {
-	  // id2_val has been updated to the ID2 value of the datablock containing the
+// id2_val has been updated to the ID2 value of the datablock containing the
-	  // attachment data
+// attachment data
-	  attach->id_val = id_ptr->id;
+attach->id_val = id_ptr->id;
-	} else {
+} else {
-	  DEBUG_WARN(("have not located the correct value for the attachment [%#x]\n",
+DEBUG_WARN(("have not located the correct value for the attachment [%#x]\n",
-		      attach->id2_val));
+attach->id2_val));
-	}
+}
 } else {
-	DEBUG_WARN(("ERROR cannot locate id2 value %#x\n", attach->id2_val));
+DEBUG_WARN(("ERROR cannot locate id2 value %#x\n", attach->id2_val));
 }
 attach = attach->next;
 }
 item->current_attach = item->attach; //reset back to first
 }
 LE16_CPU(block_hdr.type);
 LE16_CPU(block_hdr.offset);
 DEBUG_EMAIL(("block header (index_offset=%#hx, type=%#hx, offset=%#hx\n", block_hdr.index_offset, block_hdr.type, block_hdr.offset));
 ind_ptr = block_hdr.index_offset;
 if (block_hdr.type == 0xBCEC) { //type 1
 block_type = 1;
 _pst_getBlockOffset(buf, ind_ptr, block_hdr.offset, &block_offset);
 fr_ptr = block_offset.from;
 memcpy(&table_rec, &(buf[fr_ptr]), sizeof(table_rec));
 LE16_CPU(table_rec.type);
 LE16_CPU(table_rec.ref_type);
 LE32_CPU(table_rec.value);
 DEBUG_EMAIL(("table_rec (type=%#hx, ref_type=%#hx, value=%#x\n", table_rec.type, table_rec.ref_type, table_rec.value));
 num_list = (to_ptr - fr_ptr)/sizeof(table_rec);
 num_recs = 1; // only going to one object in these blocks
 rec_size = 0; // doesn't matter cause there is only one object
 } else if (block_hdr.type == 0x7CEC) { //type 2
 block_type = 2;
 _pst_getBlockOffset(buf, ind_ptr, block_hdr.offset, &block_offset);
 fr_ptr = block_offset.from; //now got pointer to "7C block"
 memset(&seven_c_blk, 0, sizeof(seven_c_blk));
 memcpy(&seven_c_blk, &(buf[fr_ptr]), sizeof(seven_c_blk));
 LE16_CPU(seven_c_blk.u1);
 return NULL;
 }
 _pst_getBlockOffset(buf, ind_ptr, table_rec.value, &block_offset);
 num_recs = (block_offset.to - block_offset.from) / 6; // this will give the number of records in this block
 _pst_getBlockOffset(buf, ind_ptr, seven_c_blk.ind2_offset, &block_offset);
 ind2_ptr = block_offset.from;
 } else {
 WARN(("ERROR: Unknown block constant - %#X for id %#x\n", block_hdr.type, block_id));
 DEBUG_HEXDUMPC(buf, read_size,0x10);
 fr_ptr = list_start; // init fr_ptr to the start of the list.
 cur_list = 0;
 stop = 0;
 while (!stop && cur_list < num_list) { //we will increase fr_ptr as we progress through index
 if (block_type == 1) {
-	memcpy(&table_rec, &(buf[fr_ptr]), sizeof(table_rec));
+memcpy(&table_rec, &(buf[fr_ptr]), sizeof(table_rec));
-	LE16_CPU(table_rec.type);
+LE16_CPU(table_rec.type);
-	LE16_CPU(table_rec.ref_type);
+LE16_CPU(table_rec.ref_type);
-	fr_ptr += sizeof(table_rec);
+fr_ptr += sizeof(table_rec);
 } else if (block_type == 2) {
-	// we will copy the table2_rec values into a table_rec record so that we can keep the rest of the code
+// we will copy the table2_rec values into a table_rec record so that we can keep the rest of the code
-	memcpy(&table2_rec, &(buf[fr_ptr]), sizeof(table2_rec));
+memcpy(&table2_rec, &(buf[fr_ptr]), sizeof(table2_rec));
-	LE16_CPU(table2_rec.ref_type);
+LE16_CPU(table2_rec.ref_type);
-	LE16_CPU(table2_rec.type);
+LE16_CPU(table2_rec.type);
-	LE16_CPU(table2_rec.ind2_off);
+LE16_CPU(table2_rec.ind2_off);
-	LE16_CPU(table2_rec.u1);
+LE16_CPU(table2_rec.u1);
-	// table_rec and table2_rec are arranged differently, so assign the values across
+// table_rec and table2_rec are arranged differently, so assign the values across
-	table_rec.type = table2_rec.type;
+table_rec.type = table2_rec.type;
-	table_rec.ref_type = table2_rec.ref_type;
+table_rec.ref_type = table2_rec.ref_type;
-	if (ind2_ptr+table2_rec.ind2_off > 0 &&
+if (ind2_ptr+table2_rec.ind2_off > 0 &&
-	    ind2_ptr+table2_rec.ind2_off < read_size-sizeof(table_rec.value))
+ind2_ptr+table2_rec.ind2_off < read_size-sizeof(table_rec.value))
-	  memcpy(&(table_rec.value), &(buf[ind2_ptr+table2_rec.ind2_off]), sizeof(table_rec.value));
+memcpy(&(table_rec.value), &(buf[ind2_ptr+table2_rec.ind2_off]), sizeof(table_rec.value));
-	else {
+else {
-	  DEBUG_WARN (("trying to read more than blocks size. Size=%#x, Req.=%#x,"
+DEBUG_WARN (("trying to read more than blocks size. Size=%#x, Req.=%#x,"
-		       " Req Size=%#x\n", read_size, ind2_ptr+table2_rec.ind2_off,
+" Req Size=%#x\n", read_size, ind2_ptr+table2_rec.ind2_off,
-		       sizeof(table_rec.value)));
+sizeof(table_rec.value)));
-	}
+}
-	fr_ptr += sizeof(table2_rec);
+fr_ptr += sizeof(table2_rec);
 } else {
-	WARN(("Missing code for block_type %i\n", block_type));
+WARN(("Missing code for block_type %i\n", block_type));
-	if (buf) free(buf);
+if (buf) free(buf);
-	DEBUG_RET();
+DEBUG_RET();
-	return NULL;
+return NULL;
 }
 cur_list++; // get ready to read next bit from list
 DEBUG_EMAIL(("reading block %i (type=%#x, ref_type=%#x, value=%#x)\n",
-		  x, table_rec.type, table_rec.ref_type, table_rec.value));
+x, table_rec.type, table_rec.ref_type, table_rec.value));
 na_ptr->items[x] = (struct _pst_num_item*) xmalloc(sizeof(struct _pst_num_item));
 //      DEBUG_EMAIL(("_pst_parse_block:   record address = %p\n", na_ptr->items[x]));
 memset(na_ptr->items[x], 0, sizeof(struct _pst_num_item)); //init it
 // check here to see if the id of the attribute is a mapped one
 mapptr = pf->x_head;
 while (mapptr != NULL && mapptr->map < table_rec.type)
-	mapptr = mapptr->next;
+mapptr = mapptr->next;
 if (mapptr != NULL && mapptr->map == table_rec.type) {
-	if (mapptr->mytype == PST_MAP_ATTRIB) {
+if (mapptr->mytype == PST_MAP_ATTRIB) {
-	  na_ptr->items[x]->id = *((int*)mapptr->data);
+na_ptr->items[x]->id = *((int*)mapptr->data);
-	  DEBUG_EMAIL(("Mapped attrib %#x to %#x\n", table_rec.type, na_ptr->items[x]->id));
+DEBUG_EMAIL(("Mapped attrib %#x to %#x\n", table_rec.type, na_ptr->items[x]->id));
-	} else if (mapptr->mytype == PST_MAP_HEADER) {
+} else if (mapptr->mytype == PST_MAP_HEADER) {
-	  DEBUG_EMAIL(("Internet Header mapping found %#x\n", table_rec.type));
+DEBUG_EMAIL(("Internet Header mapping found %#x\n", table_rec.type));
-	  na_ptr->items[x]->id = PST_ATTRIB_HEADER;
+na_ptr->items[x]->id = PST_ATTRIB_HEADER;
-	  na_ptr->items[x]->extra = mapptr->data;
+na_ptr->items[x]->extra = mapptr->data;
-	}
+}
 } else {
-	na_ptr->items[x]->id = table_rec.type;
+na_ptr->items[x]->id = table_rec.type;
 }
 na_ptr->items[x]->type = 0; // checked later before it is set
 /* Reference Types
 2 - 0x0002 - Signed 16bit value
-	 3 - 0x0003 - Signed 32bit value
+3 - 0x0003 - Signed 32bit value
-	 4 - 0x0004 - 4-byte floating point
+4 - 0x0004 - 4-byte floating point
-	 5 - 0x0005 - Floating point double
+5 - 0x0005 - Floating point double
-	 6 - 0x0006 - Signed 64-bit int
+6 - 0x0006 - Signed 64-bit int
-	 7 - 0x0007 - Application Time
+7 - 0x0007 - Application Time
-	10 - 0x000A - 32-bit error value
+10 - 0x000A - 32-bit error value
-	11 - 0x000B - Boolean (non-zero = true)
+11 - 0x000B - Boolean (non-zero = true)
-	13 - 0x000D - Embedded Object
+13 - 0x000D - Embedded Object
-	20 - 0x0014 - 8-byte signed integer (64-bit)
+20 - 0x0014 - 8-byte signed integer (64-bit)
-	30 - 0x001E - Null terminated String
+30 - 0x001E - Null terminated String
-	31 - 0x001F - Unicode string
+31 - 0x001F - Unicode string
-	64 - 0x0040 - Systime - Filetime structure
+64 - 0x0040 - Systime - Filetime structure
-	72 - 0x0048 - OLE Guid
+72 - 0x0048 - OLE Guid
 258 - 0x0102 - Binary data
-	   - 0x1003 - Array of 32bit values
+- 0x1003 - Array of 32bit values
-	   - 0x1014 - Array of 64bit values
+- 0x1014 - Array of 64bit values
-	   - 0x101E - Array of Strings
+- 0x101E - Array of Strings
-	   - 0x1102 - Array of Binary data
+- 0x1102 - Array of Binary data
 */
 if (table_rec.ref_type == 0x0003 || table_rec.ref_type == 0x000b
-	  || table_rec.ref_type == 0x0002) { //contains data
+|| table_rec.ref_type == 0x0002) { //contains data
-	na_ptr->items[x]->data = xmalloc(sizeof(int32_t));
+na_ptr->items[x]->data = xmalloc(sizeof(int32_t));
-	memcpy(na_ptr->items[x]->data, &(table_rec.value), sizeof(int32_t));
+memcpy(na_ptr->items[x]->data, &(table_rec.value), sizeof(int32_t));
-	na_ptr->items[x]->size = sizeof(int32_t);
+na_ptr->items[x]->size = sizeof(int32_t);
-	na_ptr->items[x]->type = table_rec.ref_type;
+na_ptr->items[x]->type = table_rec.ref_type;
 } else if (table_rec.ref_type == 0x0005 || table_rec.ref_type == 0x000D
-		 || table_rec.ref_type == 0x1003 || table_rec.ref_type == 0x0014
+|| table_rec.ref_type == 0x1003 || table_rec.ref_type == 0x0014
-		 || table_rec.ref_type == 0x001E || table_rec.ref_type == 0x0102
+|| table_rec.ref_type == 0x001E || table_rec.ref_type == 0x0102
-		 || table_rec.ref_type == 0x0040 || table_rec.ref_type == 0x101E
+|| table_rec.ref_type == 0x0040 || table_rec.ref_type == 0x101E
-		 || table_rec.ref_type == 0x0048 || table_rec.ref_type == 0x1102
+|| table_rec.ref_type == 0x0048 || table_rec.ref_type == 0x1102
-		 || table_rec.ref_type == 0x1014) {
+|| table_rec.ref_type == 0x1014) {
-	//contains index_ref to data
+//contains index_ref to data
-	LE32_CPU(table_rec.value);
+LE32_CPU(table_rec.value);
-	if ((table_rec.value & 0x0000000F) == 0xF) {
+if ((table_rec.value & 0x0000000F) == 0xF) {
-	  // if value ends in 'F' then this should be an id2 value
+// if value ends in 'F' then this should be an id2 value
-	  DEBUG_EMAIL(("Found id2 [%#x] value. Will follow it\n",
+DEBUG_EMAIL(("Found id2 [%#x] value. Will follow it\n",
-		      table_rec.value));
+table_rec.value));
-	  if ((na_ptr->items[x]->size = _pst_ff_getID2block(pf, table_rec.value, i2_head,
+if ((na_ptr->items[x]->size = _pst_ff_getID2block(pf, table_rec.value, i2_head,
-							    &(na_ptr->items[x]->data)))==0) {
+&(na_ptr->items[x]->data)))==0) {
-	    DEBUG_WARN(("not able to read the ID2 data. Setting to be read later. %#x\n",
+DEBUG_WARN(("not able to read the ID2 data. Setting to be read later. %#x\n",
-		  table_rec.value));
+table_rec.value));
-	    na_ptr->items[x]->size = 0;
+na_ptr->items[x]->size = 0;
-	    na_ptr->items[x]->data = NULL;
+na_ptr->items[x]->data = NULL;
-	    na_ptr->items[x]->type = table_rec.value;
+na_ptr->items[x]->type = table_rec.value;
-	  }
+}
-	  DEBUG_EMAIL(("Read %i bytes to a buffer at %p\n",
+DEBUG_EMAIL(("Read %i bytes to a buffer at %p\n",
-		       na_ptr->items[x]->size, na_ptr->items[x]->data));
+na_ptr->items[x]->size, na_ptr->items[x]->data));
-	} else if (table_rec.value != 0) {
+} else if (table_rec.value != 0) {
-	  if ((table_rec.value >> 4)+ind_ptr > read_size) {
+if ((table_rec.value >> 4)+ind_ptr > read_size) {
-	    // check that we will not be outside the buffer we have read
+// check that we will not be outside the buffer we have read
-	    DEBUG_WARN(("table_rec.value [%#x] is outside of block [%#x]\n",
+DEBUG_WARN(("table_rec.value [%#x] is outside of block [%#x]\n",
-		  table_rec.value, read_size));
+table_rec.value, read_size));
-	    na_ptr->count_item --;
+na_ptr->count_item --;
-	    continue;
+continue;
-	  }
+}
-	  if (_pst_getBlockOffset(buf, ind_ptr, table_rec.value, &block_offset)) {
+if (_pst_getBlockOffset(buf, ind_ptr, table_rec.value, &block_offset)) {
-	    DEBUG_WARN(("failed to get block offset for table_rec.value of %#x\n",
+DEBUG_WARN(("failed to get block offset for table_rec.value of %#x\n",
-		  table_rec.value));
+table_rec.value));
-	    na_ptr->count_item --; //we will be skipping a row
+na_ptr->count_item --; //we will be skipping a row
-	    continue;
+continue;
-	  }
+}
-	  t_ptr = block_offset.from;
+t_ptr = block_offset.from;
-	  if (t_ptr <= block_offset.to) {
+if (t_ptr <= block_offset.to) {
-	    na_ptr->items[x]->size = size = block_offset.to - t_ptr;
+na_ptr->items[x]->size = size = block_offset.to - t_ptr;
-	  } else {
-	    DEBUG_WARN(("I don't want to malloc less than zero sized block. from=%#x, to=%#x."
-		  "Will change to 1 byte\n", block_offset.from, block_offset.to));
-	    na_ptr->items[x]->size = size = 0; // the malloc statement will add one to this
-	  }
-	  // plus one for good luck (and strings) we will null terminate all reads
-	  na_ptr->items[x]->data = (char*) xmalloc(size+1);
-	  memcpy(na_ptr->items[x]->data, &(buf[t_ptr]), size);
-	  na_ptr->items[x]->data[size] = '\0'; // null terminate buffer
-	  if (table_rec.ref_type == 0xd) {
-	    // there is still more to do for the type of 0xD
-	    type_d_rec = (struct _type_d_rec*) na_ptr->items[x]->data;
-	    LE32_CPU(type_d_rec->id);
-	    if ((na_ptr->items[x]->size =
-		 _pst_ff_getID2block(pf, type_d_rec->id, i2_head,
-				     &(na_ptr->items[x]->data)))==0){
-	      DEBUG_WARN(("not able to read the ID2 data. Setting to be read later. %#x\n",
-		    type_d_rec->id));
-	      na_ptr->items[x]->size = 0;
-	      na_ptr->items[x]->data = NULL;
-	      na_ptr->items[x]->type = type_d_rec->id;
-	    }
-	    DEBUG_EMAIL(("Read %i bytes into a buffer at %p\n",
-			 na_ptr->items[x]->size, na_ptr->items[x]->data));
-	    //	  }
-	  }
-	} else {
-	  DEBUG_EMAIL(("Ignoring 0 value in offset\n"));
-	  if (na_ptr->items[x]->data)
-	    free (na_ptr->items[x]->data);
-	  na_ptr->items[x]->data = NULL;
-	  free(na_ptr->items[x]);
-	  na_ptr->count_item--; // remove this item from the destination list
-	  continue;
-	}
-	if (na_ptr->items[x]->type == 0) //it can be used to convey information
-	  // to later functions
-	  na_ptr->items[x]->type = table_rec.ref_type;
 } else {
-	WARN(("ERROR Unknown ref_type %#x\n", table_rec.ref_type));
+DEBUG_WARN(("I don't want to malloc less than zero sized block. from=%#x, to=%#x."
-	DEBUG_RET();
+"Will change to 1 byte\n", block_offset.from, block_offset.to));
-	return NULL;
+na_ptr->items[x]->size = size = 0; // the malloc statement will add one to this
+}
+// plus one for good luck (and strings) we will null terminate all reads
+na_ptr->items[x]->data = (char*) xmalloc(size+1);
+memcpy(na_ptr->items[x]->data, &(buf[t_ptr]), size);
+na_ptr->items[x]->data[size] = '\0'; // null terminate buffer
+if (table_rec.ref_type == 0xd) {
+// there is still more to do for the type of 0xD
+type_d_rec = (struct _type_d_rec*) na_ptr->items[x]->data;
+LE32_CPU(type_d_rec->id);
+if ((na_ptr->items[x]->size =
+_pst_ff_getID2block(pf, type_d_rec->id, i2_head,
+&(na_ptr->items[x]->data)))==0){
+DEBUG_WARN(("not able to read the ID2 data. Setting to be read later. %#x\n",
+type_d_rec->id));
+na_ptr->items[x]->size = 0;
+na_ptr->items[x]->data = NULL;
+na_ptr->items[x]->type = type_d_rec->id;
+}
+DEBUG_EMAIL(("Read %i bytes into a buffer at %p\n",
+na_ptr->items[x]->size, na_ptr->items[x]->data));
+//    }
+}
+} else {
+DEBUG_EMAIL(("Ignoring 0 value in offset\n"));
+if (na_ptr->items[x]->data)
+free (na_ptr->items[x]->data);
+na_ptr->items[x]->data = NULL;
+free(na_ptr->items[x]);
+na_ptr->count_item--; // remove this item from the destination list
+continue;
+}
+if (na_ptr->items[x]->type == 0) //it can be used to convey information
+// to later functions
+na_ptr->items[x]->type = table_rec.ref_type;
+} else {
+WARN(("ERROR Unknown ref_type %#x\n", table_rec.ref_type));
+DEBUG_RET();
+return NULL;
 }
 x++;
 }
 DEBUG_EMAIL(("increasing ind2_ptr by %i [%#x] bytes. Was %#x, Now %#x\n",
-		rec_size, rec_size, ind2_ptr,
+rec_size, rec_size, ind2_ptr,
-		ind2_ptr+rec_size));
+ind2_ptr+rec_size));
 ind2_ptr += rec_size;
 count_rec++;
 }
 if (buf != NULL)
 free(buf);
 break;\
 }\
 next=0;\
 }\
 }
 int32_t _pst_process(pst_num_array *list , pst_item *item) {
 int32_t x, t;
 int32_t next = 0;
 pst_item_attach *attach;
 pst_item_extra_field *ef;
 while (list != NULL) {
 x = 0;
 while (x < list->count_item) {
 // check here to see if the id is one that is mapped.
 DEBUG_EMAIL(("#%d - id: %#x type: %#x length: %#x\n", x, list->items[x]->id, list->items[x]->type,
-		   list->items[x]->size));
+list->items[x]->size));
 switch (list->items[x]->id) {
 case PST_ATTRIB_HEADER: // CUSTOM attribute for saying the Extra Headers
-	DEBUG_EMAIL(("Extra Field - "));
+DEBUG_EMAIL(("Extra Field - "));
-	ef = (pst_item_extra_field*) xmalloc(sizeof(pst_item_extra_field));
+ef = (pst_item_extra_field*) xmalloc(sizeof(pst_item_extra_field));
-	memset(ef, 0, sizeof(pst_item_extra_field));
+memset(ef, 0, sizeof(pst_item_extra_field));
-	ef->field_name = (char*) xmalloc(strlen(list->items[x]->extra)+1);
+ef->field_name = (char*) xmalloc(strlen(list->items[x]->extra)+1);
-	strcpy(ef->field_name, list->items[x]->extra);
+strcpy(ef->field_name, list->items[x]->extra);
-	LIST_COPY(ef->value, (char*));
+LIST_COPY(ef->value, (char*));
-	ef->next = item->extra_fields;
+ef->next = item->extra_fields;
-	item->extra_fields = ef;
+item->extra_fields = ef;
-	DEBUG_EMAIL(("\"%s\" = \"%s\"\n", ef->field_name, ef->value));
+DEBUG_EMAIL(("\"%s\" = \"%s\"\n", ef->field_name, ef->value));
-	break;
+break;
 case 0x0002: // PR_ALTERNATE_RECIPIENT_ALLOWED
-	// If set to true, the sender allows this email to be autoforwarded
+// If set to true, the sender allows this email to be autoforwarded
-	DEBUG_EMAIL(("AutoForward allowed - "));
+DEBUG_EMAIL(("AutoForward allowed - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*((short int*)list->items[x]->data) != 0) {
+if (*((short int*)list->items[x]->data) != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->autoforward = 1;
+item->email->autoforward = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->autoforward = -1;
+item->email->autoforward = -1;
-	}
+}
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x0003: // Extended Attributes table
-	DEBUG_EMAIL(("Extended Attributes Table - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Extended Attributes Table - NOT PROCESSED\n"));
-	break;
+break;
 case 0x0017: // PR_IMPORTANCE
-	// How important the sender deems it to be
+// How important the sender deems it to be
-	// 0 - Low
+// 0 - Low
-	// 1 - Normal
+// 1 - Normal
-	// 2 - High
+// 2 - High
-	DEBUG_EMAIL(("Importance Level - "));
+DEBUG_EMAIL(("Importance Level - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
 memcpy(&(item->email->importance), list->items[x]->data, sizeof(item->email->importance));
-	LE32_CPU(item->email->importance);
+LE32_CPU(item->email->importance);
-	t = item->email->importance;
+t = item->email->importance;
-	DEBUG_EMAIL(("%s [%i]\n", (t==0?"Low":(t==1?"Normal":"High")), t));
+DEBUG_EMAIL(("%s [%i]\n", (t==0?"Low":(t==1?"Normal":"High")), t));
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x001A: // PR_MESSAGE_CLASS Ascii type of messages - NOT FOLDERS
-	// must be case insensitive
+// must be case insensitive
-	DEBUG_EMAIL(("IPM.x - "));
+DEBUG_EMAIL(("IPM.x - "));
-	LIST_COPY(item->ascii_type, (char*));
+LIST_COPY(item->ascii_type, (char*));
-	if (pst_strincmp("IPM.Note", item->ascii_type, 8) == 0)
+if (pst_strincmp("IPM.Note", item->ascii_type, 8) == 0)
-	  // the string begins with IPM.Note...
+// the string begins with IPM.Note...
-	  item->type = PST_TYPE_NOTE;
+item->type = PST_TYPE_NOTE;
-	else if (pst_stricmp("IPM", item->ascii_type) == 0)
+else if (pst_stricmp("IPM", item->ascii_type) == 0)
-	  // the whole string is just IPM
+// the whole string is just IPM
-	  item->type = PST_TYPE_NOTE;
+item->type = PST_TYPE_NOTE;
-	else if (pst_strincmp("IPM.Contact", item->ascii_type, 11) == 0)
+else if (pst_strincmp("IPM.Contact", item->ascii_type, 11) == 0)
-	  // the string begins with IPM.Contact...
+// the string begins with IPM.Contact...
-	  item->type = PST_TYPE_CONTACT;
+item->type = PST_TYPE_CONTACT;
-	else if (pst_strincmp("REPORT.IPM.Note", item->ascii_type, 15) == 0)
+else if (pst_strincmp("REPORT.IPM.Note", item->ascii_type, 15) == 0)
-	  // the string begins with the above
+// the string begins with the above
-	  item->type = PST_TYPE_REPORT;
+item->type = PST_TYPE_REPORT;
-	else if (pst_strincmp("IPM.Activity", item->ascii_type, 12) == 0)
+else if (pst_strincmp("IPM.Activity", item->ascii_type, 12) == 0)
-	  item->type = PST_TYPE_JOURNAL;
+item->type = PST_TYPE_JOURNAL;
-	else if (pst_strincmp("IPM.Appointment", item->ascii_type, 15) == 0)
+else if (pst_strincmp("IPM.Appointment", item->ascii_type, 15) == 0)
-	  item->type = PST_TYPE_APPOINTMENT;
+item->type = PST_TYPE_APPOINTMENT;
-	else
+else
-	  item->type = PST_TYPE_OTHER;
+item->type = PST_TYPE_OTHER;
-	DEBUG_EMAIL(("%s\n", item->ascii_type));
+DEBUG_EMAIL(("%s\n", item->ascii_type));
-	//	INC_CHECK_X(); //increment x here so that the next if statement has a chance of matching the next item
+//  INC_CHECK_X(); //increment x here so that the next if statement has a chance of matching the next item
-	break;
+break;
 case 0x0023: // PR_ORIGINATOR_DELIVERY_REPORT_REQUESTED
-	// set if the sender wants a delivery report from all recipients
+// set if the sender wants a delivery report from all recipients
-	DEBUG_EMAIL(("Global Delivery Report - "));
+DEBUG_EMAIL(("Global Delivery Report - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->delivery_report = 1;
+item->email->delivery_report = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->delivery_report = 0;
+item->email->delivery_report = 0;
-	}
+}
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x0026: // PR_PRIORITY
-	// Priority of a message
+// Priority of a message
-	// -1 NonUrgent
+// -1 NonUrgent
-	//  0 Normal
+//  0 Normal
-	//  1 Urgent
+//  1 Urgent
-	DEBUG_EMAIL(("Priority - "));
+DEBUG_EMAIL(("Priority - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->priority), list->items[x]->data, sizeof(item->email->priority));
+memcpy(&(item->email->priority), list->items[x]->data, sizeof(item->email->priority));
-	LE32_CPU(item->email->priority);
+LE32_CPU(item->email->priority);
-	t = item->email->priority;
+t = item->email->priority;
-	DEBUG_EMAIL(("%s [%i]\n", (t<0?"NonUrgent":(t==0?"Normal":"Urgent")), t));
+DEBUG_EMAIL(("%s [%i]\n", (t<0?"NonUrgent":(t==0?"Normal":"Urgent")), t));
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x0029:// PR_READ_RECEIPT_REQUESTED
-	DEBUG_EMAIL(("Read Receipt - "));
+DEBUG_EMAIL(("Read Receipt - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(short int*)list->items[x]->data != 0) {
+if (*(short int*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->read_receipt = 1;
+item->email->read_receipt = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->read_receipt = 0;
+item->email->read_receipt = 0;
-	}
+}
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x002B: // PR_RECIPIENT_REASSIGNMENT_PROHIBITED
-	DEBUG_EMAIL(("Reassignment Prohibited (Private) - "));
+DEBUG_EMAIL(("Reassignment Prohibited (Private) - "));
-	if (*(short int*)list->items[x]->data != 0) {
+if (*(short int*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->private = 1;
+item->private_member = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->private = 0;
+item->private_member = 0;
-	}
+}
-	break;
+break;
 case 0x002E: // PR_ORIGINAL_SENSITIVITY
-	// the sensitivity of the message before being replied to or forwarded
+// the sensitivity of the message before being replied to or forwarded
-	// 0 - None
+// 0 - None
-	// 1 - Personal
+// 1 - Personal
-	// 2 - Private
+// 2 - Private
-	// 3 - Company Confidential
+// 3 - Company Confidential
-	DEBUG_EMAIL(("Original Sensitivity - "));
+DEBUG_EMAIL(("Original Sensitivity - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->orig_sensitivity), list->items[x]->data, sizeof(item->email->orig_sensitivity));
+memcpy(&(item->email->orig_sensitivity), list->items[x]->data, sizeof(item->email->orig_sensitivity));
-	LE32_CPU(item->email->orig_sensitivity);
+LE32_CPU(item->email->orig_sensitivity);
-	t = item->email->orig_sensitivity;
+t = item->email->orig_sensitivity;
-	DEBUG_EMAIL(("%s [%i]\n", (t==0?"None":(t==1?"Personal":
+DEBUG_EMAIL(("%s [%i]\n", (t==0?"None":(t==1?"Personal":
-						(t==2?"Private":"Company Confidential"))), t));
+(t==2?"Private":"Company Confidential"))), t));
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x0036: // PR_SENSITIVITY
-	// sender's opinion of the sensitivity of an email
+// sender's opinion of the sensitivity of an email
-	// 0 - None
+// 0 - None
-	// 1 - Personal
+// 1 - Personal
-	// 2 - Private
+// 2 - Private
-	// 3 - Company Confidiential
+// 3 - Company Confidiential
-	DEBUG_EMAIL(("Sensitivity - "));
+DEBUG_EMAIL(("Sensitivity - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->sensitivity), list->items[x]->data, sizeof(item->email->sensitivity));
+memcpy(&(item->email->sensitivity), list->items[x]->data, sizeof(item->email->sensitivity));
-	LE32_CPU(item->email->sensitivity);
+LE32_CPU(item->email->sensitivity);
-	t = item->email->sensitivity;
+t = item->email->sensitivity;
-	DEBUG_EMAIL(("%s [%i]\n", (t==0?"None":(t==1?"Personal":
+DEBUG_EMAIL(("%s [%i]\n", (t==0?"None":(t==1?"Personal":
-						(t==2?"Private":"Company Confidential"))), t));
+(t==2?"Private":"Company Confidential"))), t));
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x0037: // PR_SUBJECT raw subject
-	//      if (list->items[x]->id == 0x0037) {
+//      if (list->items[x]->id == 0x0037) {
-	DEBUG_EMAIL(("Raw Subject - "));
+DEBUG_EMAIL(("Raw Subject - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	item->email->subject = (pst_item_email_subject*) realloc(item->email->subject, sizeof(pst_item_email_subject));
+item->email->subject = (pst_item_email_subject*) realloc(item->email->subject, sizeof(pst_item_email_subject));
-	memset(item->email->subject, 0, sizeof(pst_item_email_subject));
+memset(item->email->subject, 0, sizeof(pst_item_email_subject));
-	DEBUG_EMAIL((" [size = %i] ", list->items[x]->size));
+DEBUG_EMAIL((" [size = %i] ", list->items[x]->size));
-	if (list->items[x]->size > 0) {
+if (list->items[x]->size > 0) {
-	  if (isprint(list->items[x]->data[0])) {
+if (isprint(list->items[x]->data[0])) {
-	    // then there are no control bytes at the front
+// then there are no control bytes at the front
-	    item->email->subject->off1 = 0;
+item->email->subject->off1 = 0;
-	    item->email->subject->off2 = 0;
+item->email->subject->off2 = 0;
-	    item->email->subject->subj = realloc(item->email->subject->subj, list->items[x]->size+1);
+item->email->subject->subj = realloc(item->email->subject->subj, list->items[x]->size+1);
-	    memset(item->email->subject->subj, 0, list->items[x]->size+1);
+memset(item->email->subject->subj, 0, list->items[x]->size+1);
-	    memcpy(item->email->subject->subj, list->items[x]->data, list->items[x]->size);
+memcpy(item->email->subject->subj, list->items[x]->data, list->items[x]->size);
-	  } else {
+} else {
-	    DEBUG_EMAIL(("Raw Subject has control codes\n"));
+DEBUG_EMAIL(("Raw Subject has control codes\n"));
-	    // there might be some control bytes in the first and second bytes
+// there might be some control bytes in the first and second bytes
-	    item->email->subject->off1 = list->items[x]->data[0];
+item->email->subject->off1 = list->items[x]->data[0];
-	    item->email->subject->off2 = list->items[x]->data[1];
+item->email->subject->off2 = list->items[x]->data[1];
-	    item->email->subject->subj = realloc(item->email->subject->subj, (list->items[x]->size-2)+1);
+item->email->subject->subj = realloc(item->email->subject->subj, (list->items[x]->size-2)+1);
-	    memset(item->email->subject->subj, 0, list->items[x]->size-1);
+memset(item->email->subject->subj, 0, list->items[x]->size-1);
-	    memcpy(item->email->subject->subj, &(list->items[x]->data[2]), list->items[x]->size-2);
+memcpy(item->email->subject->subj, &(list->items[x]->data[2]), list->items[x]->size-2);
-	  }
+}
-	  DEBUG_EMAIL(("%s\n", item->email->subject->subj));
+DEBUG_EMAIL(("%s\n", item->email->subject->subj));
-	} else {
+} else {
-	  // obviously outlook has decided not to be straight with this one.
+// obviously outlook has decided not to be straight with this one.
-	  item->email->subject->off1 = 0;
+item->email->subject->off1 = 0;
-	  item->email->subject->off2 = 0;
+item->email->subject->off2 = 0;
-	  item->email->subject = NULL;
+item->email->subject = NULL;
-	  DEBUG_EMAIL(("NULL subject detected\n"));
+DEBUG_EMAIL(("NULL subject detected\n"));
-	}
+}
-	break;
+break;
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
 case 0x0039: // PR_CLIENT_SUBMIT_TIME Date Email Sent/Created
-	DEBUG_EMAIL(("Date sent - "));
+DEBUG_EMAIL(("Date sent - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->sent_date, (FILETIME*));
+LIST_COPY(item->email->sent_date, (FILETIME*));
-	LE32_CPU(item->email->sent_date->dwLowDateTime);
+LE32_CPU(item->email->sent_date->dwLowDateTime);
-	LE32_CPU(item->email->sent_date->dwHighDateTime);
+LE32_CPU(item->email->sent_date->dwHighDateTime);
-	DEBUG_EMAIL(("%s", fileTimeToAscii(item->email->sent_date)));
+DEBUG_EMAIL(("%s", fileTimeToAscii(item->email->sent_date)));
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x003B: // PR_SENT_REPRESENTING_SEARCH_KEY Sender address 1
-	DEBUG_EMAIL(("Sent on behalf of address 1 - "));
+DEBUG_EMAIL(("Sent on behalf of address 1 - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->outlook_sender, (char*));
+LIST_COPY(item->email->outlook_sender, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->outlook_sender));
+DEBUG_EMAIL(("%s\n", item->email->outlook_sender));
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x003F: // PR_RECEIVED_BY_ENTRYID Structure containing Recipient
-	DEBUG_EMAIL(("Recipient Structure 1 -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Recipient Structure 1 -- NOT HANDLED\n"));
-	//	INC_CHECK_X();
+//  INC_CHECK_X();
-	break;
+break;
 case 0x0040: // PR_RECEIVED_BY_NAME Name of Recipient Structure
-	DEBUG_EMAIL(("Received By Name 1 -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Received By Name 1 -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0041: // PR_SENT_REPRESENTING_ENTRYID Structure containing Sender
-	DEBUG_EMAIL(("Sent on behalf of Structure 1 -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Sent on behalf of Structure 1 -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0042: // PR_SENT_REPRESENTING_NAME Name of Sender Structure
-	DEBUG_EMAIL(("Sent on behalf of Structure Name - "));
+DEBUG_EMAIL(("Sent on behalf of Structure Name - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->outlook_sender_name, (char*));
+LIST_COPY(item->email->outlook_sender_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->outlook_sender_name));
+DEBUG_EMAIL(("%s\n", item->email->outlook_sender_name));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0043: // PR_RCVD_REPRESENTING_ENTRYID Recipient Structure 2
-	DEBUG_EMAIL(("Received on behalf of Structure -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Received on behalf of Structure -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0044: // PR_RCVD_REPRESENTING_NAME Name of Recipient Structure 2
-	DEBUG_EMAIL(("Received on behalf of Structure Name -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Received on behalf of Structure Name -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x004F: // PR_REPLY_RECIPIENT_ENTRIES Reply-To Structure
-	DEBUG_EMAIL(("Reply-To Structure -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Reply-To Structure -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0050: // PR_REPLY_RECIPIENT_NAMES Name of Reply-To Structure
-	DEBUG_EMAIL(("Name of Reply-To Structure -"));
+DEBUG_EMAIL(("Name of Reply-To Structure -"));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->reply_to, (char*));
+LIST_COPY(item->email->reply_to, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->reply_to));
+DEBUG_EMAIL(("%s\n", item->email->reply_to));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0051: // PR_RECEIVED_BY_SEARCH_KEY Recipient Address 1
-	DEBUG_EMAIL(("Recipient's Address 1 (Search Key) - "));
+DEBUG_EMAIL(("Recipient's Address 1 (Search Key) - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY (item->email->outlook_recipient, (char*));
+LIST_COPY (item->email->outlook_recipient, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->outlook_recipient));
+DEBUG_EMAIL(("%s\n", item->email->outlook_recipient));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0052: // PR_RCVD_REPRESENTING_SEARCH_KEY Recipient Address 2
-	DEBUG_EMAIL(("Received on behalf of Address (Search Key) - "));
+DEBUG_EMAIL(("Received on behalf of Address (Search Key) - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->outlook_recipient2, (char*));
+LIST_COPY(item->email->outlook_recipient2, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->outlook_recipient2));
+DEBUG_EMAIL(("%s\n", item->email->outlook_recipient2));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0057: // PR_MESSAGE_TO_ME
-	// this user is listed explicitly in the TO address
+// this user is listed explicitly in the TO address
-	DEBUG_EMAIL(("My address in TO field - "));
+DEBUG_EMAIL(("My address in TO field - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->message_to_me = 1;
+item->email->message_to_me = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->message_to_me = 0;
+item->email->message_to_me = 0;
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0058: // PR_MESSAGE_CC_ME
-	// this user is listed explicitly in the CC address
+// this user is listed explicitly in the CC address
-	DEBUG_EMAIL(("My address in CC field - "));
+DEBUG_EMAIL(("My address in CC field - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->message_cc_me = 1;
+item->email->message_cc_me = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->message_cc_me = 0;
+item->email->message_cc_me = 0;
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0059: //PR_MESSAGE_RECIP_ME
-	// this user appears in TO, CC or BCC address list
+// this user appears in TO, CC or BCC address list
-	DEBUG_EMAIL(("Message addressed to me - "));
+DEBUG_EMAIL(("Message addressed to me - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->message_recip_me = 1;
+item->email->message_recip_me = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->message_recip_me = 0;
+item->email->message_recip_me = 0;
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0063: // PR_RESPONSE_REQUESTED
-	DEBUG_EMAIL(("Response requested - "));
+DEBUG_EMAIL(("Response requested - "));
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->response_requested = 1;
+item->response_requested = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->response_requested = 0;
+item->response_requested = 0;
-	}
+}
-	break;
+break;
 case 0x0064: // PR_SENT_REPRESENTING_ADDRTYPE Access method for Sender Address
-	DEBUG_EMAIL(("Sent on behalf of address type - "));
+DEBUG_EMAIL(("Sent on behalf of address type - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->sender_access, (char*));
+LIST_COPY(item->email->sender_access, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->sender_access));
+DEBUG_EMAIL(("%s\n", item->email->sender_access));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0065: // PR_SENT_REPRESENTING_EMAIL_ADDRESS Sender Address
-	DEBUG_EMAIL(("Sent on behalf of Address - "));
+DEBUG_EMAIL(("Sent on behalf of Address - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->sender_address, (char*));
+LIST_COPY(item->email->sender_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->sender_address));
+DEBUG_EMAIL(("%s\n", item->email->sender_address));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0070: // PR_CONVERSATION_TOPIC Processed Subject
-	DEBUG_EMAIL(("Processed Subject (Conversation Topic) - "));
+DEBUG_EMAIL(("Processed Subject (Conversation Topic) - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->proc_subject, (char*));
+LIST_COPY(item->email->proc_subject, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->proc_subject));
+DEBUG_EMAIL(("%s\n", item->email->proc_subject));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0071: // PR_CONVERSATION_INDEX Date 2
-	DEBUG_EMAIL(("Conversation Index - "));
+DEBUG_EMAIL(("Conversation Index - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->conv_index), list->items[x]->data, sizeof(item->email->conv_index));
+memcpy(&(item->email->conv_index), list->items[x]->data, sizeof(item->email->conv_index));
-	DEBUG_EMAIL(("%i\n", item->email->conv_index));
+DEBUG_EMAIL(("%i\n", item->email->conv_index));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0075: // PR_RECEIVED_BY_ADDRTYPE Recipient Access Method
-	DEBUG_EMAIL(("Received by Address type - "));
+DEBUG_EMAIL(("Received by Address type - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->recip_access, (char*));
+LIST_COPY(item->email->recip_access, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->recip_access));
+DEBUG_EMAIL(("%s\n", item->email->recip_access));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0076: // PR_RECEIVED_BY_EMAIL_ADDRESS Recipient Address
-	DEBUG_EMAIL(("Received by Address - "));
+DEBUG_EMAIL(("Received by Address - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->recip_address, (char*));
+LIST_COPY(item->email->recip_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->recip_address));
+DEBUG_EMAIL(("%s\n", item->email->recip_address));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0077: // PR_RCVD_REPRESENTING_ADDRTYPE Recipient Access Method 2
-	DEBUG_EMAIL(("Received on behalf of Address type - "));
+DEBUG_EMAIL(("Received on behalf of Address type - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->recip2_access, (char*));
+LIST_COPY(item->email->recip2_access, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->recip2_access));
+DEBUG_EMAIL(("%s\n", item->email->recip2_access));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0078: // PR_RCVD_REPRESENTING_EMAIL_ADDRESS Recipient Address 2
-	DEBUG_EMAIL(("Received on behalf of Address -"));
+DEBUG_EMAIL(("Received on behalf of Address -"));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->recip2_address, (char*));
+LIST_COPY(item->email->recip2_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->recip2_address));
+DEBUG_EMAIL(("%s\n", item->email->recip2_address));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x007D: // PR_TRANSPORT_MESSAGE_HEADERS Internet Header
-	DEBUG_EMAIL(("Internet Header - "));
+DEBUG_EMAIL(("Internet Header - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->header, (char*));
+LIST_COPY(item->email->header, (char*));
-	//DEBUG_EMAIL(("%s\n", item->email->header));
+//DEBUG_EMAIL(("%s\n", item->email->header));
-	DEBUG_EMAIL(("NOT PRINTED\n"));
+DEBUG_EMAIL(("NOT PRINTED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0C17: // PR_REPLY_REQUESTED
-	DEBUG_EMAIL(("Reply Requested - "));
+DEBUG_EMAIL(("Reply Requested - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->reply_requested = 1;
+item->email->reply_requested = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->reply_requested = 0;
+item->email->reply_requested = 0;
-	}
+}
-	break;
+break;
 case 0x0C19: // PR_SENDER_ENTRYID Sender Structure 2
-	DEBUG_EMAIL(("Sender Structure 2 -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Sender Structure 2 -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0C1A: // PR_SENDER_NAME Name of Sender Structure 2
-	DEBUG_EMAIL(("Name of Sender Structure 2 -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Name of Sender Structure 2 -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0C1D: // PR_SENDER_SEARCH_KEY Name of Sender Address 2
-	DEBUG_EMAIL(("Name of Sender Address 2 (Sender search key) - "));
+DEBUG_EMAIL(("Name of Sender Address 2 (Sender search key) - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->outlook_sender2, (char*));
+LIST_COPY(item->email->outlook_sender2, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->outlook_sender2));
+DEBUG_EMAIL(("%s\n", item->email->outlook_sender2));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0C1E: // PR_SENDER_ADDRTYPE Sender Address 2 access method
-	DEBUG_EMAIL(("Sender Address type - "));
+DEBUG_EMAIL(("Sender Address type - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->sender2_access, (char*));
+LIST_COPY(item->email->sender2_access, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->sender2_access));
+DEBUG_EMAIL(("%s\n", item->email->sender2_access));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0C1F: // PR_SENDER_EMAIL_ADDRESS Sender Address 2
-	DEBUG_EMAIL(("Sender Address - "));
+DEBUG_EMAIL(("Sender Address - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->sender2_address, (char*));
+LIST_COPY(item->email->sender2_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->sender2_address));
+DEBUG_EMAIL(("%s\n", item->email->sender2_address));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E01: // PR_DELETE_AFTER_SUBMIT
-	// I am not too sure how this works
+// I am not too sure how this works
-	DEBUG_EMAIL(("Delete after submit - "));
+DEBUG_EMAIL(("Delete after submit - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*) list->items[x]->data != 0) {
+if (*(int16_t*) list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->delete_after_submit = 1;
+item->email->delete_after_submit = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->delete_after_submit = 0;
+item->email->delete_after_submit = 0;
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E03: // PR_DISPLAY_CC CC Addresses
-	DEBUG_EMAIL(("Display CC Addresses - "));
+DEBUG_EMAIL(("Display CC Addresses - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->cc_address, (char*));
+LIST_COPY(item->email->cc_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->cc_address));
+DEBUG_EMAIL(("%s\n", item->email->cc_address));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E04: // PR_DISPLAY_TO Address Sent-To
-	DEBUG_EMAIL(("Display Sent-To Address - "));
+DEBUG_EMAIL(("Display Sent-To Address - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->sentto_address, (char*));
+LIST_COPY(item->email->sentto_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->sentto_address));
+DEBUG_EMAIL(("%s\n", item->email->sentto_address));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E06: // PR_MESSAGE_DELIVERY_TIME Date 3 - Email Arrival Date
-	DEBUG_EMAIL(("Date 3 (Delivery Time) - "));
+DEBUG_EMAIL(("Date 3 (Delivery Time) - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->arrival_date, (FILETIME*));
+LIST_COPY(item->email->arrival_date, (FILETIME*));
-	DEBUG_EMAIL(("%s", fileTimeToAscii(item->email->arrival_date)));
+DEBUG_EMAIL(("%s", fileTimeToAscii(item->email->arrival_date)));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E07: // PR_MESSAGE_FLAGS Email Flag
-	// 0x01 - Read
+// 0x01 - Read
-	// 0x02 - Unmodified
+// 0x02 - Unmodified
-	// 0x04 - Submit
+// 0x04 - Submit
-	// 0x08 - Unsent
+// 0x08 - Unsent
-	// 0x10 - Has Attachments
+// 0x10 - Has Attachments
-	// 0x20 - From Me
+// 0x20 - From Me
-	// 0x40 - Associated
+// 0x40 - Associated
-	// 0x80 - Resend
+// 0x80 - Resend
-	// 0x100 - RN Pending
+// 0x100 - RN Pending
-	// 0x200 - NRN Pending
+// 0x200 - NRN Pending
-	DEBUG_EMAIL(("Message Flags - "));
+DEBUG_EMAIL(("Message Flags - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->flag), list->items[x]->data, sizeof(item->email->flag));
+memcpy(&(item->email->flag), list->items[x]->data, sizeof(item->email->flag));
-	LE32_CPU(item->email->flag);
+LE32_CPU(item->email->flag);
-	DEBUG_EMAIL(("%i\n", item->email->flag));
+DEBUG_EMAIL(("%i\n", item->email->flag));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E08: // PR_MESSAGE_SIZE Total size of a message object
-	DEBUG_EMAIL(("Message Size - "));
+DEBUG_EMAIL(("Message Size - "));
-	memcpy(&(item->message_size), list->items[x]->data, sizeof(item->message_size));
+memcpy(&(item->message_size), list->items[x]->data, sizeof(item->message_size));
-	LE32_CPU(item->message_size);
+LE32_CPU(item->message_size);
-	DEBUG_EMAIL(("%i [%#x]\n", item->message_size, item->message_size));
+DEBUG_EMAIL(("%i [%#x]\n", item->message_size, item->message_size));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E0A: // PR_SENTMAIL_ENTRYID
-	// folder that this message is sent to after submission
+// folder that this message is sent to after submission
-	DEBUG_EMAIL(("Sentmail EntryID - "));
+DEBUG_EMAIL(("Sentmail EntryID - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->sentmail_folder, (pst_entryid*));
+LIST_COPY(item->email->sentmail_folder, (pst_entryid*));
-	LE32_CPU(item->email->sentmail_folder->id);
+LE32_CPU(item->email->sentmail_folder->id);
-	DEBUG_EMAIL(("[id = %#x]\n", item->email->sentmail_folder->id));
+DEBUG_EMAIL(("[id = %#x]\n", item->email->sentmail_folder->id));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E1F: // PR_RTF_IN_SYNC
-	// True means that the rtf version is same as text body
+// True means that the rtf version is same as text body
-	// False means rtf version is more up-to-date than text body
+// False means rtf version is more up-to-date than text body
-	// if this value doesn't exist, text body is more up-to-date than rtf and
+// if this value doesn't exist, text body is more up-to-date than rtf and
-	//   cannot update to the rtf
+//   cannot update to the rtf
-	DEBUG_EMAIL(("Compressed RTF in Sync - "));
+DEBUG_EMAIL(("Compressed RTF in Sync - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->rtf_in_sync = 1;
+item->email->rtf_in_sync = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->rtf_in_sync = 0;
+item->email->rtf_in_sync = 0;
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0E20: // PR_ATTACH_SIZE binary Attachment data in record
-	DEBUG_EMAIL(("Attachment Size - "));
+DEBUG_EMAIL(("Attachment Size - "));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	memcpy(&(attach->size), list->items[x]->data,
+memcpy(&(attach->size), list->items[x]->data,
-	       sizeof(attach->size));
+sizeof(attach->size));
-	DEBUG_EMAIL(("%i\n", attach->size));
+DEBUG_EMAIL(("%i\n", attach->size));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x0FF9: // PR_RECORD_KEY Record Header 1
-	DEBUG_EMAIL(("Record Key 1 - "));
+DEBUG_EMAIL(("Record Key 1 - "));
-	LIST_COPY(item->record_key, (char*));
+LIST_COPY(item->record_key, (char*));
-	item->record_key_size = list->items[x]->size;
+item->record_key_size = list->items[x]->size;
-	DEBUG_EMAIL_HEXPRINT(item->record_key, item->record_key_size);
+DEBUG_EMAIL_HEXPRINT(item->record_key, item->record_key_size);
-	DEBUG_EMAIL(("\n"));
+DEBUG_EMAIL(("\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1000: // PR_BODY Plain Text body
-	DEBUG_EMAIL(("Plain Text body - "));
+DEBUG_EMAIL(("Plain Text body - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->body, (char*));
+LIST_COPY(item->email->body, (char*));
-	//DEBUG_EMAIL("%s\n", item->email->body);
+//DEBUG_EMAIL("%s\n", item->email->body);
-	DEBUG_EMAIL(("NOT PRINTED\n"));
+DEBUG_EMAIL(("NOT PRINTED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1006: // PR_RTF_SYNC_BODY_CRC
-	DEBUG_EMAIL(("RTF Sync Body CRC - "));
+DEBUG_EMAIL(("RTF Sync Body CRC - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->rtf_body_crc), list->items[x]->data,
+memcpy(&(item->email->rtf_body_crc), list->items[x]->data,
-	       sizeof(item->email->rtf_body_crc));
+sizeof(item->email->rtf_body_crc));
-	LE32_CPU(item->email->rtf_body_crc);
+LE32_CPU(item->email->rtf_body_crc);
-	DEBUG_EMAIL(("%#x\n", item->email->rtf_body_crc));
+DEBUG_EMAIL(("%#x\n", item->email->rtf_body_crc));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1007: // PR_RTF_SYNC_BODY_COUNT
-	// a count of the *significant* charcters in the rtf body. Doesn't count
+// a count of the *significant* charcters in the rtf body. Doesn't count
-	// whitespace and other ignorable characters
+// whitespace and other ignorable characters
-	DEBUG_EMAIL(("RTF Sync Body character count - "));
+DEBUG_EMAIL(("RTF Sync Body character count - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->rtf_body_char_count), list->items[x]->data,
+memcpy(&(item->email->rtf_body_char_count), list->items[x]->data,
-	       sizeof(item->email->rtf_body_char_count));
+sizeof(item->email->rtf_body_char_count));
-	LE32_CPU(item->email->rtf_body_char_count);
+LE32_CPU(item->email->rtf_body_char_count);
-	DEBUG_EMAIL(("%i [%#x]\n", item->email->rtf_body_char_count,
+DEBUG_EMAIL(("%i [%#x]\n", item->email->rtf_body_char_count,
-		     item->email->rtf_body_char_count));
+item->email->rtf_body_char_count));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1008: // PR_RTF_SYNC_BODY_TAG
-	// the first couple of lines of RTF body so that after modification, then beginning can
+// the first couple of lines of RTF body so that after modification, then beginning can
-	// once again be found
+// once again be found
-	DEBUG_EMAIL(("RTF Sync body tag - "));
+DEBUG_EMAIL(("RTF Sync body tag - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->rtf_body_tag, (char*));
+LIST_COPY(item->email->rtf_body_tag, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->rtf_body_tag));
+DEBUG_EMAIL(("%s\n", item->email->rtf_body_tag));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1009: // PR_RTF_COMPRESSED
-	// some compression algorithm has been applied to this. At present
+// some compression algorithm has been applied to this. At present
-	// it is unknown
+// it is unknown
-	DEBUG_EMAIL(("RTF Compressed body - "));
+DEBUG_EMAIL(("RTF Compressed body - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->rtf_compressed, (char*));
+LIST_COPY(item->email->rtf_compressed, (char*));
-	//	DEBUG_EMAIL(("Pointer: %p\n", item->email->rtf_compressed));
+//  DEBUG_EMAIL(("Pointer: %p\n", item->email->rtf_compressed));
-	DEBUG_EMAIL(("NOT PRINTED\n"));
+DEBUG_EMAIL(("NOT PRINTED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1010: // PR_RTF_SYNC_PREFIX_COUNT
-	// a count of the ignored characters before the first significant character
+// a count of the ignored characters before the first significant character
-	DEBUG_EMAIL(("RTF whitespace prefix count - "));
+DEBUG_EMAIL(("RTF whitespace prefix count - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->rtf_ws_prefix_count), list->items[x]->data,
+memcpy(&(item->email->rtf_ws_prefix_count), list->items[x]->data,
-	       sizeof(item->email->rtf_ws_prefix_count));
+sizeof(item->email->rtf_ws_prefix_count));
-	DEBUG_EMAIL(("%i\n", item->email->rtf_ws_prefix_count));
+DEBUG_EMAIL(("%i\n", item->email->rtf_ws_prefix_count));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1011: // PR_RTF_SYNC_TRAILING_COUNT
-	// a count of the ignored characters after the last significant character
+// a count of the ignored characters after the last significant character
-	DEBUG_EMAIL(("RTF whitespace tailing count - "));
+DEBUG_EMAIL(("RTF whitespace tailing count - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	memcpy(&(item->email->rtf_ws_trailing_count), list->items[x]->data,
+memcpy(&(item->email->rtf_ws_trailing_count), list->items[x]->data,
-	       sizeof(item->email->rtf_ws_trailing_count));
+sizeof(item->email->rtf_ws_trailing_count));
-	DEBUG_EMAIL(("%i\n", item->email->rtf_ws_trailing_count));
+DEBUG_EMAIL(("%i\n", item->email->rtf_ws_trailing_count));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1013: // HTML body
-	DEBUG_EMAIL(("HTML body - "));
+DEBUG_EMAIL(("HTML body - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->htmlbody, (char*));
+LIST_COPY(item->email->htmlbody, (char*));
-	//	DEBUG_EMAIL(("%s\n", item->email->htmlbody));
+//  DEBUG_EMAIL(("%s\n", item->email->htmlbody));
-	DEBUG_EMAIL(("NOT PRINTED\n"));
+DEBUG_EMAIL(("NOT PRINTED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1035: // Message ID
-	DEBUG_EMAIL(("Message ID - "));
+DEBUG_EMAIL(("Message ID - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->messageid, (char*));
+LIST_COPY(item->email->messageid, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->messageid));
+DEBUG_EMAIL(("%s\n", item->email->messageid));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1042: // in-reply-to
-	DEBUG_EMAIL(("In-Reply-To - "));
+DEBUG_EMAIL(("In-Reply-To - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->in_reply_to, (char*));
+LIST_COPY(item->email->in_reply_to, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->in_reply_to));
+DEBUG_EMAIL(("%s\n", item->email->in_reply_to));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x1046: // Return Path
-	DEBUG_EMAIL(("Return Path - "));
+DEBUG_EMAIL(("Return Path - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->return_path_address, (char*));
+LIST_COPY(item->email->return_path_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->return_path_address));
+DEBUG_EMAIL(("%s\n", item->email->return_path_address));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3001: // PR_DISPLAY_NAME File As
-	DEBUG_EMAIL(("Display Name - "));
+DEBUG_EMAIL(("Display Name - "));
-	LIST_COPY(item->file_as, (char*));
+LIST_COPY(item->file_as, (char*));
-	DEBUG_EMAIL(("%s\n", item->file_as));
+DEBUG_EMAIL(("%s\n", item->file_as));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3002: // PR_ADDRTYPE
-	DEBUG_EMAIL(("Address Type - "));
+DEBUG_EMAIL(("Address Type - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address1_transport, (char*));
+LIST_COPY(item->contact->address1_transport, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address1_transport));
+DEBUG_EMAIL(("%s\n", item->contact->address1_transport));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3003: // PR_EMAIL_ADDRESS
-	// Contact's email address
+// Contact's email address
-	DEBUG_EMAIL(("Contact Address - "));
+DEBUG_EMAIL(("Contact Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address1, (char*));
+LIST_COPY(item->contact->address1, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address1));
+DEBUG_EMAIL(("%s\n", item->contact->address1));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3004: // PR_COMMENT Comment for item - usually folders
-	DEBUG_EMAIL(("Comment - "));
+DEBUG_EMAIL(("Comment - "));
-	LIST_COPY(item->comment, (char*));
+LIST_COPY(item->comment, (char*));
-	DEBUG_EMAIL(("%s\n", item->comment));
+DEBUG_EMAIL(("%s\n", item->comment));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3007: // PR_CREATION_TIME Date 4 - Creation Date?
-	DEBUG_EMAIL(("Date 4 (Item Creation Date) - "));
+DEBUG_EMAIL(("Date 4 (Item Creation Date) - "));
-	LIST_COPY(item->create_date, (FILETIME*));
+LIST_COPY(item->create_date, (FILETIME*));
-	DEBUG_EMAIL(("%s", fileTimeToAscii(item->create_date)));
+DEBUG_EMAIL(("%s", fileTimeToAscii(item->create_date)));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3008: // PR_LAST_MODIFICATION_TIME Date 5 - Modify Date
-	DEBUG_EMAIL(("Date 5 (Modify Date) - "));
+DEBUG_EMAIL(("Date 5 (Modify Date) - "));
-	LIST_COPY(item->modify_date, (FILETIME*));
+LIST_COPY(item->modify_date, (FILETIME*));
-	DEBUG_EMAIL(("%s", fileTimeToAscii(item->modify_date)));
+DEBUG_EMAIL(("%s", fileTimeToAscii(item->modify_date)));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x300B: // PR_SEARCH_KEY Record Header 2
-	DEBUG_EMAIL(("Record Search 2 -- NOT HANDLED\n"));
+DEBUG_EMAIL(("Record Search 2 -- NOT HANDLED\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x35DF: // PR_VALID_FOLDER_MASK
-	// States which folders are valid for this message store
+// States which folders are valid for this message store
-	// FOLDER_IPM_SUBTREE_VALID 0x1
+// FOLDER_IPM_SUBTREE_VALID 0x1
-	// FOLDER_IPM_INBOX_VALID   0x2
+// FOLDER_IPM_INBOX_VALID   0x2
-	// FOLDER_IPM_OUTBOX_VALID  0x4
+// FOLDER_IPM_OUTBOX_VALID  0x4
-	// FOLDER_IPM_WASTEBOX_VALID 0x8
+// FOLDER_IPM_WASTEBOX_VALID 0x8
-	// FOLDER_IPM_SENTMAIL_VALID 0x10
+// FOLDER_IPM_SENTMAIL_VALID 0x10
-	// FOLDER_VIEWS_VALID        0x20
+// FOLDER_VIEWS_VALID        0x20
-	// FOLDER_COMMON_VIEWS_VALID 0x40
+// FOLDER_COMMON_VIEWS_VALID 0x40
-	// FOLDER_FINDER_VALID       0x80
+// FOLDER_FINDER_VALID       0x80
-	DEBUG_EMAIL(("Valid Folder Mask - "));
+DEBUG_EMAIL(("Valid Folder Mask - "));
-	MALLOC_MESSAGESTORE(item);
+MALLOC_MESSAGESTORE(item);
-	memcpy(&(item->message_store->valid_mask), list->items[x]->data, sizeof(int));
+memcpy(&(item->message_store->valid_mask), list->items[x]->data, sizeof(int));
-	LE32_CPU(item->message_store->valid_mask);
+LE32_CPU(item->message_store->valid_mask);
-	DEBUG_EMAIL(("%i\n", item->message_store->valid_mask));
+DEBUG_EMAIL(("%i\n", item->message_store->valid_mask));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x35E0: // PR_IPM_SUBTREE_ENTRYID Top of Personal Folder Record
-	DEBUG_EMAIL(("Top of Personal Folder Record - "));
+DEBUG_EMAIL(("Top of Personal Folder Record - "));
-	MALLOC_MESSAGESTORE(item);
+MALLOC_MESSAGESTORE(item);
-	LIST_COPY(item->message_store->top_of_personal_folder, (pst_entryid*));
+LIST_COPY(item->message_store->top_of_personal_folder, (pst_entryid*));
-	LE32_CPU(item->message_store->top_of_personal_folder->id);
+LE32_CPU(item->message_store->top_of_personal_folder->id);
-	DEBUG_EMAIL(("[id = %#x]\n", item->message_store->top_of_personal_folder->id));
+DEBUG_EMAIL(("[id = %#x]\n", item->message_store->top_of_personal_folder->id));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x35E3: // PR_IPM_WASTEBASKET_ENTRYID Deleted Items Folder Record
-	DEBUG_EMAIL(("Deleted Items Folder record - "));
+DEBUG_EMAIL(("Deleted Items Folder record - "));
-	MALLOC_MESSAGESTORE(item);
+MALLOC_MESSAGESTORE(item);
-	LIST_COPY(item->message_store->deleted_items_folder, (pst_entryid*));
+LIST_COPY(item->message_store->deleted_items_folder, (pst_entryid*));
-	LE32_CPU(item->message_store->deleted_items_folder->id);
+LE32_CPU(item->message_store->deleted_items_folder->id);
-	DEBUG_EMAIL(("[id = %#x]\n", item->message_store->deleted_items_folder->id));
+DEBUG_EMAIL(("[id = %#x]\n", item->message_store->deleted_items_folder->id));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x35E7: // PR_FINDER_ENTRYID Search Root Record
-	DEBUG_EMAIL(("Search Root record - "));
+DEBUG_EMAIL(("Search Root record - "));
-	MALLOC_MESSAGESTORE(item);
+MALLOC_MESSAGESTORE(item);
-	LIST_COPY(item->message_store->search_root_folder, (pst_entryid*));
+LIST_COPY(item->message_store->search_root_folder, (pst_entryid*));
-	LE32_CPU(item->message_store->search_root_folder->id);
+LE32_CPU(item->message_store->search_root_folder->id);
-	DEBUG_EMAIL(("[id = %#x]\n", item->message_store->search_root_folder->id));
+DEBUG_EMAIL(("[id = %#x]\n", item->message_store->search_root_folder->id));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3602: // PR_CONTENT_COUNT Number of emails stored in a folder
-	DEBUG_EMAIL(("Folder Email Count - "));
+DEBUG_EMAIL(("Folder Email Count - "));
-	MALLOC_FOLDER(item);
+MALLOC_FOLDER(item);
-	memcpy(&(item->folder->email_count), list->items[x]->data, sizeof(item->folder->email_count));
+memcpy(&(item->folder->email_count), list->items[x]->data, sizeof(item->folder->email_count));
-	LE32_CPU(item->folder->email_count);
+LE32_CPU(item->folder->email_count);
-	DEBUG_EMAIL(("%i\n", item->folder->email_count));
+DEBUG_EMAIL(("%i\n", item->folder->email_count));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3603: // PR_CONTENT_UNREAD Number of unread emails
-	DEBUG_EMAIL(("Unread Email Count - "));
+DEBUG_EMAIL(("Unread Email Count - "));
-	MALLOC_FOLDER(item);
+MALLOC_FOLDER(item);
-	memcpy(&(item->folder->unseen_email_count), list->items[x]->data, sizeof(item->folder->unseen_email_count));
+memcpy(&(item->folder->unseen_email_count), list->items[x]->data, sizeof(item->folder->unseen_email_count));
-	LE32_CPU(item->folder->unseen_email_count);
+LE32_CPU(item->folder->unseen_email_count);
-	DEBUG_EMAIL(("%i\n", item->folder->unseen_email_count));
+DEBUG_EMAIL(("%i\n", item->folder->unseen_email_count));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x360A: // PR_SUBFOLDERS Has children
-	DEBUG_EMAIL(("Has Subfolders - "));
+DEBUG_EMAIL(("Has Subfolders - "));
-	MALLOC_FOLDER(item);
+MALLOC_FOLDER(item);
-	if (*((int32_t*)list->items[x]->data) != 0) {
+if (*((int32_t*)list->items[x]->data) != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->folder->subfolder = 1;
+item->folder->subfolder = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->folder->subfolder = 0;
+item->folder->subfolder = 0;
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3613: // PR_CONTAINER_CLASS IPF.x
-	DEBUG_EMAIL(("IPF.x - "));
+DEBUG_EMAIL(("IPF.x - "));
-	LIST_COPY(item->ascii_type, (char*));
+LIST_COPY(item->ascii_type, (char*));
-	if (strncmp("IPF.Note", item->ascii_type, 8) == 0)
+if (strncmp("IPF.Note", item->ascii_type, 8) == 0)
-	  item->type = PST_TYPE_NOTE;
+item->type = PST_TYPE_NOTE;
-	else if (strncmp("IPF.Contact", item->ascii_type, 11) == 0)
+else if (strncmp("IPF.Contact", item->ascii_type, 11) == 0)
-	  item->type = PST_TYPE_CONTACT;
+item->type = PST_TYPE_CONTACT;
-	else if (strncmp("IPF.Journal", item->ascii_type, 11) == 0)
+else if (strncmp("IPF.Journal", item->ascii_type, 11) == 0)
-	  item->type = PST_TYPE_JOURNAL;
+item->type = PST_TYPE_JOURNAL;
-	else if (strncmp("IPF.Appointment", item->ascii_type, 15) == 0)
+else if (strncmp("IPF.Appointment", item->ascii_type, 15) == 0)
-	  item->type = PST_TYPE_APPOINTMENT;
+item->type = PST_TYPE_APPOINTMENT;
-	else if (strncmp("IPF.StickyNote", item->ascii_type, 14) == 0)
+else if (strncmp("IPF.StickyNote", item->ascii_type, 14) == 0)
-	  item->type = PST_TYPE_STICKYNOTE;
+item->type = PST_TYPE_STICKYNOTE;
-	else if (strncmp("IPF.Task", item->ascii_type, 8) == 0)
+else if (strncmp("IPF.Task", item->ascii_type, 8) == 0)
-	  item->type = PST_TYPE_TASK;
+item->type = PST_TYPE_TASK;
-	else
+else
-	  item->type = PST_TYPE_OTHER;
+item->type = PST_TYPE_OTHER;
-	DEBUG_EMAIL(("%s [%i]\n", item->ascii_type, item->type));
+DEBUG_EMAIL(("%s [%i]\n", item->ascii_type, item->type));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3617: // PR_ASSOC_CONTENT_COUNT
-	// associated content are items that are attached to this folder
+// associated content are items that are attached to this folder
-	// but are hidden from users
+// but are hidden from users
-	DEBUG_EMAIL(("Associate Content count - "));
+DEBUG_EMAIL(("Associate Content count - "));
-	MALLOC_FOLDER(item);
+MALLOC_FOLDER(item);
-	memcpy(&(item->folder->assoc_count), list->items[x]->data, sizeof(item->folder->assoc_count));
+memcpy(&(item->folder->assoc_count), list->items[x]->data, sizeof(item->folder->assoc_count));
-	LE32_CPU(item->folder->assoc_count);
+LE32_CPU(item->folder->assoc_count);
-	DEBUG_EMAIL(("%i [%#x]\n", item->folder->assoc_count, item->folder->assoc_count));
+DEBUG_EMAIL(("%i [%#x]\n", item->folder->assoc_count, item->folder->assoc_count));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3701: // PR_ATTACH_DATA_OBJ binary data of attachment
-	DEBUG_EMAIL(("Binary Data [Size %i] - ",
+DEBUG_EMAIL(("Binary Data [Size %i] - ",
-		    list->items[x]->size));
+list->items[x]->size));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	if (list->items[x]->data == NULL) { //special case
+if (list->items[x]->data == NULL) { //special case
-	  attach->id2_val = list->items[x]->type;
+attach->id2_val = list->items[x]->type;
-	  DEBUG_EMAIL(("Seen a Reference. The data hasn't been loaded yet. [%#x][%#x]\n",
+DEBUG_EMAIL(("Seen a Reference. The data hasn't been loaded yet. [%#x][%#x]\n",
-		       attach->id2_val, list->items[x]->type));
+attach->id2_val, list->items[x]->type));
-	} else {
+} else {
-	  LIST_COPY(attach->data, (char*));
+LIST_COPY(attach->data, (char*));
-	  attach->size = list->items[x]->size;
+attach->size = list->items[x]->size;
-	  DEBUG_EMAIL(("NOT PRINTED\n"));
+DEBUG_EMAIL(("NOT PRINTED\n"));
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3704: // PR_ATTACH_FILENAME Attachment filename (8.3)
-	DEBUG_EMAIL(("Attachment Filename - "));
+DEBUG_EMAIL(("Attachment Filename - "));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	LIST_COPY(attach->filename1, (char*));
+LIST_COPY(attach->filename1, (char*));
-	DEBUG_EMAIL(("%s\n", attach->filename1));
+DEBUG_EMAIL(("%s\n", attach->filename1));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3705: // PR_ATTACH_METHOD
-	// 0 - No Attachment
+// 0 - No Attachment
-	// 1 - Attach by Value
+// 1 - Attach by Value
-	// 2 - Attach by reference
+// 2 - Attach by reference
-	// 3 - Attach by ref resolve
+// 3 - Attach by ref resolve
-	// 4 - Attach by ref only
+// 4 - Attach by ref only
-	// 5 - Embedded Message
+// 5 - Embedded Message
-	// 6 - OLE
+// 6 - OLE
-	DEBUG_EMAIL(("Attachement method - "));
+DEBUG_EMAIL(("Attachement method - "));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	memcpy(&(attach->method), list->items[x]->data, sizeof(attach->method));
+memcpy(&(attach->method), list->items[x]->data, sizeof(attach->method));
-	LE32_CPU(attach->method);
+LE32_CPU(attach->method);
-	t = attach->method;
+t = attach->method;
-	DEBUG_EMAIL(("%s [%i]\n", (t==0?"No Attachment":
+DEBUG_EMAIL(("%s [%i]\n", (t==0?"No Attachment":
-				   (t==1?"Attach By Value":
+(t==1?"Attach By Value":
-				    (t==2?"Attach By Reference":
+(t==2?"Attach By Reference":
-				     (t==3?"Attach by Ref. Resolve":
+(t==3?"Attach by Ref. Resolve":
-				      (t==4?"Attach by Ref. Only":
+(t==4?"Attach by Ref. Only":
-				       (t==5?"Embedded Message":"OLE")))))),t));
+(t==5?"Embedded Message":"OLE")))))),t));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x370B: // PR_RENDERING_POSITION
-	// position in characters that the attachment appears in the plain text body
+// position in characters that the attachment appears in the plain text body
-	DEBUG_EMAIL(("Attachment Position - "));
+DEBUG_EMAIL(("Attachment Position - "));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	memcpy(&(attach->position), list->items[x]->data, sizeof(attach->position));
+memcpy(&(attach->position), list->items[x]->data, sizeof(attach->position));
-	LE32_CPU(attach->position);
+LE32_CPU(attach->position);
-	DEBUG_EMAIL(("%i [%#x]\n", attach->position));
+DEBUG_EMAIL(("%i [%#x]\n", attach->position));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3707: // PR_ATTACH_LONG_FILENAME Attachment filename (long?)
-	DEBUG_EMAIL(("Attachment Filename long - "));
+DEBUG_EMAIL(("Attachment Filename long - "));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	LIST_COPY(attach->filename2, (char*));
+LIST_COPY(attach->filename2, (char*));
-	DEBUG_EMAIL(("%s\n", attach->filename2));
+DEBUG_EMAIL(("%s\n", attach->filename2));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x370E: // PR_ATTACH_MIME_TAG Mime type of encoding
-	DEBUG_EMAIL(("Attachment mime encoding - "));
+DEBUG_EMAIL(("Attachment mime encoding - "));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	LIST_COPY(attach->mimetype, (char*));
+LIST_COPY(attach->mimetype, (char*));
-	DEBUG_EMAIL(("%s\n", attach->mimetype));
+DEBUG_EMAIL(("%s\n", attach->mimetype));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3710: // PR_ATTACH_MIME_SEQUENCE
-	// sequence number for mime parts. Includes body
+// sequence number for mime parts. Includes body
-	DEBUG_EMAIL(("Attachment Mime Sequence - "));
+DEBUG_EMAIL(("Attachment Mime Sequence - "));
-	NULL_CHECK(attach);
+NULL_CHECK(attach);
-	MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	memcpy(&(attach->sequence), list->items[x]->data, sizeof(attach->sequence));
+memcpy(&(attach->sequence), list->items[x]->data, sizeof(attach->sequence));
-	LE32_CPU(attach->sequence);
+LE32_CPU(attach->sequence);
-	DEBUG_EMAIL(("%i\n", attach->sequence));
+DEBUG_EMAIL(("%i\n", attach->sequence));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3A00: // PR_ACCOUNT
-	DEBUG_EMAIL(("Contact's Account name - "));
+DEBUG_EMAIL(("Contact's Account name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->account_name, (char*));
+LIST_COPY(item->contact->account_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->account_name));
+DEBUG_EMAIL(("%s\n", item->contact->account_name));
-	break;
+break;
 case 0x3A01: // PR_ALTERNATE_RECIPIENT
-	DEBUG_EMAIL(("Contact Alternate Recipient - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Contact Alternate Recipient - NOT PROCESSED\n"));
-	break;
+break;
 case 0x3A02: // PR_CALLBACK_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Callback telephone number - "));
+DEBUG_EMAIL(("Callback telephone number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->callback_phone, (char*));
+LIST_COPY(item->contact->callback_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->callback_phone));
+DEBUG_EMAIL(("%s\n", item->contact->callback_phone));
-	break;
+break;
 case 0x3A03: // PR_CONVERSION_PROHIBITED
-	DEBUG_EMAIL(("Message Conversion Prohibited - "));
+DEBUG_EMAIL(("Message Conversion Prohibited - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->email->conversion_prohib = 1;
+item->email->conversion_prohib = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->email->conversion_prohib = 0;
+item->email->conversion_prohib = 0;
-	}
+}
-	break;
+break;
 case 0x3A05: // PR_GENERATION suffix
-	DEBUG_EMAIL(("Contacts Suffix - "));
+DEBUG_EMAIL(("Contacts Suffix - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->suffix, (char*));
+LIST_COPY(item->contact->suffix, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->suffix));
+DEBUG_EMAIL(("%s\n", item->contact->suffix));
-	break;
+break;
 case 0x3A06: // PR_GIVEN_NAME Contact's first name
-	DEBUG_EMAIL(("Contacts First Name - "));
+DEBUG_EMAIL(("Contacts First Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->first_name, (char*));
+LIST_COPY(item->contact->first_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->first_name));
+DEBUG_EMAIL(("%s\n", item->contact->first_name));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3A07: // PR_GOVERNMENT_ID_NUMBER
-	DEBUG_EMAIL(("Contacts Government ID Number - "));
+DEBUG_EMAIL(("Contacts Government ID Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->gov_id, (char*));
+LIST_COPY(item->contact->gov_id, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->gov_id));
+DEBUG_EMAIL(("%s\n", item->contact->gov_id));
-	break;
+break;
 case 0x3A08: // PR_BUSINESS_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Business Telephone Number - "));
+DEBUG_EMAIL(("Business Telephone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_phone, (char*));
+LIST_COPY(item->contact->business_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_phone));
+DEBUG_EMAIL(("%s\n", item->contact->business_phone));
-	break;
+break;
 case 0x3A09: // PR_HOME_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Home Telephone Number - "));
+DEBUG_EMAIL(("Home Telephone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_phone, (char*));
+LIST_COPY(item->contact->home_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_phone));
+DEBUG_EMAIL(("%s\n", item->contact->home_phone));
-	break;
+break;
 case 0x3A0A: // PR_INITIALS Contact's Initials
-	DEBUG_EMAIL(("Contacts Initials - "));
+DEBUG_EMAIL(("Contacts Initials - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->initials, (char*));
+LIST_COPY(item->contact->initials, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->initials));
+DEBUG_EMAIL(("%s\n", item->contact->initials));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3A0B: // PR_KEYWORD
-	DEBUG_EMAIL(("Keyword - "));
+DEBUG_EMAIL(("Keyword - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->keyword, (char*));
+LIST_COPY(item->contact->keyword, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->keyword));
+DEBUG_EMAIL(("%s\n", item->contact->keyword));
-	break;
+break;
 case 0x3A0C: // PR_LANGUAGE
-	DEBUG_EMAIL(("Contact's Language - "));
+DEBUG_EMAIL(("Contact's Language - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->language, (char*));
+LIST_COPY(item->contact->language, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->language));
+DEBUG_EMAIL(("%s\n", item->contact->language));
-	break;
+break;
 case 0x3A0D: // PR_LOCATION
-	DEBUG_EMAIL(("Contact's Location - "));
+DEBUG_EMAIL(("Contact's Location - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->location, (char*));
+LIST_COPY(item->contact->location, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->location));
+DEBUG_EMAIL(("%s\n", item->contact->location));
-	break;
+break;
 case 0x3A0E: // PR_MAIL_PERMISSION - Can the recipient receive and send email
-	DEBUG_EMAIL(("Mail Permission - "));
+DEBUG_EMAIL(("Mail Permission - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	if (*(int16_t*)list->items[x]->data != 0) {
+if (*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->contact->mail_permission = 1;
+item->contact->mail_permission = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->contact->mail_permission = 0;
+item->contact->mail_permission = 0;
-	}
+}
-	break;
+break;
 case 0x3A0F: // PR_MHS_COMMON_NAME
-	DEBUG_EMAIL(("MHS Common Name - "));
+DEBUG_EMAIL(("MHS Common Name - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->common_name, (char*));
+LIST_COPY(item->email->common_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->email->common_name));
+DEBUG_EMAIL(("%s\n", item->email->common_name));
-	break;
+break;
 case 0x3A10: // PR_ORGANIZATIONAL_ID_NUMBER
-	DEBUG_EMAIL(("Organizational ID # - "));
+DEBUG_EMAIL(("Organizational ID # - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->org_id, (char*));
+LIST_COPY(item->contact->org_id, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->org_id));
+DEBUG_EMAIL(("%s\n", item->contact->org_id));
-	break;
+break;
 case 0x3A11: // PR_SURNAME Contact's Surname
-	DEBUG_EMAIL(("Contacts Surname - "));
+DEBUG_EMAIL(("Contacts Surname - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->surname, (char*));
+LIST_COPY(item->contact->surname, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->surname));
+DEBUG_EMAIL(("%s\n", item->contact->surname));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x3A12: // PR_ORIGINAL_ENTRY_ID
-	DEBUG_EMAIL(("Original Entry ID - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Original Entry ID - NOT PROCESSED\n"));
-	break;
+break;
 case 0x3A13: // PR_ORIGINAL_DISPLAY_NAME
-	DEBUG_EMAIL(("Original Display Name - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Original Display Name - NOT PROCESSED\n"));
-	break;
+break;
 case 0x3A14: // PR_ORIGINAL_SEARCH_KEY
-	DEBUG_EMAIL(("Original Search Key - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Original Search Key - NOT PROCESSED\n"));
-	break;
+break;
 case 0x3A15: // PR_POSTAL_ADDRESS
-	DEBUG_EMAIL(("Default Postal Address - "));
+DEBUG_EMAIL(("Default Postal Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->def_postal_address, (char*));
+LIST_COPY(item->contact->def_postal_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->def_postal_address));
+DEBUG_EMAIL(("%s\n", item->contact->def_postal_address));
-	break;
+break;
 case 0x3A16: // PR_COMPANY_NAME
-	DEBUG_EMAIL(("Company Name - "));
+DEBUG_EMAIL(("Company Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->company_name, (char*));
+LIST_COPY(item->contact->company_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->company_name));
+DEBUG_EMAIL(("%s\n", item->contact->company_name));
-	break;
+break;
 case 0x3A17: // PR_TITLE - Job Title
-	DEBUG_EMAIL(("Job Title - "));
+DEBUG_EMAIL(("Job Title - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->job_title, (char*));
+LIST_COPY(item->contact->job_title, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->job_title));
+DEBUG_EMAIL(("%s\n", item->contact->job_title));
-	break;
+break;
 case 0x3A18: // PR_DEPARTMENT_NAME
-	DEBUG_EMAIL(("Department Name - "));
+DEBUG_EMAIL(("Department Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->department, (char*));
+LIST_COPY(item->contact->department, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->department));
+DEBUG_EMAIL(("%s\n", item->contact->department));
-	break;
+break;
 case 0x3A19: // PR_OFFICE_LOCATION
-	DEBUG_EMAIL(("Office Location - "));
+DEBUG_EMAIL(("Office Location - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->office_loc, (char*));
+LIST_COPY(item->contact->office_loc, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->office_loc));
+DEBUG_EMAIL(("%s\n", item->contact->office_loc));
-	break;
+break;
 case 0x3A1A: // PR_PRIMARY_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Primary Telephone - "));
+DEBUG_EMAIL(("Primary Telephone - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->primary_phone, (char*));
+LIST_COPY(item->contact->primary_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->primary_phone));
+DEBUG_EMAIL(("%s\n", item->contact->primary_phone));
-	break;
+break;
 case 0x3A1B: // PR_BUSINESS2_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Business Phone Number 2 - "));
+DEBUG_EMAIL(("Business Phone Number 2 - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_phone2, (char*));
+LIST_COPY(item->contact->business_phone2, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_phone2));
+DEBUG_EMAIL(("%s\n", item->contact->business_phone2));
-	break;
+break;
 case 0x3A1C: // PR_MOBILE_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Mobile Phone Number - "));
+DEBUG_EMAIL(("Mobile Phone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->mobile_phone, (char*));
+LIST_COPY(item->contact->mobile_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->mobile_phone));
+DEBUG_EMAIL(("%s\n", item->contact->mobile_phone));
-	break;
+break;
 case 0x3A1D: // PR_RADIO_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Radio Phone Number - "));
+DEBUG_EMAIL(("Radio Phone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->radio_phone, (char*));
+LIST_COPY(item->contact->radio_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->radio_phone));
+DEBUG_EMAIL(("%s\n", item->contact->radio_phone));
-	break;
+break;
 case 0x3A1E: // PR_CAR_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Car Phone Number - "));
+DEBUG_EMAIL(("Car Phone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->car_phone, (char*));
+LIST_COPY(item->contact->car_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->car_phone));
+DEBUG_EMAIL(("%s\n", item->contact->car_phone));
-	break;
+break;
 case 0x3A1F: // PR_OTHER_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Other Phone Number - "));
+DEBUG_EMAIL(("Other Phone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_phone, (char*));
+LIST_COPY(item->contact->other_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_phone));
+DEBUG_EMAIL(("%s\n", item->contact->other_phone));
-	break;
+break;
 case 0x3A20: // PR_TRANSMITTABLE_DISPLAY_NAME
-	DEBUG_EMAIL(("Transmittable Display Name - "));
+DEBUG_EMAIL(("Transmittable Display Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->transmittable_display_name, (char*));
+LIST_COPY(item->contact->transmittable_display_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->transmittable_display_name));
+DEBUG_EMAIL(("%s\n", item->contact->transmittable_display_name));
-	break;
+break;
 case 0x3A21: // PR_PAGER_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Pager Phone Number - "));
+DEBUG_EMAIL(("Pager Phone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->pager_phone, (char*));
+LIST_COPY(item->contact->pager_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->pager_phone));
+DEBUG_EMAIL(("%s\n", item->contact->pager_phone));
-	break;
+break;
 case 0x3A22: // PR_USER_CERTIFICATE
-	DEBUG_EMAIL(("User Certificate - NOT PROCESSED"));
+DEBUG_EMAIL(("User Certificate - NOT PROCESSED"));
-	break;
+break;
 case 0x3A23: // PR_PRIMARY_FAX_NUMBER
-	DEBUG_EMAIL(("Primary Fax Number - "));
+DEBUG_EMAIL(("Primary Fax Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->primary_fax, (char*));
+LIST_COPY(item->contact->primary_fax, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->primary_fax));
+DEBUG_EMAIL(("%s\n", item->contact->primary_fax));
-	break;
+break;
 case 0x3A24: // PR_BUSINESS_FAX_NUMBER
-	DEBUG_EMAIL(("Business Fax Number - "));
+DEBUG_EMAIL(("Business Fax Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_fax, (char*));
+LIST_COPY(item->contact->business_fax, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_fax));
+DEBUG_EMAIL(("%s\n", item->contact->business_fax));
-	break;
+break;
 case 0x3A25: // PR_HOME_FAX_NUMBER
-	DEBUG_EMAIL(("Home Fax Number - "));
+DEBUG_EMAIL(("Home Fax Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_fax, (char*));
+LIST_COPY(item->contact->home_fax, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_fax));
+DEBUG_EMAIL(("%s\n", item->contact->home_fax));
-	break;
+break;
 case 0x3A26: // PR_BUSINESS_ADDRESS_COUNTRY
-	DEBUG_EMAIL(("Business Address Country - "));
+DEBUG_EMAIL(("Business Address Country - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_country, (char*));
+LIST_COPY(item->contact->business_country, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_country));
+DEBUG_EMAIL(("%s\n", item->contact->business_country));
-	break;
+break;
 case 0x3A27: // PR_BUSINESS_ADDRESS_CITY
-	DEBUG_EMAIL(("Business Address City - "));
+DEBUG_EMAIL(("Business Address City - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_city, (char*));
+LIST_COPY(item->contact->business_city, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_city));
+DEBUG_EMAIL(("%s\n", item->contact->business_city));
-	break;
+break;
 case 0x3A28: // PR_BUSINESS_ADDRESS_STATE_OR_PROVINCE
-	DEBUG_EMAIL(("Business Address State - "));
+DEBUG_EMAIL(("Business Address State - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_state, (char*));
+LIST_COPY(item->contact->business_state, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_state));
+DEBUG_EMAIL(("%s\n", item->contact->business_state));
-	break;
+break;
 case 0x3A29: // PR_BUSINESS_ADDRESS_STREET
-	DEBUG_EMAIL(("Business Address Street - "));
+DEBUG_EMAIL(("Business Address Street - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_street, (char*));
+LIST_COPY(item->contact->business_street, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_street));
+DEBUG_EMAIL(("%s\n", item->contact->business_street));
-	break;
+break;
 case 0x3A2A: // PR_BUSINESS_POSTAL_CODE
-	DEBUG_EMAIL(("Business Postal Code - "));
+DEBUG_EMAIL(("Business Postal Code - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_postal_code, (char*));
+LIST_COPY(item->contact->business_postal_code, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_postal_code));
+DEBUG_EMAIL(("%s\n", item->contact->business_postal_code));
-	break;
+break;
 case 0x3A2B: // PR_BUSINESS_PO_BOX
-	DEBUG_EMAIL(("Business PO Box - "));
+DEBUG_EMAIL(("Business PO Box - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_po_box, (char*));
+LIST_COPY(item->contact->business_po_box, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_po_box));
+DEBUG_EMAIL(("%s\n", item->contact->business_po_box));
-	break;
+break;
 case 0x3A2C: // PR_TELEX_NUMBER
-	DEBUG_EMAIL(("Telex Number - "));
+DEBUG_EMAIL(("Telex Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->telex, (char*));
+LIST_COPY(item->contact->telex, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->telex));
+DEBUG_EMAIL(("%s\n", item->contact->telex));
-	break;
+break;
 case 0x3A2D: // PR_ISDN_NUMBER
-	DEBUG_EMAIL(("ISDN Number - "));
+DEBUG_EMAIL(("ISDN Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->isdn_phone, (char*));
+LIST_COPY(item->contact->isdn_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->isdn_phone));
+DEBUG_EMAIL(("%s\n", item->contact->isdn_phone));
-	break;
+break;
 case 0x3A2E: // PR_ASSISTANT_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Assistant Phone Number - "));
+DEBUG_EMAIL(("Assistant Phone Number - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->assistant_phone, (char*));
+LIST_COPY(item->contact->assistant_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->assistant_phone));
+DEBUG_EMAIL(("%s\n", item->contact->assistant_phone));
-	break;
+break;
 case 0x3A2F: // PR_HOME2_TELEPHONE_NUMBER
-	DEBUG_EMAIL(("Home Phone 2 - "));
+DEBUG_EMAIL(("Home Phone 2 - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_phone2, (char*));
+LIST_COPY(item->contact->home_phone2, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_phone2));
+DEBUG_EMAIL(("%s\n", item->contact->home_phone2));
-	break;
+break;
 case 0x3A30: // PR_ASSISTANT
-	DEBUG_EMAIL(("Assistant's Name - "));
+DEBUG_EMAIL(("Assistant's Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->assistant_name, (char*));
+LIST_COPY(item->contact->assistant_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->assistant_name));
+DEBUG_EMAIL(("%s\n", item->contact->assistant_name));
-	break;
+break;
 case 0x3A40: // PR_SEND_RICH_INFO
-	DEBUG_EMAIL(("Can receive Rich Text - "));
+DEBUG_EMAIL(("Can receive Rich Text - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	if(*(int16_t*)list->items[x]->data != 0) {
+if(*(int16_t*)list->items[x]->data != 0) {
-	  DEBUG_EMAIL(("True\n"));
+DEBUG_EMAIL(("True\n"));
-	  item->contact->rich_text = 1;
+item->contact->rich_text = 1;
-	} else {
+} else {
-	  DEBUG_EMAIL(("False\n"));
+DEBUG_EMAIL(("False\n"));
-	  item->contact->rich_text = 0;
+item->contact->rich_text = 0;
-	}
+}
-	break;
+break;
 case 0x3A41: // PR_WEDDING_ANNIVERSARY
-	DEBUG_EMAIL(("Wedding Anniversary - "));
+DEBUG_EMAIL(("Wedding Anniversary - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->wedding_anniversary, (FILETIME*));
+LIST_COPY(item->contact->wedding_anniversary, (FILETIME*));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->contact->wedding_anniversary)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->contact->wedding_anniversary)));
-	break;
+break;
 case 0x3A42: // PR_BIRTHDAY
-	DEBUG_EMAIL(("Birthday - "));
+DEBUG_EMAIL(("Birthday - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->birthday, (FILETIME*));
+LIST_COPY(item->contact->birthday, (FILETIME*));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->contact->birthday)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->contact->birthday)));
-	break;
+break;
 case 0x3A43: // PR_HOBBIES
-	DEBUG_EMAIL(("Hobbies - "));
+DEBUG_EMAIL(("Hobbies - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->hobbies, (char*));
+LIST_COPY(item->contact->hobbies, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->hobbies));
+DEBUG_EMAIL(("%s\n", item->contact->hobbies));
-	break;
+break;
 case 0x3A44: // PR_MIDDLE_NAME
-	DEBUG_EMAIL(("Middle Name - "));
+DEBUG_EMAIL(("Middle Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->middle_name, (char*));
+LIST_COPY(item->contact->middle_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->middle_name));
+DEBUG_EMAIL(("%s\n", item->contact->middle_name));
-	break;
+break;
 case 0x3A45: // PR_DISPLAY_NAME_PREFIX
-	DEBUG_EMAIL(("Display Name Prefix (Title) - "));
+DEBUG_EMAIL(("Display Name Prefix (Title) - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->display_name_prefix, (char*));
+LIST_COPY(item->contact->display_name_prefix, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->display_name_prefix));
+DEBUG_EMAIL(("%s\n", item->contact->display_name_prefix));
-	break;
+break;
 case 0x3A46: // PR_PROFESSION
-	DEBUG_EMAIL(("Profession - "));
+DEBUG_EMAIL(("Profession - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->profession, (char*));
+LIST_COPY(item->contact->profession, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->profession));
+DEBUG_EMAIL(("%s\n", item->contact->profession));
-	break;
+break;
 case 0x3A47: // PR_PREFERRED_BY_NAME
-	DEBUG_EMAIL(("Preferred By Name - "));
+DEBUG_EMAIL(("Preferred By Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->pref_name, (char*));
+LIST_COPY(item->contact->pref_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->pref_name));
+DEBUG_EMAIL(("%s\n", item->contact->pref_name));
-	break;
+break;
 case 0x3A48: // PR_SPOUSE_NAME
-	DEBUG_EMAIL(("Spouse's Name - "));
+DEBUG_EMAIL(("Spouse's Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->spouse_name, (char*));
+LIST_COPY(item->contact->spouse_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->spouse_name));
+DEBUG_EMAIL(("%s\n", item->contact->spouse_name));
-	break;
+break;
 case 0x3A49: // PR_COMPUTER_NETWORK_NAME
-	DEBUG_EMAIL(("Computer Network Name - "));
+DEBUG_EMAIL(("Computer Network Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->computer_name, (char*));
+LIST_COPY(item->contact->computer_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->computer_name));
+DEBUG_EMAIL(("%s\n", item->contact->computer_name));
-	break;
+break;
 case 0x3A4A: // PR_CUSTOMER_ID
-	DEBUG_EMAIL(("Customer ID - "));
+DEBUG_EMAIL(("Customer ID - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->customer_id, (char*));
+LIST_COPY(item->contact->customer_id, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->customer_id));
+DEBUG_EMAIL(("%s\n", item->contact->customer_id));
-	break;
+break;
 case 0x3A4B: // PR_TTYTDD_PHONE_NUMBER
-	DEBUG_EMAIL(("TTY/TDD Phone - "));
+DEBUG_EMAIL(("TTY/TDD Phone - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->ttytdd_phone, (char*));
+LIST_COPY(item->contact->ttytdd_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->ttytdd_phone));
+DEBUG_EMAIL(("%s\n", item->contact->ttytdd_phone));
-	break;
+break;
 case 0x3A4C: // PR_FTP_SITE
-	DEBUG_EMAIL(("Ftp Site - "));
+DEBUG_EMAIL(("Ftp Site - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->ftp_site, (char*));
+LIST_COPY(item->contact->ftp_site, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->ftp_site));
+DEBUG_EMAIL(("%s\n", item->contact->ftp_site));
-	break;
+break;
 case 0x3A4D: // PR_GENDER
-	DEBUG_EMAIL(("Gender - "));
+DEBUG_EMAIL(("Gender - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	memcpy(&item->contact->gender, list->items[x]->data, sizeof(int16_t));
+memcpy(&item->contact->gender, list->items[x]->data, sizeof(int16_t));
-	LE16_CPU(item->contact->gender);
+LE16_CPU(item->contact->gender);
-	switch(item->contact->gender) {
+switch(item->contact->gender) {
-	case 0:
+case 0:
-	  DEBUG_EMAIL(("Unspecified\n"));
+DEBUG_EMAIL(("Unspecified\n"));
-	  break;
+break;
-	case 1:
+case 1:
-	  DEBUG_EMAIL(("Female\n"));
+DEBUG_EMAIL(("Female\n"));
-	  break;
+break;
-	case 2:
+case 2:
-	  DEBUG_EMAIL(("Male\n"));
+DEBUG_EMAIL(("Male\n"));
-	  break;
+break;
-	default:
+default:
-	  DEBUG_EMAIL(("Error processing\n"));
+DEBUG_EMAIL(("Error processing\n"));
-	}
+}
-	break;
+break;
 case 0x3A4E: // PR_MANAGER_NAME
-	DEBUG_EMAIL(("Manager's Name - "));
+DEBUG_EMAIL(("Manager's Name - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->manager_name, (char*));
+LIST_COPY(item->contact->manager_name, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->manager_name));
+DEBUG_EMAIL(("%s\n", item->contact->manager_name));
-	break;
+break;
 case 0x3A4F: // PR_NICKNAME
-	DEBUG_EMAIL(("Nickname - "));
+DEBUG_EMAIL(("Nickname - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->nickname, (char*));
+LIST_COPY(item->contact->nickname, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->nickname));
+DEBUG_EMAIL(("%s\n", item->contact->nickname));
-	break;
+break;
 case 0x3A50: // PR_PERSONAL_HOME_PAGE
-	DEBUG_EMAIL(("Personal Home Page - "));
+DEBUG_EMAIL(("Personal Home Page - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->personal_homepage, (char*));
+LIST_COPY(item->contact->personal_homepage, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->personal_homepage));
+DEBUG_EMAIL(("%s\n", item->contact->personal_homepage));
-	break;
+break;
 case 0x3A51: // PR_BUSINESS_HOME_PAGE
-	DEBUG_EMAIL(("Business Home Page - "));
+DEBUG_EMAIL(("Business Home Page - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_homepage, (char*));
+LIST_COPY(item->contact->business_homepage, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_homepage));
+DEBUG_EMAIL(("%s\n", item->contact->business_homepage));
-	break;
+break;
 case 0x3A57: // PR_COMPANY_MAIN_PHONE_NUMBER
-	DEBUG_EMAIL(("Company Main Phone - "));
+DEBUG_EMAIL(("Company Main Phone - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->company_main_phone, (char*));
+LIST_COPY(item->contact->company_main_phone, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->company_main_phone));
+DEBUG_EMAIL(("%s\n", item->contact->company_main_phone));
-	break;
+break;
 case 0x3A58: // PR_CHILDRENS_NAMES
-	DEBUG_EMAIL(("Children's Names - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Children's Names - NOT PROCESSED\n"));
-	break;
+break;
 case 0x3A59: // PR_HOME_ADDRESS_CITY
-	DEBUG_EMAIL(("Home Address City - "));
+DEBUG_EMAIL(("Home Address City - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_city, (char*));
+LIST_COPY(item->contact->home_city, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_city));
+DEBUG_EMAIL(("%s\n", item->contact->home_city));
-	break;
+break;
 case 0x3A5A: // PR_HOME_ADDRESS_COUNTRY
-	DEBUG_EMAIL(("Home Address Country - "));
+DEBUG_EMAIL(("Home Address Country - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_country, (char*));
+LIST_COPY(item->contact->home_country, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_country));
+DEBUG_EMAIL(("%s\n", item->contact->home_country));
-	break;
+break;
 case 0x3A5B: // PR_HOME_ADDRESS_POSTAL_CODE
-	DEBUG_EMAIL(("Home Address Postal Code - "));
+DEBUG_EMAIL(("Home Address Postal Code - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_postal_code, (char*));
+LIST_COPY(item->contact->home_postal_code, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_postal_code));
+DEBUG_EMAIL(("%s\n", item->contact->home_postal_code));
-	break;
+break;
 case 0x3A5C: // PR_HOME_ADDRESS_STATE_OR_PROVINCE
-	DEBUG_EMAIL(("Home Address State or Province - "));
+DEBUG_EMAIL(("Home Address State or Province - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_state, (char*));
+LIST_COPY(item->contact->home_state, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_state));
+DEBUG_EMAIL(("%s\n", item->contact->home_state));
-	break;
+break;
 case 0x3A5D: // PR_HOME_ADDRESS_STREET
-	DEBUG_EMAIL(("Home Address Street - "));
+DEBUG_EMAIL(("Home Address Street - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_street, (char*));
+LIST_COPY(item->contact->home_street, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_street));
+DEBUG_EMAIL(("%s\n", item->contact->home_street));
-	break;
+break;
 case 0x3A5E: // PR_HOME_ADDRESS_POST_OFFICE_BOX
-	DEBUG_EMAIL(("Home Address Post Office Box - "));
+DEBUG_EMAIL(("Home Address Post Office Box - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_po_box, (char*));
+LIST_COPY(item->contact->home_po_box, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_po_box));
+DEBUG_EMAIL(("%s\n", item->contact->home_po_box));
-	break;
+break;
 case 0x3A5F: // PR_OTHER_ADDRESS_CITY
-	DEBUG_EMAIL(("Other Address City - "));
+DEBUG_EMAIL(("Other Address City - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_city, (char*));
+LIST_COPY(item->contact->other_city, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_city));
+DEBUG_EMAIL(("%s\n", item->contact->other_city));
-	break;
+break;
 case 0x3A60: // PR_OTHER_ADDRESS_COUNTRY
-	DEBUG_EMAIL(("Other Address Country - "));
+DEBUG_EMAIL(("Other Address Country - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_country, (char*));
+LIST_COPY(item->contact->other_country, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_country));
+DEBUG_EMAIL(("%s\n", item->contact->other_country));
-	break;
+break;
 case 0x3A61: // PR_OTHER_ADDRESS_POSTAL_CODE
-	DEBUG_EMAIL(("Other Address Postal Code - "));
+DEBUG_EMAIL(("Other Address Postal Code - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_postal_code, (char*));
+LIST_COPY(item->contact->other_postal_code, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_postal_code));
+DEBUG_EMAIL(("%s\n", item->contact->other_postal_code));
-	break;
+break;
 case 0x3A62: // PR_OTHER_ADDRESS_STATE_OR_PROVINCE
-	DEBUG_EMAIL(("Other Address State - "));
+DEBUG_EMAIL(("Other Address State - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_state, (char*));
+LIST_COPY(item->contact->other_state, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_state));
+DEBUG_EMAIL(("%s\n", item->contact->other_state));
-	break;
+break;
 case 0x3A63: // PR_OTHER_ADDRESS_STREET
-	DEBUG_EMAIL(("Other Address Street - "));
+DEBUG_EMAIL(("Other Address Street - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_street, (char*));
+LIST_COPY(item->contact->other_street, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_street));
+DEBUG_EMAIL(("%s\n", item->contact->other_street));
-	break;
+break;
 case 0x3A64: // PR_OTHER_ADDRESS_POST_OFFICE_BOX
-	DEBUG_EMAIL(("Other Address Post Office box - "));
+DEBUG_EMAIL(("Other Address Post Office box - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_po_box, (char*));
+LIST_COPY(item->contact->other_po_box, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_po_box));
+DEBUG_EMAIL(("%s\n", item->contact->other_po_box));
-	break;
+break;
 case 0x65E3: // Entry ID?
-	DEBUG_EMAIL(("Entry ID - "));
+DEBUG_EMAIL(("Entry ID - "));
-	item->record_key = (char*) xmalloc(16+1);
+item->record_key = (char*) xmalloc(16+1);
-	memcpy(item->record_key, &(list->items[x]->data[1]), 16); //skip first byte
+memcpy(item->record_key, &(list->items[x]->data[1]), 16); //skip first byte
-	item->record_key[16]='\0';
+item->record_key[16]='\0';
-	item->record_key_size=16;
+item->record_key_size=16;
-	DEBUG_EMAIL_HEXPRINT((char*)item->record_key, 16);
+DEBUG_EMAIL_HEXPRINT((char*)item->record_key, 16);
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x67F2: // ID2 value of the attachments proper record
-	DEBUG_EMAIL(("Attachment ID2 value - "));
+DEBUG_EMAIL(("Attachment ID2 value - "));
-	if (attach != NULL){
+if (attach != NULL){
-	  MOVE_NEXT(attach);
+MOVE_NEXT(attach);
-	  memcpy(&(attach->id2_val), list->items[x]->data, sizeof(attach->id2_val));
+memcpy(&(attach->id2_val), list->items[x]->data, sizeof(attach->id2_val));
-	  LE32_CPU(attach->id2_val);
+LE32_CPU(attach->id2_val);
-	  DEBUG_EMAIL(("%#x\n", attach->id2_val));
+DEBUG_EMAIL(("%#x\n", attach->id2_val));
-	} else {
+} else {
-	  DEBUG_EMAIL(("NOT AN ATTACHMENT: %#x\n", list->items[x]->id));
+DEBUG_EMAIL(("NOT AN ATTACHMENT: %#x\n", list->items[x]->id));
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x67FF: // Extra Property Identifier (Password CheckSum)
-	DEBUG_EMAIL(("Password checksum [0x67FF] - "));
+DEBUG_EMAIL(("Password checksum [0x67FF] - "));
-	MALLOC_MESSAGESTORE(item);
+MALLOC_MESSAGESTORE(item);
-	memcpy(&(item->message_store->pwd_chksum), list->items[x]->data,
+memcpy(&(item->message_store->pwd_chksum), list->items[x]->data,
-	       sizeof(item->message_store->pwd_chksum));
+sizeof(item->message_store->pwd_chksum));
-	DEBUG_EMAIL(("%#x\n", item->message_store->pwd_chksum));
+DEBUG_EMAIL(("%#x\n", item->message_store->pwd_chksum));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x6F02: // Secure HTML Body
-	DEBUG_EMAIL(("Secure HTML Body - "));
+DEBUG_EMAIL(("Secure HTML Body - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->encrypted_htmlbody, (char*));
+LIST_COPY(item->email->encrypted_htmlbody, (char*));
-	item->email->encrypted_htmlbody_size = list->items[x]->size;
+item->email->encrypted_htmlbody_size = list->items[x]->size;
-	DEBUG_EMAIL(("Not Printed\n"));
+DEBUG_EMAIL(("Not Printed\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x6F04: // Secure Text Body
-	DEBUG_EMAIL(("Secure Text Body - "));
+DEBUG_EMAIL(("Secure Text Body - "));
-	MALLOC_EMAIL(item);
+MALLOC_EMAIL(item);
-	LIST_COPY(item->email->encrypted_body, (char*));
+LIST_COPY(item->email->encrypted_body, (char*));
-	item->email->encrypted_body_size = list->items[x]->size;
+item->email->encrypted_body_size = list->items[x]->size;
-	DEBUG_EMAIL(("Not Printed\n"));
+DEBUG_EMAIL(("Not Printed\n"));
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x7C07: // top of folders ENTRYID
-	DEBUG_EMAIL(("Top of folders RecID [0x7c07] - "));
+DEBUG_EMAIL(("Top of folders RecID [0x7c07] - "));
-	MALLOC_MESSAGESTORE(item);
+MALLOC_MESSAGESTORE(item);
-	item->message_store->top_of_folder = (pst_entryid*) xmalloc(sizeof(pst_entryid));
+item->message_store->top_of_folder = (pst_entryid*) xmalloc(sizeof(pst_entryid));
-	memcpy(item->message_store->top_of_folder, list->items[x]->data, sizeof(pst_entryid));
+memcpy(item->message_store->top_of_folder, list->items[x]->data, sizeof(pst_entryid));
-	LE32_CPU(item->message_store->top_of_folder->u1);
+LE32_CPU(item->message_store->top_of_folder->u1);
-	LE32_CPU(item->message_store->top_of_folder->id);
+LE32_CPU(item->message_store->top_of_folder->id);
-	DEBUG_EMAIL_HEXPRINT((char*)item->message_store->top_of_folder->entryid, 16);
+DEBUG_EMAIL_HEXPRINT((char*)item->message_store->top_of_folder->entryid, 16);
-	//INC_CHECK_X();
+//INC_CHECK_X();
-	break;
+break;
 case 0x8005: // Contact's Fullname
-	DEBUG_EMAIL(("Contact Fullname - "));
+DEBUG_EMAIL(("Contact Fullname - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->fullname, (char*));
+LIST_COPY(item->contact->fullname, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->fullname));
+DEBUG_EMAIL(("%s\n", item->contact->fullname));
-	break;
+break;
 case 0x801A: // Full Home Address
-	DEBUG_EMAIL(("Home Address - "));
+DEBUG_EMAIL(("Home Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->home_address, (char*));
+LIST_COPY(item->contact->home_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->home_address));
+DEBUG_EMAIL(("%s\n", item->contact->home_address));
-	break;
+break;
 case 0x801B: // Full Business Address
-	DEBUG_EMAIL(("Business Address - "));
+DEBUG_EMAIL(("Business Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->business_address, (char*));
+LIST_COPY(item->contact->business_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->business_address));
+DEBUG_EMAIL(("%s\n", item->contact->business_address));
-	break;
+break;
 case 0x801C: // Full Other Address
-	DEBUG_EMAIL(("Other Address - "));
+DEBUG_EMAIL(("Other Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->other_address, (char*));
+LIST_COPY(item->contact->other_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->other_address));
+DEBUG_EMAIL(("%s\n", item->contact->other_address));
-	break;
+break;
 case 0x8082: // Email Address 1 Transport
-	DEBUG_EMAIL(("Email Address 1 Transport - "));
+DEBUG_EMAIL(("Email Address 1 Transport - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address1_transport, (char*));
+LIST_COPY(item->contact->address1_transport, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address1_transport));
+DEBUG_EMAIL(("%s\n", item->contact->address1_transport));
-	break;
+break;
 case 0x8083: // Email Address 1 Address
-	DEBUG_EMAIL(("Email Address 1 Address - "));
+DEBUG_EMAIL(("Email Address 1 Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address1, (char*));
+LIST_COPY(item->contact->address1, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address1));
+DEBUG_EMAIL(("%s\n", item->contact->address1));
-	break;
+break;
 case 0x8084: // Email Address 1 Description
-	DEBUG_EMAIL(("Email Address 1 Description - "));
+DEBUG_EMAIL(("Email Address 1 Description - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address1_desc, (char*));
+LIST_COPY(item->contact->address1_desc, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address1_desc));
+DEBUG_EMAIL(("%s\n", item->contact->address1_desc));
-	break;
+break;
 case 0x8085: // Email Address 1 Record
-	DEBUG_EMAIL(("Email Address 1 Record - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Email Address 1 Record - NOT PROCESSED\n"));
-	break;
+break;
 case 0x8092: // Email Address 2 Transport
-	DEBUG_EMAIL(("Email Address 2 Transport - "));
+DEBUG_EMAIL(("Email Address 2 Transport - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address2_transport, (char*));
+LIST_COPY(item->contact->address2_transport, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address2_transport));
+DEBUG_EMAIL(("%s\n", item->contact->address2_transport));
-	break;
+break;
 case 0x8093: // Email Address 2 Address
-	DEBUG_EMAIL(("Email Address 2 Address - "));
+DEBUG_EMAIL(("Email Address 2 Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address2, (char*));
+LIST_COPY(item->contact->address2, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address2));
+DEBUG_EMAIL(("%s\n", item->contact->address2));
-	break;
+break;
 case 0x8094: // Email Address 2 Description
-	DEBUG_EMAIL (("Email Address 2 Description - "));
+DEBUG_EMAIL (("Email Address 2 Description - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address2_desc, (char*));
+LIST_COPY(item->contact->address2_desc, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address2_desc));
+DEBUG_EMAIL(("%s\n", item->contact->address2_desc));
-	break;
+break;
 case 0x8095: // Email Address 2 Record
-	DEBUG_EMAIL(("Email Address 2 Record - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Email Address 2 Record - NOT PROCESSED\n"));
-	break;
+break;
 case 0x80A2: // Email Address 3 Transport
-	DEBUG_EMAIL (("Email Address 3 Transport - "));
+DEBUG_EMAIL (("Email Address 3 Transport - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address3_transport, (char*));
+LIST_COPY(item->contact->address3_transport, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address3_transport));
+DEBUG_EMAIL(("%s\n", item->contact->address3_transport));
-	break;
+break;
 case 0x80A3: // Email Address 3 Address
-	DEBUG_EMAIL(("Email Address 3 Address - "));
+DEBUG_EMAIL(("Email Address 3 Address - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address3, (char*));
+LIST_COPY(item->contact->address3, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address3));
+DEBUG_EMAIL(("%s\n", item->contact->address3));
-	break;
+break;
 case 0x80A4: // Email Address 3 Description
-	DEBUG_EMAIL(("Email Address 3 Description - "));
+DEBUG_EMAIL(("Email Address 3 Description - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->address3_desc, (char*));
+LIST_COPY(item->contact->address3_desc, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->address3_desc));
+DEBUG_EMAIL(("%s\n", item->contact->address3_desc));
-	break;
+break;
 case 0x80A5: // Email Address 3 Record
-	DEBUG_EMAIL(("Email Address 3 Record - NOT PROCESSED\n"));
+DEBUG_EMAIL(("Email Address 3 Record - NOT PROCESSED\n"));
-	break;
+break;
 case 0x80D8: // Internet Free/Busy
-	DEBUG_EMAIL(("Internet Free/Busy - "));
+DEBUG_EMAIL(("Internet Free/Busy - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->free_busy_address, (char*));
+LIST_COPY(item->contact->free_busy_address, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->free_busy_address));
+DEBUG_EMAIL(("%s\n", item->contact->free_busy_address));
-	break;
+break;
 case 0x8205: // Show on Free/Busy as
-	// 0: Free
+// 0: Free
-	// 1: Tentative
+// 1: Tentative
-	// 2: Busy
+// 2: Busy
-	// 3: Out Of Office
+// 3: Out Of Office
-	DEBUG_EMAIL(("Appointment shows as - "));
+DEBUG_EMAIL(("Appointment shows as - "));
-	MALLOC_APPOINTMENT(item);
+MALLOC_APPOINTMENT(item);
-	memcpy(&(item->appointment->showas), list->items[x]->data, sizeof(item->appointment->showas));
+memcpy(&(item->appointment->showas), list->items[x]->data, sizeof(item->appointment->showas));
-	LE32_CPU(item->appointment->showas);
+LE32_CPU(item->appointment->showas);
-	switch (item->appointment->showas) {
+switch (item->appointment->showas) {
-	case PST_FREEBUSY_FREE:
+case PST_FREEBUSY_FREE:
-	  DEBUG_EMAIL(("Free\n")); break;
+DEBUG_EMAIL(("Free\n")); break;
-	case PST_FREEBUSY_TENTATIVE:
+case PST_FREEBUSY_TENTATIVE:
-	  DEBUG_EMAIL(("Tentative\n")); break;
+DEBUG_EMAIL(("Tentative\n")); break;
-	case PST_FREEBUSY_BUSY:
+case PST_FREEBUSY_BUSY:
-	  DEBUG_EMAIL(("Busy\n")); break;
+DEBUG_EMAIL(("Busy\n")); break;
-	case PST_FREEBUSY_OUT_OF_OFFICE:
+case PST_FREEBUSY_OUT_OF_OFFICE:
-	  DEBUG_EMAIL(("Out Of Office\n")); break;
+DEBUG_EMAIL(("Out Of Office\n")); break;
-	default:
+default:
-	  DEBUG_EMAIL(("Unknown Value: %d\n", item->appointment->showas)); break;
+DEBUG_EMAIL(("Unknown Value: %d\n", item->appointment->showas)); break;
-	}
+}
-	break;
+break;
 case 0x8208: // Location of an appointment
-	DEBUG_EMAIL(("Appointment Location - "));
+DEBUG_EMAIL(("Appointment Location - "));
-	MALLOC_APPOINTMENT(item);
+MALLOC_APPOINTMENT(item);
-	LIST_COPY(item->appointment->location, (char*));
+LIST_COPY(item->appointment->location, (char*));
-	DEBUG_EMAIL(("%s\n", item->appointment->location));
+DEBUG_EMAIL(("%s\n", item->appointment->location));
-	break;
+break;
 case 0x8214: // Label for an appointment
-	DEBUG_EMAIL(("Label for appointment - "));
+DEBUG_EMAIL(("Label for appointment - "));
-	MALLOC_APPOINTMENT(item);
+MALLOC_APPOINTMENT(item);
-	memcpy(&(item->appointment->label), list->items[x]->data, sizeof(item->appointment->label));
+memcpy(&(item->appointment->label), list->items[x]->data, sizeof(item->appointment->label));
-	LE32_CPU(item->appointment->label);
+LE32_CPU(item->appointment->label);
-	switch (item->appointment->label) {
+switch (item->appointment->label) {
-	case PST_APP_LABEL_NONE:
+case PST_APP_LABEL_NONE:
-	  DEBUG_EMAIL(("None\n")); break;
+DEBUG_EMAIL(("None\n")); break;
-	case PST_APP_LABEL_IMPORTANT:
+case PST_APP_LABEL_IMPORTANT:
-	  DEBUG_EMAIL(("Important\n")); break;
+DEBUG_EMAIL(("Important\n")); break;
-	case PST_APP_LABEL_BUSINESS:
+case PST_APP_LABEL_BUSINESS:
-	  DEBUG_EMAIL(("Business\n")); break;
+DEBUG_EMAIL(("Business\n")); break;
-	case PST_APP_LABEL_PERSONAL:
+case PST_APP_LABEL_PERSONAL:
-	  DEBUG_EMAIL(("Personal\n")); break;
+DEBUG_EMAIL(("Personal\n")); break;
-	case PST_APP_LABEL_VACATION:
+case PST_APP_LABEL_VACATION:
-	  DEBUG_EMAIL(("Vacation\n")); break;
+DEBUG_EMAIL(("Vacation\n")); break;
-	case PST_APP_LABEL_MUST_ATTEND:
+case PST_APP_LABEL_MUST_ATTEND:
-	  DEBUG_EMAIL(("Must Attend\n")); break;
+DEBUG_EMAIL(("Must Attend\n")); break;
-	case PST_APP_LABEL_TRAVEL_REQ:
+case PST_APP_LABEL_TRAVEL_REQ:
-	  DEBUG_EMAIL(("Travel Required\n")); break;
+DEBUG_EMAIL(("Travel Required\n")); break;
-	case PST_APP_LABEL_NEEDS_PREP:
+case PST_APP_LABEL_NEEDS_PREP:
-	  DEBUG_EMAIL(("Needs Preparation\n")); break;
+DEBUG_EMAIL(("Needs Preparation\n")); break;
-	case PST_APP_LABEL_BIRTHDAY:
+case PST_APP_LABEL_BIRTHDAY:
-	  DEBUG_EMAIL(("Birthday\n")); break;
+DEBUG_EMAIL(("Birthday\n")); break;
-	case PST_APP_LABEL_ANNIVERSARY:
+case PST_APP_LABEL_ANNIVERSARY:
-	  DEBUG_EMAIL(("Anniversary\n")); break;
+DEBUG_EMAIL(("Anniversary\n")); break;
-	case PST_APP_LABEL_PHONE_CALL:
+case PST_APP_LABEL_PHONE_CALL:
-	  DEBUG_EMAIL(("Phone Call\n")); break;
+DEBUG_EMAIL(("Phone Call\n")); break;
-	}
+}
-	break;
+break;
 case 0x8234: // TimeZone as String
-	DEBUG_EMAIL(("TimeZone of times - "));
+DEBUG_EMAIL(("TimeZone of times - "));
-	MALLOC_APPOINTMENT(item);
+MALLOC_APPOINTMENT(item);
-	LIST_COPY(item->appointment->timezonestring, (char*));
+LIST_COPY(item->appointment->timezonestring, (char*));
-	DEBUG_EMAIL(("%s\n", item->appointment->timezonestring));
+DEBUG_EMAIL(("%s\n", item->appointment->timezonestring));
-	break;
+break;
 case 0x8235: // Appointment start time
-	DEBUG_EMAIL(("Appointment Start Time - "));
+DEBUG_EMAIL(("Appointment Start Time - "));
-	MALLOC_APPOINTMENT(item);
+MALLOC_APPOINTMENT(item);
-	LIST_COPY(item->appointment->start, (FILETIME*));
+LIST_COPY(item->appointment->start, (FILETIME*));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)item->appointment->start)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)item->appointment->start)));
-	break;
+break;
 case 0x8236: // Appointment end time
-	DEBUG_EMAIL(("Appointment End Time - "));
+DEBUG_EMAIL(("Appointment End Time - "));
-	MALLOC_APPOINTMENT(item);
+MALLOC_APPOINTMENT(item);
-	LIST_COPY(item->appointment->end, (FILETIME*));
+LIST_COPY(item->appointment->end, (FILETIME*));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)item->appointment->start)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)item->appointment->start)));
-	break;
+break;
 case 0x8516: // Journal time start
-	DEBUG_EMAIL(("Duplicate Time Start - "));
+DEBUG_EMAIL(("Duplicate Time Start - "));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)list->items[x]->data)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)list->items[x]->data)));
-	break;
+break;
 case 0x8517: // Journal time end
-	DEBUG_EMAIL(("Duplicate Time End - "));
+DEBUG_EMAIL(("Duplicate Time End - "));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)list->items[x]->data)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii((FILETIME*)list->items[x]->data)));
-	break;
+break;
 case 0x8530: // Followup
-	DEBUG_EMAIL(("Followup String - "));
+DEBUG_EMAIL(("Followup String - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->followup, (char*));
+LIST_COPY(item->contact->followup, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->followup));
+DEBUG_EMAIL(("%s\n", item->contact->followup));
-	break;
+break;
 case 0x8534: // Mileage
-	DEBUG_EMAIL(("Mileage - "));
+DEBUG_EMAIL(("Mileage - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->mileage, (char*));
+LIST_COPY(item->contact->mileage, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->mileage));
+DEBUG_EMAIL(("%s\n", item->contact->mileage));
-	break;
+break;
 case 0x8535: // Billing Information
-	DEBUG_EMAIL(("Billing Information - "));
+DEBUG_EMAIL(("Billing Information - "));
-	MALLOC_CONTACT(item);
+MALLOC_CONTACT(item);
-	LIST_COPY(item->contact->billing_information, (char*));
+LIST_COPY(item->contact->billing_information, (char*));
-	DEBUG_EMAIL(("%s\n", item->contact->billing_information));
+DEBUG_EMAIL(("%s\n", item->contact->billing_information));
-	break;
+break;
 case 0x8554: // Outlook Version
-	DEBUG_EMAIL(("Outlook Version - "));
+DEBUG_EMAIL(("Outlook Version - "));
-	LIST_COPY(item->outlook_version, (char*));
+LIST_COPY(item->outlook_version, (char*));
-	DEBUG_EMAIL(("%s\n", item->outlook_version));
+DEBUG_EMAIL(("%s\n", item->outlook_version));
-	break;
+break;
 case 0x8560: // Appointment Reminder Time
-	DEBUG_EMAIL(("Appointment Reminder Time - "));
+DEBUG_EMAIL(("Appointment Reminder Time - "));
-	MALLOC_APPOINTMENT(item);
+MALLOC_APPOINTMENT(item);
-	LIST_COPY(item->appointment->reminder, (FILETIME*));
+LIST_COPY(item->appointment->reminder, (FILETIME*));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->appointment->reminder)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->appointment->reminder)));
-	break;
+break;
 case 0x8700: // Journal Type
-	DEBUG_EMAIL(("Journal Entry Type - "));
+DEBUG_EMAIL(("Journal Entry Type - "));
-	MALLOC_JOURNAL(item);
+MALLOC_JOURNAL(item);
-	LIST_COPY(item->journal->type, (char*));
+LIST_COPY(item->journal->type, (char*));
-	DEBUG_EMAIL(("%s\n", item->journal->type));
+DEBUG_EMAIL(("%s\n", item->journal->type));
-	break;
+break;
 case 0x8706: // Journal Start date/time
-	DEBUG_EMAIL(("Start Timestamp - "));
+DEBUG_EMAIL(("Start Timestamp - "));
-	MALLOC_JOURNAL(item);
+MALLOC_JOURNAL(item);
-	LIST_COPY(item->journal->start, (FILETIME*));
+LIST_COPY(item->journal->start, (FILETIME*));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->journal->start)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->journal->start)));
-	break;
+break;
 case 0x8708: // Journal End date/time
-	DEBUG_EMAIL(("End Timestamp - "));
+DEBUG_EMAIL(("End Timestamp - "));
-	MALLOC_JOURNAL(item);
+MALLOC_JOURNAL(item);
-	LIST_COPY(item->journal->end, (FILETIME*));
+LIST_COPY(item->journal->end, (FILETIME*));
-	DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->journal->end)));
+DEBUG_EMAIL(("%s\n", fileTimeToAscii(item->journal->end)));
-	break;
+break;
 case 0x8712: // Title?
-	DEBUG_EMAIL(("Journal Entry Type - "));
+DEBUG_EMAIL(("Journal Entry Type - "));
-	MALLOC_JOURNAL(item);
+MALLOC_JOURNAL(item);
-	LIST_COPY(item->journal->type, (char*));
+LIST_COPY(item->journal->type, (char*));
-	DEBUG_EMAIL(("%s\n", item->journal->type));
+DEBUG_EMAIL(("%s\n", item->journal->type));
-	break;
+break;
 default:
 /* Reference Types
 2 - 0x0002 - Signed 16bit value
-	 3 - 0x0003 - Signed 32bit value
+3 - 0x0003 - Signed 32bit value
-	11 - 0x000B - Boolean (non-zero = true)
+11 - 0x000B - Boolean (non-zero = true)
-	13 - 0x000D - Embedded Object
+13 - 0x000D - Embedded Object
-	30 - 0x001E - Null terminated String
+30 - 0x001E - Null terminated String
-	31 - 0x001F - Unicode string
+31 - 0x001F - Unicode string
-	64 - 0x0040 - Systime - Filetime structure
+64 - 0x0040 - Systime - Filetime structure
-	72 - 0x0048 - OLE Guid
+72 - 0x0048 - OLE Guid
 258 - 0x0102 - Binary data
-	   - 0x1003 - Array of 32bit values
+- 0x1003 - Array of 32bit values
-	   - 0x101E - Array of Strings
+- 0x101E - Array of Strings
-	   - 0x1102 - Array of Binary data
+- 0x1102 - Array of Binary data
 */
-	//	DEBUG_EMAIL(("Unknown id [%#x, size=%#x]\n", list->items[x]->id, list->items[x]->size));
+//  DEBUG_EMAIL(("Unknown id [%#x, size=%#x]\n", list->items[x]->id, list->items[x]->size));
-	if (list->items[x]->type == 0x02) {
+if (list->items[x]->type == 0x02) {
-	  DEBUG_EMAIL(("Unknown 16bit int = %hi\n", *(int16_t*)list->items[x]->data));
+DEBUG_EMAIL(("Unknown 16bit int = %hi\n", *(int16_t*)list->items[x]->data));
-	} else if (list->items[x]->type == 0x03) {
+} else if (list->items[x]->type == 0x03) {
-	  DEBUG_EMAIL(("Unknown 32bit int = %i\n", *(int32_t*)list->items[x]->data));
+DEBUG_EMAIL(("Unknown 32bit int = %i\n", *(int32_t*)list->items[x]->data));
-	} else if (list->items[x]->type == 0x0b) {
+} else if (list->items[x]->type == 0x0b) {
-	  DEBUG_EMAIL(("Unknown 16bit boolean = %s [%hi]\n",
+DEBUG_EMAIL(("Unknown 16bit boolean = %s [%hi]\n",
-		       (*((int16_t*)list->items[x]->data)!=0?"True":"False"),
+(*((int16_t*)list->items[x]->data)!=0?"True":"False"),
-		       *((int16_t*)list->items[x]->data)));
+*((int16_t*)list->items[x]->data)));
-	} else if (list->items[x]->type == 0x1e) {
+} else if (list->items[x]->type == 0x1e) {
-	  DEBUG_EMAIL(("Unknown String Data = \"%s\" [%#x]\n",
+DEBUG_EMAIL(("Unknown String Data = \"%s\" [%#x]\n",
-		      list->items[x]->data, list->items[x]->type));
+list->items[x]->data, list->items[x]->type));
-	} else if (list->items[x]->type == 0x40) {
+} else if (list->items[x]->type == 0x40) {
-	  DEBUG_EMAIL(("Unknown Date = \"%s\" [%#x]\n",
+DEBUG_EMAIL(("Unknown Date = \"%s\" [%#x]\n",
-		      fileTimeToAscii((FILETIME*)list->items[x]->data),
+fileTimeToAscii((FILETIME*)list->items[x]->data),
-		      list->items[x]->type));
+list->items[x]->type));
-	} else if (list->items[x]->type == 0x102) {
+} else if (list->items[x]->type == 0x102) {
-	  DEBUG_EMAIL(("Unknown Binary Data [size = %#x]\n",
+DEBUG_EMAIL(("Unknown Binary Data [size = %#x]\n",
-		       list->items[x]->size));
+list->items[x]->size));
-	  DEBUG_HEXDUMP(list->items[x]->data, list->items[x]->size);
+DEBUG_HEXDUMP(list->items[x]->data, list->items[x]->size);
-	} else if (list->items[x]->type == 0x101E) {
+} else if (list->items[x]->type == 0x101E) {
-	  DEBUG_EMAIL(("Unknown Array of Strings [%#x]\n",
+DEBUG_EMAIL(("Unknown Array of Strings [%#x]\n",
-		      list->items[x]->type));
+list->items[x]->type));
-	} else {
+} else {
-	  DEBUG_EMAIL(("Unknown Not Printable [%#x]\n",
+DEBUG_EMAIL(("Unknown Not Printable [%#x]\n",
-		      list->items[x]->type));
+list->items[x]->type));
-	}
+}
-	if (list->items[x]->data != NULL) {
+if (list->items[x]->data != NULL) {
-	  free(list->items[x]->data);
+free(list->items[x]->data);
-	  list->items[x]->data = NULL;
+list->items[x]->data = NULL;
-	}
+}
-	//INC_CHECK_X();
+//INC_CHECK_X();
 }
 x++;
 }
 x = 0;
 list = list->next;
 pst_num_array *l;
 DEBUG_ENT("_pst_free_list");
 while (list != NULL) {
 while (x < list->count_item) {
 if (list->items[x]->data != NULL) {
-	free (list->items[x]->data);
+free (list->items[x]->data);
 }
 if (list->items[x] != NULL) {
-	free (list->items[x]);
+free (list->items[x]);
 }
 x++;
 }
 if (list->items != NULL) {
 free(list->items);
 DEBUG_ENT("_pst_free_desc");
 while (head != NULL) {
 while (head->child != NULL) {
 head = head->child;
 }
 // point t to the next item
 t = head->next;
 if (t == NULL && head->parent != NULL) {
 t = head->parent;
 t->child = NULL; // set the child to NULL so we don't come back here again!
 }
 if (head != NULL)
 free(head);
 else {
 DIE(("head is NULL"));
 DEBUG_RET();
 return NULL;
 }
 DEBUG_INDEX(("ID %#x is likely to be a description record. Count is %i (offset %#x)\n",
-	      list->id, block_head.count, list->offset));
+list->id, block_head.count, list->offset));
 x = 0;
 b_ptr = 0x04;
 while (x < block_head.count) {
 memcpy(&id2_rec, &(buf[b_ptr]), sizeof(id2_rec));
 LE32_CPU(id2_rec.id2);
 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));
 // add it to the linked list
 //check it doesn't exist already first
 /*      i2_ptr = head;
 while(i2_ptr != NULL) {
-	if (i2_ptr->id2 == id2_rec.id2)
+if (i2_ptr->id2 == id2_rec.id2)
-	  break;
+break;
-	i2_ptr = i2_ptr->next;
+i2_ptr = i2_ptr->next;
-	}*/
+}*/
 //      if (i2_ptr == NULL) {
 i2_ptr = (pst_index2_ll*) xmalloc(sizeof(pst_index2_ll));
 i2_ptr->id2 = id2_rec.id2;
 i2_ptr->id = i_ptr;
 i2_ptr->next = NULL;
 if (head == NULL)
-	head = i2_ptr;
+head = i2_ptr;
 if (tail != NULL)
-	tail->next = i2_ptr;
+tail->next = i2_ptr;
 tail = i2_ptr;
 /*    } else {
-	// if it does already exist
+// if it does already exist
-	DEBUG_INDEX(("_pst_build_id2(): \t\t%#x already exists. Updating ID to %#x\n",
+DEBUG_INDEX(("_pst_build_id2(): \t\t%#x already exists. Updating ID to %#x\n",
-		     id2_rec.id2, i_ptr->id));
+id2_rec.id2, i_ptr->id));
-	i2_ptr->id = i_ptr;
+i2_ptr->id = i_ptr;
-	}*/
+}*/
 if (id2_rec.table2 != 0) {
-	if ((i_ptr = _pst_getID(pf, id2_rec.table2)) == NULL) {
+if ((i_ptr = _pst_getID(pf, id2_rec.table2)) == NULL) {
-	  DEBUG_WARN(("\tTable2 [%#x] not found\n", id2_rec.table2));
+DEBUG_WARN(("\tTable2 [%#x] not found\n", id2_rec.table2));
-	} else {
+} else {
-	  DEBUG_INDEX(("\tGoing deeper for table2 [%#x]\n", id2_rec.table2));
+DEBUG_INDEX(("\tGoing deeper for table2 [%#x]\n", id2_rec.table2));
-	  if ((i2_ptr = _pst_build_id2(pf, i_ptr, head)) != NULL) {
+if ((i2_ptr = _pst_build_id2(pf, i_ptr, head)) != NULL) {
-	    /*DEBUG_INDEX(("_pst_build_id2(): \t\tAdding new list onto end of current\n"));
+/*DEBUG_INDEX(("_pst_build_id2(): \t\tAdding new list onto end of current\n"));
-	    if (head == NULL)
+if (head == NULL)
-	      head = i2_ptr;
+head = i2_ptr;
-	    if (tail != NULL)
+if (tail != NULL)
-	      tail->next = i2_ptr;
+tail->next = i2_ptr;
-	    while (i2_ptr->next != NULL)
+while (i2_ptr->next != NULL)
-	      i2_ptr = i2_ptr->next;
+i2_ptr = i2_ptr->next;
-	      tail = i2_ptr;*/
+tail = i2_ptr;*/
-	  }
+}
-	  // need to re-establish tail
+// need to re-establish tail
-	  DEBUG_INDEX(("Returned from depth\n"));
+DEBUG_INDEX(("Returned from depth\n"));
-	  if (tail != NULL) {
+if (tail != NULL) {
-	    while (tail->next != NULL)
+while (tail->next != NULL)
-	      tail = tail->next;
+tail = tail->next;
-	  }
+}
-	}
+}
 }
 }
 x++;
 }
 if (buf != NULL) {
 SAFE_FREE(item->email->sender2_address);
 SAFE_FREE(item->email->sent_date);
 SAFE_FREE(item->email->sentmail_folder);
 SAFE_FREE(item->email->sentto_address);
 if (item->email->subject != NULL)
-	SAFE_FREE(item->email->subject->subj);
+SAFE_FREE(item->email->subject->subj);
 SAFE_FREE(item->email->subject);
 free(item->email);
 }
 if (item->folder) {
 free(item->folder);
 SAFE_FREE(item->outlook_version);
 SAFE_FREE(item->record_key);
 free(item);
 }
 DEBUG_RET();
 }
 int32_t _pst_getBlockOffset(char *buf, int32_t i_offset, int32_t offset, pst_block_offset *p) {
 int32_t of1;
 DEBUG_ENT("_pst_getBlockOffset");
 if (p == NULL || buf == NULL || offset == 0) {
 // it isn't based on sound principles either.
 // update: seems that the last two sig bits are flags. u tell me!
 id &= 0xFFFFFFFE; // remove least sig. bit. seems that it might work if I do this
 DEBUG_INDEX(("Trying to find %#x\n", id));
 if (ptr == NULL)
 ptr = pf->i_head;
 while (ptr->id != id) {
 ptr = ptr->next;
 if (ptr == NULL) {
 break;
 char spaces[100];
 DEBUG_ENT("_pst_printDptr");
 memset(spaces, ' ', 99);
 spaces[99] = '\0';
 while (ptr != NULL) {
 DEBUG_INDEX(("%s%#x [%i] desc=%#x, list=%#x\n", &(spaces[(99-depth<0?0:99-depth)]), ptr->id, ptr->no_child,
-	  (ptr->desc==NULL?0:ptr->desc->id),
+(ptr->desc==NULL?0:ptr->desc->id),
-	  (ptr->list_index==NULL?0:ptr->list_index->id)));
+(ptr->list_index==NULL?0:ptr->list_index->id)));
 if (ptr->child != NULL) {
 depth++;
 ptr = ptr->child;
 continue;
 }
 fseek(fp, fpos, SEEK_SET);
 DEBUG_RET();
 return size;
 }
 // when the first byte of the block being read is 01, then we can assume
 // that it is a list of further ids to read and we will follow those ids
 // recursively calling this function until we have all the data
 // we could do decryption of the encrypted PST files here
 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) {
+unsigned char is_index) {
 u_int32_t fpos, x;
 int16_t count, y;
 char *buf2 = NULL, *buf3 = NULL;
 unsigned char fdepth;
 pst_index_ll *ptr = NULL;
 /*  if (is_index) {
 DEBUG_READ(("_pst_read_block_size: ODD_BLOCK should be here\n"));
 DEBUG_READ(("\t: byte 0-1: %#x %#x\n", (*buf)[0], (*buf)[1]));
 }*/
 if ((*buf)[0] == 0x01 && (*buf)[1] != 0x00 && is_index) {
 //don't do this recursion if we should be at a leaf node
 memcpy(&count, &((*buf)[2]), sizeof(int16_t));
 LE16_CPU(count);
 memcpy(&fdepth, &((*buf)[1]), sizeof(fdepth));
 DEBUG_READ(("Seen indexes to blocks. Depth is %i\n", fdepth));
 y = 0;
 while (y < count) {
 memcpy(&x, &(*buf)[0x08+(y*4)], sizeof(int32_t));
 LE32_CPU(x);
 if ((ptr = _pst_getID(pf, x)) == NULL) {
-	WARN(("Error. Cannot find ID [%#x] during multi-block read\n", x));
+WARN(("Error. Cannot find ID [%#x] during multi-block read\n", x));
-	buf3 = (char*) realloc(buf3, size+1);
+buf3 = (char*) realloc(buf3, size+1);
-	buf3[size] = '\0';
+buf3[size] = '\0';
-	*buf = buf3;
+*buf = buf3;
-	fseek(pf->fp, fpos, SEEK_SET);
+fseek(pf->fp, fpos, SEEK_SET);
-	DEBUG_RET();
+DEBUG_RET();
-	return size;
+return size;
 }
 if ((z = _pst_read_block_size(pf, ptr->offset, ptr->size, &buf2, do_enc, fdepth-1)) < ptr->size) {
-	buf3 = (char*) realloc(buf3, size+1);
+buf3 = (char*) realloc(buf3, size+1);
-	buf3[size] = '\0';
+buf3[size] = '\0';
-	*buf = buf3;
+*buf = buf3;
-	fseek(pf->fp, fpos, SEEK_SET);
+fseek(pf->fp, fpos, SEEK_SET);
-	DEBUG_RET();
+DEBUG_RET();
-	return size;
+return size;
 }
 DEBUG_READ(("Melding newley retrieved block with bigger one. New size is %i\n", size+z));
 buf3 = (char*) realloc(buf3, size+z+1); //plus one so that we can null terminate it later
 DEBUG_READ(("Doing copy. Start pos is %i, length is %i\n", size, z));
 memcpy(&(buf3[size]), buf2, z);
 y++;
 }
 free(*buf);
 if (buf2 != NULL)
 free(buf2);
 if (buf3 == NULL) {
 // this can happen if count == 0. We should create an empty buffer so we don't
 // confuse any clients
 buf3 = (char*) xmalloc(1);
 }
 *buf = buf3;
 DEBUG_ENT("_pst_getAtPos");
 if (fseek(fp, pos, SEEK_SET) == -1) {
 DEBUG_RET();
 return 1;
 }
 if (fread(buf, 1, size, fp) < size) {
 DEBUG_RET();
 return 2;
 }
 DEBUG_RET();
 while (y < count) {
 memcpy(&x, &buf3[0x08+(y*4)], sizeof(int32_t));
 LE32_CPU(x);
 if (fdepth == 0x1) {
 if ((z = _pst_ff_getIDblock(pf, x, &buf2)) == 0) {
-	DEBUG_WARN(("call to getIDblock returned zero %i\n", z));
+DEBUG_WARN(("call to getIDblock returned zero %i\n", z));
-	if (buf2 != NULL)
+if (buf2 != NULL)
-	  free(buf2);
+free(buf2);
-	free(buf3);
+free(buf3);
-	return z;
+return z;
 }
 if (pf->encryption)
-	_pst_decrypt(buf2, z, pf->encryption);
+_pst_decrypt(buf2, z, pf->encryption);
 if (h->buf != NULL) {
-	*(h->buf) = realloc(*(h->buf), size+z+1);
+*(h->buf) = realloc(*(h->buf), size+z+1);
-	DEBUG_READ(("appending read data of size %i onto main buffer from pos %i\n", z, size));
+DEBUG_READ(("appending read data of size %i onto main buffer from pos %i\n", z, size));
-	memcpy(&((*(h->buf))[size]), buf2, z);
+memcpy(&((*(h->buf))[size]), buf2, z);
 } else if (h->base64 == 1 && h->fp != NULL) {
-	// include any byte left over from the last one encoding
+// include any byte left over from the last one encoding
-	buf2 = (char*)realloc(buf2, z+h->base64_extra);
+buf2 = (char*)realloc(buf2, z+h->base64_extra);
-	memmove(buf2+h->base64_extra, buf2, z);
+memmove(buf2+h->base64_extra, buf2, z);
-	memcpy(buf2, h->base64_extra_chars, h->base64_extra);
+memcpy(buf2, h->base64_extra_chars, h->base64_extra);
-	z+= h->base64_extra;
+z+= h->base64_extra;
-	b = z % 3; // find out how many bytes will be left over after the encoding.
+b = z % 3; // find out how many bytes will be left over after the encoding.
-	// and save them
+// and save them
-	memcpy(h->base64_extra_chars, &(buf2[z-b]), b);
+memcpy(h->base64_extra_chars, &(buf2[z-b]), b);
-	h->base64_extra = b;
+h->base64_extra = b;
-	t = base64_encode(buf2, z-b);
+t = base64_encode(buf2, z-b);
-	pst_fwrite(t, 1, strlen(t), h->fp);
+pst_fwrite(t, 1, strlen(t), h->fp);
-	DEBUG_READ(("writing %i bytes to file as base64 [%i]. Currently %i\n",
+DEBUG_READ(("writing %i bytes to file as base64 [%i]. Currently %i\n",
-		    z, strlen(t), size));
+z, strlen(t), size));
 } else if (h->fp != NULL) {
-	DEBUG_READ(("writing %i bytes to file. Currently %i\n", z, size));
+DEBUG_READ(("writing %i bytes to file. Currently %i\n", z, size));
-	pst_fwrite(buf2, 1, z, h->fp);
+pst_fwrite(buf2, 1, z, h->fp);
 }
 size += z;
 y++;
 } else {
 if ((z = _pst_ff_compile_ID(pf, x, h, size)) == 0) {
-	DEBUG_WARN(("recursive called returned zero %i\n", z));
+DEBUG_WARN(("recursive called returned zero %i\n", z));
-	free(buf3);
+free(buf3);
-	DEBUG_RET();
+DEBUG_RET();
-	return z;
+return z;
 }
 size = z;
 y++;
 }
 }
 free(buf3);
 if (buf2 != NULL)
 free(buf2);
 DEBUG_RET();
 return size;
 }
 #ifdef _MSC_VER
 char * fileTimeToAscii(const FILETIME* filetime) {
 return 1;
 }
 int32_t pst_strincmp(char *a, char *b, int32_t x) {
 // compare upto x chars in string a and b case-insensitively
 // returns -1 if a < b, 0 if a==b, 1 if a > b
 int32_t y = 0;
 while (*a != '\0' && *b != '\0' && y < x && toupper(*a)==toupper(*b)) {
 a++; b++; y++;
 }
 // if we have reached the end of either string, or a and b still match
 if (*a == '\0' || *b == '\0' || toupper(*a)==toupper(*b))
 return 0;
 else if (toupper(*a) < toupper(*b))
 return -1;
 else
 return 1;
 }
 size_t pst_fwrite(const void*ptr, size_t size, size_t nmemb, FILE*stream) {
 size_t r;
 DEBUG_WARN(("An attempt to write a NULL Pointer was made\n"));
 }
 DEBUG_RET();
 return r;
 }
 char * _pst_wide_to_single(char *wt, int32_t size) {
 // returns the first byte of each wide char. the size is the number of bytes in source
 char *x, *y;
 DEBUG_ENT("_pst_wide_to_single");
 x = xmalloc((size/2)+1);

Mercurial > libpst

comparison libpst.c @ 8:2b58cf15aaf7