diff readpst.c @ 6:3484500f514e

revert to vendor branch, since I don't care about this part
author carl
date Thu, 23 Dec 2004 11:44:01 -0800
parents 8dd68d722fa8
children 3f2fedec798c
line wrap: on
line diff
--- a/readpst.c	Thu Dec 23 11:42:34 2004 -0800
+++ b/readpst.c	Thu Dec 23 11:44:01 2004 -0800
@@ -1,9 +1,10 @@
 /***
-  * readpst.c
-  * Part of the LibPST project
-  * Written by David Smith
-  *            dave.s@earthcorp.com
-  */
+ * readpst.c
+ * Part of the LibPST project
+ * Written by David Smith
+ *            dave.s@earthcorp.com
+ */
+// Includes {{{1
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -36,12 +37,13 @@
 #include "common.h"
 #include "timeconv.h"
 #include "lzfu.h"
-
+// }}}1
+// Defines {{{1
 #define OUTPUT_TEMPLATE "%s"
 #define OUTPUT_KMAIL_DIR_TEMPLATE ".%s.directory"
 #define KMAIL_INDEX ".%s.index"
 
-#define VERSION "0.5"
+#define VERSION "0.5.1"
 // max size of the c_time char*. It will store the date of the email
 #define C_TIME_SIZE 500
 #define PERM_DIRS 0777
@@ -52,19 +54,20 @@
 #else
 #define D_MKDIR(x) mkdir(x)
 #endif
-
+// }}}1
+// struct file_ll {{{1
 struct file_ll {
-    char *name;
-    char *dname;
-    FILE * output;
-    int32_t stored_count;
-    int32_t email_count;
-    int32_t skip_count;
-    int32_t type;
-    struct file_ll *next;
+  char *name;
+  char *dname;
+  FILE * output;
+  int32_t stored_count;
+  int32_t email_count;
+  int32_t skip_count;
+  int32_t type;
+  struct file_ll *next;
 };
-
-
+// }}}1
+// Function Declarations {{{1
 void  write_email_body(FILE *f, char *body);
 char *removeCR (char *c);
 int32_t   usage();
@@ -82,10 +85,14 @@
 int32_t chr_count(char *str, char x);
 char *rfc2425_datetime_format(FILETIME *ft);
 char *rfc2445_datetime_format(FILETIME *ft);
-
+char *skip_header_prologue(char *headers);
+// }}}1
+// Global Variables {{{1
 char *prog_name;
 char *output_dir = ".";
-
+char *kmail_chdir = NULL;
+// }}}1
+// More Defines {{{1
 // Normal mode just creates mbox format files in the current directory. Each file is named
 // the same as the folder's name that it represents
 #define MODE_NORMAL 0
@@ -119,1316 +126,1380 @@
 #define RTF_ATTACH_NAME "rtf-body.rtf"
 // mime type for the attachment
 #define RTF_ATTACH_TYPE "application/rtf"
-
+// }}}1
+// int main(int argc, char** argv) {{{1
 int main(int argc, char** argv) {
-    pst_item *item = NULL;
-    pst_file pstfile;
-    pst_desc_ll *d_ptr;
-    char * fname = NULL;
-    time_t em_time;
-    char * c_time, *d_log=NULL;
-    int c,x;
-    int mode = MODE_NORMAL;
-    int output_mode = OUTPUT_NORMAL;
-    int contact_mode = CMODE_VCARD;
-    int overwrite = 0;
-    int base64_body = 0;
-    //  int encrypt = 0;
-    FILE *fp;
-    char *enc; // base64 encoded attachment
-    char *boundary = NULL, *b1, *b2; // the boundary marker between multipart sections
-    char *temp = NULL; //temporary char pointer
-    int attach_num = 0;
-    int skip_child = 0;
-    struct file_ll  *f, *head;
-    prog_name = argv[0];
+  // declarations {{{2
+  pst_item *item = NULL;
+  pst_file pstfile;
+  pst_desc_ll *d_ptr;
+  char * fname = NULL;
+  time_t em_time;
+  char * c_time, *d_log=NULL;
+  int c,x;
+  int mode = MODE_NORMAL;
+  int output_mode = OUTPUT_NORMAL;
+  int contact_mode = CMODE_VCARD;
+  int overwrite = 0;
+  int base64_body = 0;
+  //  int encrypt = 0;
+  FILE *fp;
+  char *enc; // base64 encoded attachment
+  char *boundary = NULL, *b1, *b2; // the boundary marker between multipart sections
+  char *temp = NULL; //temporary char pointer
+  int attach_num = 0;
+  int skip_child = 0;
+  struct file_ll  *f, *head;
+  prog_name = argv[0];
+  // }}}2
 
-    while ((c = getopt(argc, argv, "d:hko:qrSVwc:"))!= -1) {
-        switch (c) {
-        case 'c':
-            if (optarg!=NULL && optarg[0]=='v')
-        contact_mode=CMODE_VCARD;
-            else if (optarg!=NULL && optarg[0]=='l')
-        contact_mode=CMODE_LIST;
-            else {
-        usage();
-        exit(0);
-            }
-            break;
-        case 'd':
-            d_log = optarg;
-            break;
-        case 'h':
-            usage();
-            exit(0);
-            break;
-        case 'V':
-            version();
-            exit(0);
-            break;
-        case 'k':
-            mode = MODE_KMAIL;
-            break;
-        case 'o':
-            output_dir = optarg;
-            break;
-        case 'q':
-            output_mode = OUTPUT_QUIET;
-            break;
-        case 'r':
-            mode = MODE_RECURSE;
-            break;
-        case 'S':
-            mode = MODE_SEPERATE;
-            break;
-        case 'w':
-            overwrite = 1;
-            break;
-        default:
-            usage();
-            exit(1);
-            break;
-        }
+  while ((c = getopt(argc, argv, "d:hko:qrSVwc:"))!= -1) {
+    switch (c) {
+    case 'c':
+      if (optarg!=NULL && optarg[0]=='v')
+    contact_mode=CMODE_VCARD;
+      else if (optarg!=NULL && optarg[0]=='l')
+    contact_mode=CMODE_LIST;
+      else {
+    usage();
+    exit(0);
+      }
+      break;
+    case 'd':
+      d_log = optarg;
+      break;
+    case 'h':
+      usage();
+      exit(0);
+      break;
+    case 'V':
+      version();
+      exit(0);
+      break;
+    case 'k':
+      mode = MODE_KMAIL;
+      break;
+    case 'o':
+      output_dir = optarg;
+      break;
+    case 'q':
+      output_mode = OUTPUT_QUIET;
+      break;
+    case 'r':
+      mode = MODE_RECURSE;
+      break;
+    case 'S':
+      mode = MODE_SEPERATE;
+      break;
+    case 'w':
+      overwrite = 1;
+      break;
+    default:
+      usage();
+      exit(1);
+      break;
     }
+  }
 
-    if (d_log == NULL)
-        d_log = "readpst.log";
-    DEBUG_INIT(d_log);
-    DEBUG_REGISTER_CLOSE();
-    DEBUG_ENT("main");
+#ifdef DEBUG_ALL
+  // initialize log file
+  if (d_log == NULL)
+    d_log = "readpst.log";
+  DEBUG_INIT(d_log);
+  DEBUG_REGISTER_CLOSE();
+#endif // defined DEBUG_ALL
+
+  DEBUG_ENT("main");
 
-    if (argc > optind) {
-        fname = argv[optind];
-    } else {
-        usage();
-        exit(2);
-    }
+  if (argc > optind) {
+    fname = argv[optind];
+  } else {
+    usage();
+    exit(2);
+  }
 
-    if (output_mode != OUTPUT_QUIET) printf("Opening PST file and indexes...\n");
+  if (output_mode != OUTPUT_QUIET) printf("Opening PST file and indexes...\n");
 
-    DEBUG_MAIN(("main: Opening PST file '%s'\n", fname));
-    RET_DERROR(pst_open(&pstfile, fname, "r"), 1, ("Error opening File\n"));
-    DEBUG_MAIN(("main: Loading Indexes\n"));
-    RET_DERROR(pst_load_index(&pstfile), 2, ("Index Error\n"));
-    DEBUG_MAIN(("processing file items\n"));
+  DEBUG_MAIN(("main: Opening PST file '%s'\n", fname));
+  RET_DERROR(pst_open(&pstfile, fname, "r"), 1, ("Error opening File\n"));
+  DEBUG_MAIN(("main: Loading Indexes\n"));
+  RET_DERROR(pst_load_index(&pstfile), 2, ("Index Error\n"));
+  DEBUG_MAIN(("processing file items\n"));
 
-    pst_load_extended_attributes(&pstfile);
+  pst_load_extended_attributes(&pstfile);
 
-    if (chdir(output_dir)) {
-        x = errno;
-        pst_close(&pstfile);
-        DIE(("main: Cannot change to output dir %s: %s\n", output_dir, strerror(x)));
-    }
+  if (chdir(output_dir)) {
+    x = errno;
+    pst_close(&pstfile);
+    DIE(("main: Cannot change to output dir %s: %s\n", output_dir, strerror(x)));
+  }
 
-    if (output_mode != OUTPUT_QUIET) printf("About to start processing first record...\n");
+  if (output_mode != OUTPUT_QUIET) printf("About to start processing first record...\n");
 
-    d_ptr = pstfile.d_head; // first record is main record
-    if ((item = _pst_parse_item(&pstfile, d_ptr)) == NULL || item->message_store == NULL) {
-        DIE(("main: Could not get root record\n"));
-    }
+  d_ptr = pstfile.d_head; // first record is main record
+  if ((item = _pst_parse_item(&pstfile, d_ptr)) == NULL || item->message_store == NULL) {
+    DIE(("main: Could not get root record\n"));
+  }
 
-      // default the file_as to the same as the main filename if it doesn't exist
-    if (item->file_as == NULL) {
-        if ((temp = strrchr(fname, '/')) == NULL)
-            if ((temp = strrchr(fname, '\\')) == NULL)
-        temp = fname;
-            else
-        temp++; // get past the "\\"
-        else
-            temp++; // get past the "/"
-        item->file_as = (char*)xmalloc(strlen(temp)+1);
-        strcpy(item->file_as, temp);
-        DEBUG_MAIN(("file_as was blank, so am using %s\n", item->file_as));
-    }
-    DEBUG_MAIN(("main: Root Folder Name: %s\n", item->file_as));
+   // default the file_as to the same as the main filename if it doesn't exist
+  if (item->file_as == NULL) {
+    if ((temp = strrchr(fname, '/')) == NULL)
+      if ((temp = strrchr(fname, '\\')) == NULL)
+    temp = fname;
+      else
+    temp++; // get past the "\\"
+    else
+      temp++; // get past the "/"
+    item->file_as = (char*)xmalloc(strlen(temp)+1);
+    strcpy(item->file_as, temp);
+    DEBUG_MAIN(("file_as was blank, so am using %s\n", item->file_as));
+  }
+  DEBUG_MAIN(("main: Root Folder Name: %s\n", item->file_as));
 
 
-    f = (struct file_ll*) malloc(sizeof(struct file_ll));
-    memset(f, 0, sizeof(struct file_ll));
-    f->email_count = 0;
-    f->skip_count = 0;
-    f->next = NULL;
-    head = f;
-    if (mode == MODE_KMAIL)
-        f->name = mk_kmail_dir(item->file_as);
-    else if (mode == MODE_RECURSE)
-        f->name = mk_recurse_dir(item->file_as);
-    else if (mode == MODE_SEPERATE) {
-        // do similar stuff to recurse here.
-        mk_seperate_dir(item->file_as, overwrite);
-        f->name = (char*) xmalloc(10);
-        sprintf(f->name, "%09i", f->email_count);
-    } else {
-        f->name = (char*) malloc(strlen(item->file_as)+strlen(OUTPUT_TEMPLATE)+1);
-        sprintf(f->name, OUTPUT_TEMPLATE, item->file_as);
-    }
+  f = (struct file_ll*) malloc(sizeof(struct file_ll));
+  memset(f, 0, sizeof(struct file_ll));
+  f->email_count = 0;
+  f->skip_count = 0;
+  f->next = NULL;
+  head = f;
+  if (mode == MODE_KMAIL)
+    f->name = mk_kmail_dir(item->file_as);
+  else if (mode == MODE_RECURSE)
+    f->name = mk_recurse_dir(item->file_as);
+  else if (mode == MODE_SEPERATE) {
+    // do similar stuff to recurse here.
+    mk_seperate_dir(item->file_as, overwrite);
+    f->name = (char*) xmalloc(10);
+    sprintf(f->name, "%09i", f->email_count);
+  } else {
+    f->name = (char*) malloc(strlen(item->file_as)+strlen(OUTPUT_TEMPLATE)+1);
+    sprintf(f->name, OUTPUT_TEMPLATE, item->file_as);
+  }
 
-    f->dname = (char*) malloc(strlen(item->file_as)+1);
-    strcpy(f->dname, item->file_as);
+  f->dname = (char*) malloc(strlen(item->file_as)+1);
+  strcpy(f->dname, item->file_as);
 
-    if (overwrite != 1 && mode != MODE_SEPERATE) {
-        // if overwrite is set to 1 we keep the existing name and don't modify anything
-        // we don't want to go changing the file name of the SEPERATE items
-        temp = (char*) malloc (strlen(f->name)+10); //enough room for 10 digits
-        sprintf(temp, "%s", f->name);
-        temp = check_filename(temp);
-        x = 0;
-        while ((f->output = fopen(temp, "r")) != NULL) {
-            DEBUG_MAIN(("main: need to increase filename cause one already exists with that name\n"));
-            DEBUG_MAIN(("main: - increasing it to %s%d\n", f->name, x));
-            x++;
-            sprintf(temp, "%s%08d", f->name, x);
-            DEBUG_MAIN(("main: - trying \"%s\"\n", temp));
-            if (x == 99999999) {
-        DIE(("main: Why can I not create a folder %s? I have tried %i extensions...\n", f->name, x));
-            }
-            fclose(f->output);
-        }
-        if (x > 0) { //then the f->name should change
-            free (f->name);
-            f->name = temp;
-        } else {
-            free (temp);
-        }
+  if (overwrite != 1 && mode != MODE_SEPERATE) {
+    // if overwrite is set to 1 we keep the existing name and don't modify anything
+    // we don't want to go changing the file name of the SEPERATE items
+    temp = (char*) malloc (strlen(f->name)+10); //enough room for 10 digits
+    sprintf(temp, "%s", f->name);
+    temp = check_filename(temp);
+    x = 0;
+    while ((f->output = fopen(temp, "r")) != NULL) {
+      DEBUG_MAIN(("main: need to increase filename cause one already exists with that name\n"));
+      DEBUG_MAIN(("main: - increasing it to %s%d\n", f->name, x));
+      x++;
+      sprintf(temp, "%s%08d", f->name, x);
+      DEBUG_MAIN(("main: - trying \"%s\"\n", temp));
+      if (x == 99999999) {
+    DIE(("main: Why can I not create a folder %s? I have tried %i extensions...\n", f->name, x));
+      }
+      fclose(f->output);
+    }
+    if (x > 0) { //then the f->name should change
+      free (f->name);
+      f->name = temp;
+    } else {
+      free (temp);
     }
-    if (mode != MODE_SEPERATE) {
-        f->name = check_filename(f->name);
-        if ((f->output = fopen(f->name, "w")) == NULL) {
-            DIE(("main: Could not open file \"%s\" for write\n", f->name));
-        }
-    }
-    f->type = item->type;
-
-    if ((d_ptr = pst_getTopOfFolders(&pstfile, item)) == NULL) {
-        DIE(("Top of folders record not found. Cannot continue\n"));
+  }
+  if (mode != MODE_SEPERATE) {
+    f->name = check_filename(f->name);
+    if ((f->output = fopen(f->name, "w")) == NULL) {
+      DIE(("main: Could not open file \"%s\" for write\n", f->name));
     }
+  }
+  f->type = item->type;
 
-    if (item){
-        _pst_freeItem(item);
-        item = NULL;
-    }
+  if ((d_ptr = pst_getTopOfFolders(&pstfile, item)) == NULL) {
+    DIE(("Top of folders record not found. Cannot continue\n"));
+  }
 
-    /*  if ((item = _pst_parse_item(&pstfile, d_ptr)) == NULL || item->folder == NULL) {
-        DEBUG_MAIN(("main: Could not get \"Top Of Personal Folder\" record\n"));
-        return -2;
-        }*/
-    d_ptr = d_ptr->child; // do the children of TOPF
+  if (item){
+    _pst_freeItem(item);
+    item = NULL;
+  }
+
+  /*  if ((item = _pst_parse_item(&pstfile, d_ptr)) == NULL || item->folder == NULL) {
+    DEBUG_MAIN(("main: Could not get \"Top Of Personal Folder\" record\n"));
+    return -2;
+    }*/
+  d_ptr = d_ptr->child; // do the children of TOPF
 
-    if (output_mode != OUTPUT_QUIET) printf("Processing items...\n");
+  if (output_mode != OUTPUT_QUIET) printf("Processing items...\n");
 
-    DEBUG_MAIN(("main: About to do email stuff\n"));
-    while (d_ptr != NULL) {
-        DEBUG_MAIN(("main: New item record\n"));
-        if (d_ptr->desc == NULL) {
-            DEBUG_WARN(("main: ERROR ?? item's desc record is NULL\n"));
-            f->skip_count++;
-            goto check_parent;
-        }
-        DEBUG_MAIN(("main: Desc Email ID %#x [d_ptr->id = %#x]\n", d_ptr->desc->id, d_ptr->id));
+  DEBUG_MAIN(("main: About to do email stuff\n"));
+  while (d_ptr != NULL) {
+    DEBUG_MAIN(("main: New item record\n"));
+    if (d_ptr->desc == NULL) {
+      DEBUG_WARN(("main: ERROR ?? item's desc record is NULL\n"));
+      f->skip_count++;
+      goto check_parent;
+    }
+    DEBUG_MAIN(("main: Desc Email ID %#x [d_ptr->id = %#x]\n", d_ptr->desc->id, d_ptr->id));
 
-        item = _pst_parse_item(&pstfile, d_ptr);
-        DEBUG_MAIN(("main: About to process item\n"));
-        if (item != NULL && item->email != NULL && item->email->subject != NULL &&
-        item->email->subject->subj != NULL) {
-            //      DEBUG_EMAIL(("item->email->subject = %p\n", item->email->subject));
-            //      DEBUG_EMAIL(("item->email->subject->subj = %p\n", item->email->subject->subj));
-        }
-        if (item != NULL) {
-            if (item->message_store != NULL) {
-                // there should only be one message_store, and we have already done it
-                DIE(("main: A second message_store has been found. Sorry, this must be an error.\n"));
-            }
+    item = _pst_parse_item(&pstfile, d_ptr);
+    DEBUG_MAIN(("main: About to process item\n"));
+    if (item != NULL && item->email != NULL && item->email->subject != NULL &&
+    item->email->subject->subj != NULL) {
+      //      DEBUG_EMAIL(("item->email->subject = %p\n", item->email->subject));
+      //      DEBUG_EMAIL(("item->email->subject->subj = %p\n", item->email->subject->subj));
+    }
+    if (item != NULL) {
+      if (item->message_store != NULL) {
+    // there should only be one message_store, and we have already done it
+    DIE(("main: A second message_store has been found. Sorry, this must be an error.\n"));
+      }
 
 
-            if (item->folder != NULL) { //if this is a folder, we want to recurse into it
-                if (output_mode != OUTPUT_QUIET) printf("Processing Folder \"%s\"\n", item->file_as);
-                //  f->email_count++;
-                DEBUG_MAIN(("main: I think I may try to go into folder \"%s\"\n", item->file_as));
-                f = (struct file_ll*) malloc(sizeof(struct file_ll));
-                memset(f, 0, sizeof(struct file_ll));
+      if (item->folder != NULL) {
+    // Process Folder item {{{2
+    // if this is a folder, we want to recurse into it
+    if (output_mode != OUTPUT_QUIET) printf("Processing Folder \"%s\"\n", item->file_as);
+    //  f->email_count++;
+    DEBUG_MAIN(("main: I think I may try to go into folder \"%s\"\n", item->file_as));
+    f = (struct file_ll*) malloc(sizeof(struct file_ll));
+    memset(f, 0, sizeof(struct file_ll));
 
-                f->next = head;
-                f->email_count = 0;
-                f->type = item->type;
-                f->stored_count = item->folder->email_count;
-                head = f;
+    f->next = head;
+    f->email_count = 0;
+    f->type = item->type;
+    f->stored_count = item->folder->email_count;
+    head = f;
 
-                temp = item->file_as;
-                temp = check_filename(temp);
+    temp = item->file_as;
+    temp = check_filename(temp);
 
-                if (mode == MODE_KMAIL)
-                    f->name = mk_kmail_dir(item->file_as); //create directory and form filename
-                else if (mode == MODE_RECURSE)
-                    f->name = mk_recurse_dir(item->file_as);
-                else if (mode == MODE_SEPERATE) {
-                    // do similar stuff to recurse here.
-                    mk_seperate_dir(item->file_as, overwrite);
-                    f->name = (char*) xmalloc(10);
-                    memset(f->name, 0, 10);
-                    //        sprintf(f->name, "%09i", f->email_count);
-                } else {
-                    f->name = (char*) xmalloc(strlen(item->file_as)+strlen(OUTPUT_TEMPLATE+1));
-                    sprintf(f->name, OUTPUT_TEMPLATE, item->file_as);
-                }
+    if (mode == MODE_KMAIL)
+      f->name = mk_kmail_dir(item->file_as); //create directory and form filename
+    else if (mode == MODE_RECURSE)
+      f->name = mk_recurse_dir(item->file_as);
+    else if (mode == MODE_SEPERATE) {
+      // do similar stuff to recurse here.
+      mk_seperate_dir(item->file_as, overwrite);
+      f->name = (char*) xmalloc(10);
+      memset(f->name, 0, 10);
+      //        sprintf(f->name, "%09i", f->email_count);
+    } else {
+      f->name = (char*) xmalloc(strlen(item->file_as)+strlen(OUTPUT_TEMPLATE+1));
+      sprintf(f->name, OUTPUT_TEMPLATE, item->file_as);
+    }
 
-                f->dname = (char*) xmalloc(strlen(item->file_as)+1);
-                strcpy(f->dname, item->file_as);
+    f->dname = (char*) xmalloc(strlen(item->file_as)+1);
+    strcpy(f->dname, item->file_as);
 
-                if (overwrite != 1) {
-                    temp = (char*) xmalloc (strlen(f->name)+10); //enough room for 10 digits
-                    sprintf(temp, "%s", f->name);
-                    x = 0;
-                    temp = check_filename(temp);
-                    while ((f->output = fopen(temp, "r")) != NULL) {
-                        DEBUG_MAIN(("main: need to increase filename cause one already exists with that name\n"));
-                        DEBUG_MAIN(("main: - increasing it to %s%d\n", f->name, x));
-                        x++;
-                        sprintf(temp, "%s%08d", f->name, x);
-                        DEBUG_MAIN(("main: - trying \"%s\"\n", f->name));
-                        if (x == 99999999) {
-                            DIE(("main: Why can I not create a folder %s? I have tried %i extensions...\n", f->name, x));
-                        }
-                        fclose(f->output);
-                    }
-                    if (x > 0) { //then the f->name should change
-                        free (f->name);
-                        f->name = temp;
-                    } else {
-                        free(temp);
-                    }
-                }
+    if (overwrite != 1) {
+      temp = (char*) xmalloc (strlen(f->name)+10); //enough room for 10 digits
+      sprintf(temp, "%s", f->name);
+      x = 0;
+      temp = check_filename(temp);
+      while ((f->output = fopen(temp, "r")) != NULL) {
+        DEBUG_MAIN(("main: need to increase filename cause one already exists with that name\n"));
+        DEBUG_MAIN(("main: - increasing it to %s%d\n", f->name, x));
+        x++;
+        sprintf(temp, "%s%08d", f->name, x);
+        DEBUG_MAIN(("main: - trying \"%s\"\n", f->name));
+        if (x == 99999999) {
+          DIE(("main: Why can I not create a folder %s? I have tried %i extensions...\n", f->name, x));
+        }
+        fclose(f->output);
+      }
+      if (x > 0) { //then the f->name should change
+        free (f->name);
+        f->name = temp;
+      } else {
+        free(temp);
+      }
+    }
 
-                DEBUG_MAIN(("main: f->name = %s\nitem->folder_name = %s\n", f->name, item->file_as));
-                if (mode != MODE_SEPERATE) {
-                    f->name = check_filename(f->name);
-                    if ((f->output = fopen(f->name, "w")) == NULL) {
-                        DIE(("main: Could not open file \"%s\" for write\n", f->name));
-                    }
-                }
-                if (d_ptr->child != NULL) {
-                    d_ptr = d_ptr->child;
-                    skip_child = 1;
-                } else {
-                    DEBUG_MAIN(("main: Folder has NO children. Creating directory, and closing again\n"));
-                    if (output_mode != OUTPUT_QUIET)
-                        printf("\tNo items to process in folder \"%s\", should have been %i\n", f->dname, f->stored_count);
-                    head = f->next;
-                    if (f->output != NULL)
-                        fclose(f->output);
-                    if (mode == MODE_KMAIL)
-                        close_kmail_dir();
-                    else if (mode == MODE_RECURSE)
-                        close_recurse_dir();
-                    else if (mode == MODE_SEPERATE)
-                        close_seperate_dir();
-                    free(f->dname);
-                    free(f->name);
-                    free(f);
+    DEBUG_MAIN(("main: f->name = %s\nitem->folder_name = %s\n", f->name, item->file_as));
+    if (mode != MODE_SEPERATE) {
+      f->name = check_filename(f->name);
+      if ((f->output = fopen(f->name, "w")) == NULL) {
+        DIE(("main: Could not open file \"%s\" for write\n", f->name));
+      }
+    }
+    if (d_ptr->child != NULL) {
+      d_ptr = d_ptr->child;
+      skip_child = 1;
+    } else {
+      DEBUG_MAIN(("main: Folder has NO children. Creating directory, and closing again\n"));
+      if (output_mode != OUTPUT_QUIET)
+        printf("\tNo items to process in folder \"%s\", should have been %i\n", f->dname, f->stored_count);
+      head = f->next;
+      if (f->output != NULL)
+        fclose(f->output);
+      if (mode == MODE_KMAIL)
+        close_kmail_dir();
+      else if (mode == MODE_RECURSE)
+        close_recurse_dir();
+      else if (mode == MODE_SEPERATE)
+        close_seperate_dir();
+      free(f->dname);
+      free(f->name);
+      free(f);
 
-                    f = head;
-                }
-                _pst_freeItem(item);
-                item = NULL; // just for the odd situations!
-                goto check_parent;
-            } else if (item->contact != NULL) {
-                // deal with a contact
-                // write them to the file, one per line in this format
-                // Desc Name <email@address>\n
-                if (mode == MODE_SEPERATE) {
-                    mk_seperate_file(f);
-                }
-                f->email_count++;
+      f = head;
+    }
+    _pst_freeItem(item);
+    item = NULL; // just for the odd situations!
+    goto check_parent;
+    // }}}2
+      } else if (item->contact != NULL) {
+    // Process Contact item {{{2
+    // deal with a contact
+    // write them to the file, one per line in this format
+    // Desc Name <email@address>\n
+    if (mode == MODE_SEPERATE) {
+      mk_seperate_file(f);
+    }
+    f->email_count++;
 
-                DEBUG_MAIN(("main: Processing Contact\n"));
-                if (f->type != PST_TYPE_CONTACT) {
-                    DEBUG_MAIN(("main: I have a contact, but the folder isn't a contacts folder. "
-                                  "Will process anyway\n"));
-                }
-                if (item->type != PST_TYPE_CONTACT) {
-                    DEBUG_MAIN(("main: I have an item that has contact info, but doesn't say that"
-                                  " it is a contact. Type is \"%s\"\n", item->ascii_type));
-                    DEBUG_MAIN(("main: Processing anyway\n"));
-                }
-                if (item->contact == NULL) { // this is an incorrect situation. Inform user
-                    DEBUG_MAIN(("main: ERROR. This contact has not been fully parsed. one of the pre-requisties is NULL\n"));
-                } else {
-                    if (contact_mode == CMODE_VCARD) {
-                        // the specification I am following is (hopefully) RFC2426 vCard Mime Directory Profile
-                        fprintf(f->output, "BEGIN:VCARD\n");
-                        fprintf(f->output, "FN:%s\n", rfc2426_escape(item->contact->fullname));
-                        fprintf(f->output, "N:%s;%s;%s;%s;%s\n",
-                                rfc2426_escape((item->contact->surname==NULL?"":item->contact->surname)),
-                                rfc2426_escape((item->contact->first_name==NULL?"":item->contact->first_name)),
-                                rfc2426_escape((item->contact->middle_name==NULL?"":item->contact->middle_name)),
-                                rfc2426_escape((item->contact->display_name_prefix==NULL?"":item->contact->display_name_prefix)),
-                                rfc2426_escape((item->contact->suffix==NULL?"":item->contact->suffix)));
-                        if (item->contact->nickname != NULL)
-                            fprintf(f->output, "NICKNAME:%s\n", rfc2426_escape(item->contact->nickname));
-                        if (item->contact->address1 != NULL)
-                            fprintf(f->output, "EMAIL:%s\n", rfc2426_escape(item->contact->address1));
-                        if (item->contact->address2 != NULL)
-                            fprintf(f->output, "EMAIL:%s\n", rfc2426_escape(item->contact->address2));
-                        if (item->contact->address3 != NULL)
-                            fprintf(f->output, "EMAIL:%s\n", rfc2426_escape(item->contact->address3));
-                        if (item->contact->birthday != NULL)
-                            fprintf(f->output, "BDAY:%s\n", rfc2425_datetime_format(item->contact->birthday));
-                        if (item->contact->home_address != NULL) {
-                            fprintf(f->output, "ADR;TYPE=home:%s;%s;%s;%s;%s;%s;%s\n",
-                                    rfc2426_escape((item->contact->home_po_box!=NULL?item->contact->home_po_box:"")),
-                                    "", // extended Address
-                                    rfc2426_escape((item->contact->home_street!=NULL?item->contact->home_street:"")),
-                                    rfc2426_escape((item->contact->home_city!=NULL?item->contact->home_city:"")),
-                                    rfc2426_escape((item->contact->home_state!=NULL?item->contact->home_state:"")),
-                                    rfc2426_escape((item->contact->home_postal_code!=NULL?item->contact->home_postal_code:"")),
-                                    rfc2426_escape((item->contact->home_country!=NULL?item->contact->home_country:"")));
-                            fprintf(f->output, "LABEL;TYPE=home:%s\n", rfc2426_escape(item->contact->home_address));
-                        }
-                        if (item->contact->business_address != NULL) {
-                            fprintf(f->output, "ADR;TYPE=work:%s;%s;%s;%s;%s;%s;%s\n",
-                                    rfc2426_escape((item->contact->business_po_box!=NULL?item->contact->business_po_box:"")),
-                                    "", // extended Address
-                                    rfc2426_escape((item->contact->business_street!=NULL?item->contact->business_street:"")),
-                                    rfc2426_escape((item->contact->business_city!=NULL?item->contact->business_city:"")),
-                                    rfc2426_escape((item->contact->business_state!=NULL?item->contact->business_state:"")),
-                                    rfc2426_escape((item->contact->business_postal_code!=NULL?item->contact->business_postal_code:"")),
-                                    rfc2426_escape((item->contact->business_country!=NULL?item->contact->business_country:"")));
-                            fprintf(f->output, "LABEL;TYPE=work:%s\n", rfc2426_escape(item->contact->business_address));
-                        }
-                        if (item->contact->other_address != NULL) {
-                            fprintf(f->output, "ADR;TYPE=postal:%s;%s;%s;%s;%s;%s;%s\n",
-                                    rfc2426_escape((item->contact->other_po_box!=NULL?item->contact->business_po_box:"")),
-                                    "", // extended Address
-                                    rfc2426_escape((item->contact->other_street!=NULL?item->contact->other_street:"")),
-                                    rfc2426_escape((item->contact->other_city!=NULL?item->contact->other_city:"")),
-                                    rfc2426_escape((item->contact->other_state!=NULL?item->contact->other_state:"")),
-                                    rfc2426_escape((item->contact->other_postal_code!=NULL?item->contact->other_postal_code:"")),
-                                    rfc2426_escape((item->contact->other_country!=NULL?item->contact->other_country:"")));
-                            fprintf(f->output, "ADR;TYPE=postal:%s\n", rfc2426_escape(item->contact->other_address));
-                        }
-                        if (item->contact->business_fax != NULL)
-                            fprintf(f->output, "TEL;TYPE=work,fax:%s\n", rfc2426_escape(item->contact->business_fax));
-                        if (item->contact->business_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=work,voice:%s\n", rfc2426_escape(item->contact->business_phone));
-                        if (item->contact->business_phone2 != NULL)
-                            fprintf(f->output, "TEL;TYPE=work,voice:%s\n", rfc2426_escape(item->contact->business_phone2));
-                        if (item->contact->car_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=car,voice:%s\n", rfc2426_escape(item->contact->car_phone));
-                        if (item->contact->home_fax != NULL)
-                            fprintf(f->output, "TEL;TYPE=home,fax:%s\n", rfc2426_escape(item->contact->home_fax));
-                        if (item->contact->home_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=home,voice:%s\n", rfc2426_escape(item->contact->home_phone));
-                        if (item->contact->home_phone2 != NULL)
-                            fprintf(f->output, "TEL;TYPE=home,voice:%s\n", rfc2426_escape(item->contact->home_phone2));
-                        if (item->contact->isdn_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=isdn:%s\n", rfc2426_escape(item->contact->isdn_phone));
-                        if (item->contact->mobile_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=cell,voice:%s\n", rfc2426_escape(item->contact->mobile_phone));
-                        if (item->contact->other_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=msg:%s\n", rfc2426_escape(item->contact->other_phone));
-                        if (item->contact->pager_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=pager:%s\n", rfc2426_escape(item->contact->pager_phone));
-                        if (item->contact->primary_fax != NULL)
-                            fprintf(f->output, "TEL;TYPE=fax,pref:%s\n", rfc2426_escape(item->contact->primary_fax));
-                        if (item->contact->primary_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=phone,pref:%s\n", rfc2426_escape(item->contact->primary_phone));
-                        if (item->contact->radio_phone != NULL)
-                            fprintf(f->output, "TEL;TYPE=pcs:%s\n", rfc2426_escape(item->contact->radio_phone));
-                        if (item->contact->telex != NULL)
-                            fprintf(f->output, "TEL;TYPE=bbs:%s\n", rfc2426_escape(item->contact->telex));
-                        if (item->contact->job_title != NULL)
-                            fprintf(f->output, "TITLE:%s\n", rfc2426_escape(item->contact->job_title));
-                        if (item->contact->profession != NULL)
-                            fprintf(f->output, "ROLE:%s\n", rfc2426_escape(item->contact->profession));
-                        if (item->contact->assistant_name != NULL || item->contact->assistant_phone != NULL) {
-                            fprintf(f->output, "AGENT:BEGIN:VCARD\\n");
-                            if (item->contact->assistant_name != NULL)
-                        fprintf(f->output, "FN:%s\\n", rfc2426_escape(item->contact->assistant_name));
-                            if (item->contact->assistant_phone != NULL)
-                        fprintf(f->output, "TEL:%s\\n", rfc2426_escape(item->contact->assistant_phone));
-                            fprintf(f->output, "END:VCARD\\n\n");
-                        }
-                        if (item->contact->company_name != NULL)
-                            fprintf(f->output, "ORG:%s\n", rfc2426_escape(item->contact->company_name));
-                        if (item->comment != NULL)
-                            fprintf(f->output, "NOTE:%s\n", rfc2426_escape(item->comment));
+    DEBUG_MAIN(("main: Processing Contact\n"));
+    if (f->type != PST_TYPE_CONTACT) {
+      DEBUG_MAIN(("main: I have a contact, but the folder isn't a contacts folder. "
+             "Will process anyway\n"));
+    }
+    if (item->type != PST_TYPE_CONTACT) {
+      DEBUG_MAIN(("main: I have an item that has contact info, but doesn't say that"
+             " it is a contact. Type is \"%s\"\n", item->ascii_type));
+      DEBUG_MAIN(("main: Processing anyway\n"));
+    }
+    if (item->contact == NULL) { // this is an incorrect situation. Inform user
+      DEBUG_MAIN(("main: ERROR. This contact has not been fully parsed. one of the pre-requisties is NULL\n"));
+    } else {
+      if (contact_mode == CMODE_VCARD) {
+        // the specification I am following is (hopefully) RFC2426 vCard Mime Directory Profile
+        fprintf(f->output, "BEGIN:VCARD\n");
+        fprintf(f->output, "FN:%s\n", rfc2426_escape(item->contact->fullname));
+        fprintf(f->output, "N:%s;%s;%s;%s;%s\n",
+            rfc2426_escape((item->contact->surname==NULL?"":item->contact->surname)),
+            rfc2426_escape((item->contact->first_name==NULL?"":item->contact->first_name)),
+            rfc2426_escape((item->contact->middle_name==NULL?"":item->contact->middle_name)),
+            rfc2426_escape((item->contact->display_name_prefix==NULL?"":item->contact->display_name_prefix)),
+            rfc2426_escape((item->contact->suffix==NULL?"":item->contact->suffix)));
+        if (item->contact->nickname != NULL)
+          fprintf(f->output, "NICKNAME:%s\n", rfc2426_escape(item->contact->nickname));
+        if (item->contact->address1 != NULL)
+          fprintf(f->output, "EMAIL:%s\n", rfc2426_escape(item->contact->address1));
+        if (item->contact->address2 != NULL)
+          fprintf(f->output, "EMAIL:%s\n", rfc2426_escape(item->contact->address2));
+        if (item->contact->address3 != NULL)
+          fprintf(f->output, "EMAIL:%s\n", rfc2426_escape(item->contact->address3));
+        if (item->contact->birthday != NULL)
+          fprintf(f->output, "BDAY:%s\n", rfc2425_datetime_format(item->contact->birthday));
+        if (item->contact->home_address != NULL) {
+          fprintf(f->output, "ADR;TYPE=home:%s;%s;%s;%s;%s;%s;%s\n",
+              rfc2426_escape((item->contact->home_po_box!=NULL?item->contact->home_po_box:"")),
+              "", // extended Address
+              rfc2426_escape((item->contact->home_street!=NULL?item->contact->home_street:"")),
+              rfc2426_escape((item->contact->home_city!=NULL?item->contact->home_city:"")),
+              rfc2426_escape((item->contact->home_state!=NULL?item->contact->home_state:"")),
+              rfc2426_escape((item->contact->home_postal_code!=NULL?item->contact->home_postal_code:"")),
+              rfc2426_escape((item->contact->home_country!=NULL?item->contact->home_country:"")));
+          fprintf(f->output, "LABEL;TYPE=home:%s\n", rfc2426_escape(item->contact->home_address));
+        }
+        if (item->contact->business_address != NULL) {
+          fprintf(f->output, "ADR;TYPE=work:%s;%s;%s;%s;%s;%s;%s\n",
+              rfc2426_escape((item->contact->business_po_box!=NULL?item->contact->business_po_box:"")),
+              "", // extended Address
+              rfc2426_escape((item->contact->business_street!=NULL?item->contact->business_street:"")),
+              rfc2426_escape((item->contact->business_city!=NULL?item->contact->business_city:"")),
+              rfc2426_escape((item->contact->business_state!=NULL?item->contact->business_state:"")),
+              rfc2426_escape((item->contact->business_postal_code!=NULL?item->contact->business_postal_code:"")),
+              rfc2426_escape((item->contact->business_country!=NULL?item->contact->business_country:"")));
+          fprintf(f->output, "LABEL;TYPE=work:%s\n", rfc2426_escape(item->contact->business_address));
+        }
+        if (item->contact->other_address != NULL) {
+          fprintf(f->output, "ADR;TYPE=postal:%s;%s;%s;%s;%s;%s;%s\n",
+              rfc2426_escape((item->contact->other_po_box!=NULL?item->contact->business_po_box:"")),
+              "", // extended Address
+              rfc2426_escape((item->contact->other_street!=NULL?item->contact->other_street:"")),
+              rfc2426_escape((item->contact->other_city!=NULL?item->contact->other_city:"")),
+              rfc2426_escape((item->contact->other_state!=NULL?item->contact->other_state:"")),
+              rfc2426_escape((item->contact->other_postal_code!=NULL?item->contact->other_postal_code:"")),
+              rfc2426_escape((item->contact->other_country!=NULL?item->contact->other_country:"")));
+          fprintf(f->output, "ADR;TYPE=postal:%s\n", rfc2426_escape(item->contact->other_address));
+        }
+        if (item->contact->business_fax != NULL)
+          fprintf(f->output, "TEL;TYPE=work,fax:%s\n", rfc2426_escape(item->contact->business_fax));
+        if (item->contact->business_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=work,voice:%s\n", rfc2426_escape(item->contact->business_phone));
+        if (item->contact->business_phone2 != NULL)
+          fprintf(f->output, "TEL;TYPE=work,voice:%s\n", rfc2426_escape(item->contact->business_phone2));
+        if (item->contact->car_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=car,voice:%s\n", rfc2426_escape(item->contact->car_phone));
+        if (item->contact->home_fax != NULL)
+          fprintf(f->output, "TEL;TYPE=home,fax:%s\n", rfc2426_escape(item->contact->home_fax));
+        if (item->contact->home_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=home,voice:%s\n", rfc2426_escape(item->contact->home_phone));
+        if (item->contact->home_phone2 != NULL)
+          fprintf(f->output, "TEL;TYPE=home,voice:%s\n", rfc2426_escape(item->contact->home_phone2));
+        if (item->contact->isdn_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=isdn:%s\n", rfc2426_escape(item->contact->isdn_phone));
+        if (item->contact->mobile_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=cell,voice:%s\n", rfc2426_escape(item->contact->mobile_phone));
+        if (item->contact->other_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=msg:%s\n", rfc2426_escape(item->contact->other_phone));
+        if (item->contact->pager_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=pager:%s\n", rfc2426_escape(item->contact->pager_phone));
+        if (item->contact->primary_fax != NULL)
+          fprintf(f->output, "TEL;TYPE=fax,pref:%s\n", rfc2426_escape(item->contact->primary_fax));
+        if (item->contact->primary_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=phone,pref:%s\n", rfc2426_escape(item->contact->primary_phone));
+        if (item->contact->radio_phone != NULL)
+          fprintf(f->output, "TEL;TYPE=pcs:%s\n", rfc2426_escape(item->contact->radio_phone));
+        if (item->contact->telex != NULL)
+          fprintf(f->output, "TEL;TYPE=bbs:%s\n", rfc2426_escape(item->contact->telex));
+        if (item->contact->job_title != NULL)
+          fprintf(f->output, "TITLE:%s\n", rfc2426_escape(item->contact->job_title));
+        if (item->contact->profession != NULL)
+          fprintf(f->output, "ROLE:%s\n", rfc2426_escape(item->contact->profession));
+        if (item->contact->assistant_name != NULL || item->contact->assistant_phone != NULL) {
+          fprintf(f->output, "AGENT:BEGIN:VCARD\\n");
+          if (item->contact->assistant_name != NULL)
+        fprintf(f->output, "FN:%s\\n", rfc2426_escape(item->contact->assistant_name));
+          if (item->contact->assistant_phone != NULL)
+        fprintf(f->output, "TEL:%s\\n", rfc2426_escape(item->contact->assistant_phone));
+          fprintf(f->output, "END:VCARD\\n\n");
+        }
+        if (item->contact->company_name != NULL)
+          fprintf(f->output, "ORG:%s\n", rfc2426_escape(item->contact->company_name));
+        if (item->comment != NULL)
+          fprintf(f->output, "NOTE:%s\n", rfc2426_escape(item->comment));
 
-                        fprintf(f->output, "VERSION: 3.0\n");
-                        fprintf(f->output, "END:VCARD\n\n");
-                    } else {
-                        fprintf(f->output, "%s <%s>\n", item->contact->fullname, item->contact->address1);
-                    }
-                        }
-            } else if (item->email != NULL && (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) {
-                if (mode == MODE_SEPERATE) {
-                    mk_seperate_file(f);
-                }
-
-                f->email_count++;
+        fprintf(f->output, "VERSION: 3.0\n");
+        fprintf(f->output, "END:VCARD\n\n");
+      } else {
+        fprintf(f->output, "%s <%s>\n", item->contact->fullname, item->contact->address1);
+      }
+        }
+    // }}}2
+      } else if (item->email != NULL &&
+         (item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) {
+    // Process Email item {{{2
+    if (mode == MODE_SEPERATE) {
+      mk_seperate_file(f);
+    }
 
-                DEBUG_MAIN(("main: seen an email\n"));
+    f->email_count++;
+
+    DEBUG_MAIN(("main: seen an email\n"));
 
-                // convert the sent date if it exists, or set it to a fixed date
-                if (item->email->sent_date != NULL) {
-                    em_time = fileTimeToUnixTime(item->email->sent_date, 0);
-                    c_time = ctime(&em_time);
-                    if (c_time != NULL)
-                        c_time[strlen(c_time)-1] = '\0'; //remove end \n
-                    else
-                        c_time = "Fri Dec 28 12:06:21 2001";
-                } else
-                    c_time= "Fri Dec 28 12:06:21 2001";
+    // convert the sent date if it exists, or set it to a fixed date
+    if (item->email->sent_date != NULL) {
+      em_time = fileTimeToUnixTime(item->email->sent_date, 0);
+      c_time = ctime(&em_time);
+      if (c_time != NULL)
+        c_time[strlen(c_time)-1] = '\0'; //remove end \n
+      else
+        c_time = "Fri Dec 28 12:06:21 2001";
+    } else
+      c_time= "Fri Dec 28 12:06:21 2001";
 
-                // if the boundary is still set from the previous run, then free it
-                if (boundary != NULL) {
-                    free (boundary);
-                    boundary = NULL;
-                }
+    // if the boundary is still set from the previous run, then free it
+    if (boundary != NULL) {
+      free (boundary);
+      boundary = NULL;
+    }
 
-                // we will always look at the header to discover some stuff
-                if (item->email->header != NULL ) {
-                    // see if there is a boundary variable there
-                    // this search MUST be made case insensitive (DONE).
-                    // Also, some check to find out if we
-                    // are looking at the boundary associated with content-type, and that the content
-                    // type really is "multipart"
-                    if ((b2 = my_stristr(item->email->header, "boundary=")) != NULL) {
-                        b2 += strlen("boundary="); // move boundary to first char of marker
+    // we will always look at the header to discover some stuff
+    if (item->email->header != NULL ) {
+      // see if there is a boundary variable there
+      // this search MUST be made case insensitive (DONE).
+      // Also, some check to find out if we
+      // are looking at the boundary associated with content-type, and that the content
+      // type really is "multipart"
+      if ((b2 = my_stristr(item->email->header, "boundary=")) != NULL) {
+        b2 += strlen("boundary="); // move boundary to first char of marker
 
-                        if (*b2 == '"') {
-                            b2++;
-                            b1 = strchr(b2, '"'); // find terminating quote
-                        } else {
-                            b1 = b2;
-                            while (isgraph(*b1)) // find first char that isn't part of boundary
-                        b1++;
-                        }
+        if (*b2 == '"') {
+          b2++;
+          b1 = strchr(b2, '"'); // find terminating quote
+        } else {
+          b1 = b2;
+          while (isgraph(*b1)) // find first char that isn't part of boundary
+        b1++;
+        }
 
-                        boundary = malloc ((b1-b2)+1); //malloc that length
-                        memset (boundary, 0, (b1-b2)+1);  // blank it
-                        strncpy(boundary, b2, b1-b2); // copy boundary to another variable
-                        b1 = b2 = boundary;
-                        while (*b2 != '\0') { // remove any CRs and Tabs
-                            if (*b2 != '\n' && *b2 != '\r' && *b2 != '\t') {
-                        *b1 = *b2;
-                        b1++;
-                            }
-                            b2++;
-                        }
-                        *b1 = '\0';
+        boundary = malloc ((b1-b2)+1); //malloc that length
+        memset (boundary, 0, (b1-b2)+1);  // blank it
+        strncpy(boundary, b2, b1-b2); // copy boundary to another variable
+        b1 = b2 = boundary;
+        while (*b2 != '\0') { // remove any CRs and Tabs
+          if (*b2 != '\n' && *b2 != '\r' && *b2 != '\t') {
+        *b1 = *b2;
+        b1++;
+          }
+          b2++;
+        }
+        *b1 = '\0';
 
-                        DEBUG_MAIN(("main: Found boundary of - %s\n", boundary));
-                    } else {
+        DEBUG_MAIN(("main: Found boundary of - %s\n", boundary));
+      } else {
 
-                        DEBUG_MAIN(("main: boundary not found in header\n"));
-                    }
+        DEBUG_MAIN(("main: boundary not found in header\n"));
+      }
 
-                    // also possible to set 7bit encoding detection here.
-                    if ((b2 = my_stristr(item->email->header, "Content-Transfer-Encoding:")) != NULL) {
-                        if ((b2 = strchr(b2, ':')) != NULL) {
-                            b2++; // skip to the : at the end of the string
+      // also possible to set 7bit encoding detection here.
+      if ((b2 = my_stristr(item->email->header, "Content-Transfer-Encoding:")) != NULL) {
+        if ((b2 = strchr(b2, ':')) != NULL) {
+          b2++; // skip to the : at the end of the string
 
-                            while (*b2 == ' ' || *b2 == '\t')
-                        b2++;
-                            if (pst_strincmp(b2, "base64", 6)==0) {
-                        DEBUG_MAIN(("body is base64 encoded\n"));
-                        base64_body = 1;
-                            }
-                        } else {
-                            DEBUG_WARN(("found a ':' during the my_stristr, but not after that..\n"));
-                        }
-                    }
+          while (*b2 == ' ' || *b2 == '\t')
+        b2++;
+          if (pst_strincmp(b2, "base64", 6)==0) {
+        DEBUG_MAIN(("body is base64 encoded\n"));
+        base64_body = 1;
+          }
+        } else {
+          DEBUG_WARN(("found a ':' during the my_stristr, but not after that..\n"));
+        }
+      }
 
-                }
-                if (boundary == NULL && (item->attach ||(item->email->body && item->email->htmlbody)
-                                          || item->email->rtf_compressed || item->email->encrypted_body
-                                          || item->email->encrypted_htmlbody)) {
-                    // we need to create a boundary here.
-                    DEBUG_EMAIL(("main: must create own boundary. oh dear.\n"));
-                    boundary = malloc(50 * sizeof(char)); // allow 50 chars for boundary
-                    boundary[0] = '\0';
-                    sprintf(boundary, "--boundary-LibPST-iamunique-%i_-_-", rand());
-                    DEBUG_EMAIL(("main: created boundary is %s\n", boundary));
-                }
+    }
+    if (boundary == NULL && (item->attach ||(item->email->body && item->email->htmlbody)
+                 || item->email->rtf_compressed || item->email->encrypted_body
+                 || item->email->encrypted_htmlbody)) {
+      // we need to create a boundary here.
+      DEBUG_EMAIL(("main: must create own boundary. oh dear.\n"));
+      boundary = malloc(50 * sizeof(char)); // allow 50 chars for boundary
+      boundary[0] = '\0';
+      sprintf(boundary, "--boundary-LibPST-iamunique-%i_-_-", rand());
+      DEBUG_EMAIL(("main: created boundary is %s\n", boundary));
+    }
 
-                DEBUG_MAIN(("main: About to print Header\n"));
+    DEBUG_MAIN(("main: About to print Header\n"));
 
-                if (item != NULL && item->email != NULL && item->email->subject != NULL &&
-                        item->email->subject->subj != NULL) {
-                    DEBUG_EMAIL(("item->email->subject->subj = %p\n", item->email->subject->subj));
-                }
-                if (item->email->header != NULL) {
-                    // some of the headers we get from the file are not properly defined.
-                    // they can contain some email stuff too. We will cut off the header
-                    // when we see a \n\n or \r\n\r\n
+    if (item != NULL && item->email != NULL && item->email->subject != NULL &&
+        item->email->subject->subj != NULL) {
+      DEBUG_EMAIL(("item->email->subject->subj = %p\n", item->email->subject->subj));
+    }
+    if (item->email->header != NULL) {
+      // some of the headers we get from the file are not properly defined.
+      // they can contain some email stuff too. We will cut off the header
+      // when we see a \n\n or \r\n\r\n
 
-                    removeCR(item->email->header);
+      removeCR(item->email->header);
 
-                    temp = strstr(item->email->header, "\n\n");
+      temp = strstr(item->email->header, "\n\n");
 
-                    if (temp != NULL) {
-                        DEBUG_MAIN(("main: Found body text in header\n"));
-                        temp += 2; // get past the \n\n
-                        *temp = '\0';
-                    }
+      if (temp != NULL) {
+        DEBUG_MAIN(("main: Found body text in header\n"));
+        temp += 2; // get past the \n\n
+        *temp = '\0';
+      }
 
-                    if (mode != MODE_SEPERATE) {
-                        // don't put rubbish in if we are doing seperate
-                        fprintf(f->output, "From \"%s\" %s\n%s\n",
-                                item->email->outlook_sender_name, c_time, item->email->header);
-                        fprintf(f->output, "\n");
-                    } else {
-                        fprintf(f->output, "%s\n", item->email->header);
-                    }
-                } else {
-                    //make up our own header!
-                    if (mode != MODE_SEPERATE) {
-                        // don't want this first line for this mode
-                        if (item->email->outlook_sender_name != NULL) {
-                            temp = item->email->outlook_sender_name;
-                        } else {
-                            temp = "(readpst_null)";
-                        }
-                        fprintf(f->output, "From \"%s\" %s\n", temp, c_time);
-                    }
-                    if ((temp = item->email->outlook_sender) == NULL)
-                        temp = "";
-                    fprintf(f->output, "From: \"%s\" <%s>\n", item->email->outlook_sender_name, temp);
-                    if (item->email->subject != NULL) {
-                        fprintf(f->output, "Subject: %s\n", item->email->subject->subj);
-                    } else {
-                        fprintf(f->output, "Subject: \n");
-                    }
-                    fprintf(f->output, "To: %s\n", item->email->sentto_address);
-                    if (item->email->cc_address != NULL) {
-                        fprintf(f->output, "CC: %s\n", item->email->cc_address);
-                    }
-                    if (item->email->sent_date != NULL) {
-                        c_time = (char*) xmalloc(C_TIME_SIZE);
-                        strftime(c_time, C_TIME_SIZE, "%a, %d %b %Y %H:%M:%S %z", gmtime(&em_time));
-                        fprintf(f->output, "Date: %s\n", c_time);
-                        free(c_time);
-                    }
+      if (mode != MODE_SEPERATE) {
+        char *soh = NULL;  // real start of headers.
+        // don't put rubbish in if we are doing seperate
+        fprintf(f->output, "From \"%s\" %s\n", item->email->outlook_sender_name, c_time);
+        soh = skip_header_prologue(item->email->header);
+        fprintf(f->output, "%s\n\n", soh);
+      } else {
+        fprintf(f->output, "%s\n", item->email->header);
+      }
+    } else {
+      //make up our own header!
+      if (mode != MODE_SEPERATE) {
+        // don't want this first line for this mode
+        if (item->email->outlook_sender_name != NULL) {
+          temp = item->email->outlook_sender_name;
+        } else {
+          temp = "(readpst_null)";
+        }
+        fprintf(f->output, "From \"%s\" %s\n", temp, c_time);
+      }
+      if ((temp = item->email->outlook_sender) == NULL)
+        temp = "";
+      fprintf(f->output, "From: \"%s\" <%s>\n", item->email->outlook_sender_name, temp);
+      if (item->email->subject != NULL) {
+        fprintf(f->output, "Subject: %s\n", item->email->subject->subj);
+      } else {
+        fprintf(f->output, "Subject: \n");
+      }
+      fprintf(f->output, "To: %s\n", item->email->sentto_address);
+      if (item->email->cc_address != NULL) {
+        fprintf(f->output, "CC: %s\n", item->email->cc_address);
+      }
+      if (item->email->sent_date != NULL) {
+        c_time = (char*) xmalloc(C_TIME_SIZE);
+        strftime(c_time, C_TIME_SIZE, "%a, %d %b %Y %H:%M:%S %z", gmtime(&em_time));
+        fprintf(f->output, "Date: %s\n", c_time);
+        free(c_time);
+      }
 
-                    fprintf(f->output, "MIME-Version: 1.0\n");
-                    if (item->attach != NULL) {
-                        // write the boundary stuff if we have attachments
-                        fprintf(f->output, "Content-type: multipart/mixed;\n\tboundary=\"%s\"\n",
-                                boundary);
-                    } else if (item->email->htmlbody && item->email->body) {
-                        // else if we have an html and text body then tell it so
-                        fprintf(f->output, "Content-type: multipart/alternate;\n\tboundary=\"%s\"\n",
-                                boundary);
-                    } else if (item->email->htmlbody) {
-                        fprintf(f->output, "Content-type: text/html\n");
-                    }
-                    fprintf(f->output, "\n");
-                }
+      fprintf(f->output, "MIME-Version: 1.0\n");
+      if (item->attach != NULL) {
+        // write the boundary stuff if we have attachments
+        fprintf(f->output, "Content-type: multipart/mixed;\n\tboundary=\"%s\"\n",
+            boundary);
+      } else if (item->email->htmlbody && item->email->body) {
+        // else if we have an html and text body then tell it so
+        fprintf(f->output, "Content-type: multipart/alternate;\n\tboundary=\"%s\"\n",
+            boundary);
+      } else if (item->email->htmlbody) {
+        fprintf(f->output, "Content-type: text/html\n");
+      }
+      fprintf(f->output, "\n");
+    }
 
 
-                DEBUG_MAIN(("main: About to print Body\n"));
+    DEBUG_MAIN(("main: About to print Body\n"));
 
-                if (item->email->body != NULL) {
-                    if (boundary) {
-                        fprintf(f->output, "\n--%s\n", boundary);
-                        fprintf(f->output, "Content-type: text/plain\n\n");
-                        if (base64_body)
-                            fprintf(f->output, "Content-Transfer-Encoding: base64\n");
-                    }
-                    removeCR(item->email->body);
-                    if (base64_body)
-                        write_email_body(f->output, base64_encode(item->email->body,
-                                                                    strlen(item->email->body)));
-                    else
-                        write_email_body(f->output, item->email->body);
-                }
+    if (item->email->body != NULL) {
+      if (boundary) {
+        fprintf(f->output, "\n--%s\n", boundary);
+        fprintf(f->output, "Content-type: text/plain\n\n");
+        if (base64_body)
+          fprintf(f->output, "Content-Transfer-Encoding: base64\n");
+      }
+      removeCR(item->email->body);
+      if (base64_body)
+        write_email_body(f->output, base64_encode(item->email->body,
+                              strlen(item->email->body)));
+      else
+        write_email_body(f->output, item->email->body);
+    }
 
-                if (item->email->htmlbody != NULL) {
-                    if (boundary) {
-                        fprintf(f->output, "\n--%s\n", boundary);
-                        fprintf(f->output, "Content-type: text/html\n\n");
-                        if (base64_body)
-                            fprintf(f->output, "Content-Transfer-Encoding: base64\n");
-                    }
-                    removeCR(item->email->htmlbody);
-                    if (base64_body)
-                        write_email_body(f->output, base64_encode(item->email->htmlbody,
-                                                                    strlen(item->email->htmlbody)));
-                    else
-                        write_email_body(f->output, item->email->htmlbody);
-                }
+    if (item->email->htmlbody != NULL) {
+      if (boundary) {
+        fprintf(f->output, "\n--%s\n", boundary);
+        fprintf(f->output, "Content-type: text/html\n\n");
+        if (base64_body)
+          fprintf(f->output, "Content-Transfer-Encoding: base64\n");
+      }
+      removeCR(item->email->htmlbody);
+      if (base64_body)
+        write_email_body(f->output, base64_encode(item->email->htmlbody,
+                              strlen(item->email->htmlbody)));
+      else
+        write_email_body(f->output, item->email->htmlbody);
+    }
 
-                attach_num = 0;
+    attach_num = 0;
 
-                if (item->email->rtf_compressed != NULL) {
-                    DEBUG_MAIN(("Adding RTF body as attachment\n"));
-                    item->current_attach = (pst_item_attach*)xmalloc(sizeof(pst_item_attach));
-                    memset(item->current_attach, 0, sizeof(pst_item_attach));
-                    item->current_attach->next = item->attach;
-                    item->attach = item->current_attach;
-                    item->current_attach->data = lzfu_decompress(item->email->rtf_compressed);
-                    item->current_attach->filename2 = xmalloc(strlen(RTF_ATTACH_NAME)+2);
-                    strcpy(item->current_attach->filename2, RTF_ATTACH_NAME);
-                    item->current_attach->mimetype = xmalloc(strlen(RTF_ATTACH_TYPE)+2);
-                    strcpy(item->current_attach->mimetype, RTF_ATTACH_TYPE);
-                    memcpy(&(item->current_attach->size), item->email->rtf_compressed+sizeof(int32_t), sizeof(int32_t));
-                    LE32_CPU(item->current_attach->size);
-                    //      item->email->rtf_compressed = ;
-                    //      attach_num++;
-                }
-                if (item->email->encrypted_body || item->email->encrypted_htmlbody) {
-                    // if either the body or htmlbody is encrypted, add them as attachments
-                    if (item->email->encrypted_body) {
-                        DEBUG_MAIN(("Adding Encrypted Body as attachment\n"));
-                        item->current_attach = (pst_item_attach*) xmalloc(sizeof(pst_item_attach));
-                        memset(item->current_attach, 0, sizeof(pst_item_attach));
-                        item->current_attach->next = item->attach;
-                        item->attach = item->current_attach;
+    if (item->email->rtf_compressed != NULL) {
+      DEBUG_MAIN(("Adding RTF body as attachment\n"));
+      item->current_attach = (pst_item_attach*)xmalloc(sizeof(pst_item_attach));
+      memset(item->current_attach, 0, sizeof(pst_item_attach));
+      item->current_attach->next = item->attach;
+      item->attach = item->current_attach;
+      item->current_attach->data = lzfu_decompress(item->email->rtf_compressed);
+      item->current_attach->filename2 = xmalloc(strlen(RTF_ATTACH_NAME)+2);
+      strcpy(item->current_attach->filename2, RTF_ATTACH_NAME);
+      item->current_attach->mimetype = xmalloc(strlen(RTF_ATTACH_TYPE)+2);
+      strcpy(item->current_attach->mimetype, RTF_ATTACH_TYPE);
+      memcpy(&(item->current_attach->size), item->email->rtf_compressed+sizeof(int32_t), sizeof(int32_t));
+      LE32_CPU(item->current_attach->size);
+      //      item->email->rtf_compressed = ;
+      //      attach_num++;
+    }
+    if (item->email->encrypted_body || item->email->encrypted_htmlbody) {
+      // if either the body or htmlbody is encrypted, add them as attachments
+      if (item->email->encrypted_body) {
+        DEBUG_MAIN(("Adding Encrypted Body as attachment\n"));
+        item->current_attach = (pst_item_attach*) xmalloc(sizeof(pst_item_attach));
+        memset(item->current_attach, 0, sizeof(pst_item_attach));
+        item->current_attach->next = item->attach;
+        item->attach = item->current_attach;
 
-                        item->current_attach->data = item->email->encrypted_body;
-                        item->current_attach->size = item->email->encrypted_body_size;
-                        item->email->encrypted_body = NULL;
-                    }
-                    if (item->email->encrypted_htmlbody) {
-                        DEBUG_MAIN(("Adding encrypted HTML body as attachment\n"));
-                        item->current_attach = (pst_item_attach*) xmalloc(sizeof(pst_item_attach));
-                        memset(item->current_attach, 0, sizeof(pst_item_attach));
-                        item->current_attach->next = item->attach;
-                        item->attach = item->current_attach;
+        item->current_attach->data = item->email->encrypted_body;
+        item->current_attach->size = item->email->encrypted_body_size;
+        item->email->encrypted_body = NULL;
+      }
+      if (item->email->encrypted_htmlbody) {
+        DEBUG_MAIN(("Adding encrypted HTML body as attachment\n"));
+        item->current_attach = (pst_item_attach*) xmalloc(sizeof(pst_item_attach));
+        memset(item->current_attach, 0, sizeof(pst_item_attach));
+        item->current_attach->next = item->attach;
+        item->attach = item->current_attach;
 
-                        item->current_attach->data = item->email->encrypted_htmlbody;
-                        item->current_attach->size = item->email->encrypted_htmlbody_size;
-                        item->email->encrypted_htmlbody = NULL;
-                    }
-                    write_email_body(f->output, "The body of this email is encrypted. This isn't supported yet, but the body is now an attachment\n");
-                }
-                base64_body = 0;
-                // attachments
-                item->current_attach = item->attach;
-                while (item->current_attach != NULL) {
-                    DEBUG_MAIN(("main: Attempting Attachment encoding\n"));
-                    if (item->current_attach->data == NULL) {
-                        DEBUG_MAIN(("main: Data of attachment is NULL!. Size is supposed to be %i\n", item->current_attach->size));
-                    }
-                    if (mode == MODE_SEPERATE) {
-                        f->name = check_filename(f->name);
-                        if (item->current_attach->filename2 == NULL) {
-                            temp = xmalloc(strlen(f->name)+15);
-                            sprintf(temp, "%s-attach%i", f->name, attach_num);
-                        } else {
-                            temp = xmalloc(strlen(f->name)+strlen(item->current_attach->filename2)+15);
-                            fp = NULL; x=0;
-                            do {
-                        if (fp != NULL) fclose(fp);
-                        if (x == 0)
-                            sprintf(temp, "%s-%s", f->name, item->current_attach->filename2);
-                        else
-                            sprintf(temp, "%s-%s-%i", f->name, item->current_attach->filename2, x);
-                            } while ((fp = fopen(temp, "r"))!=NULL && ++x < 99999999);
-                            if (x > 99999999) {
-                                DIE(("error finding attachment name. exhausted possibilities to %s\n", temp));
-                            }
-                        }
-                        DEBUG_MAIN(("main: Saving attachment to %s\n", temp));
-                        if ((fp = fopen(temp, "w")) == NULL) {
-                            WARN(("main: Cannot open attachment save file \"%s\"\n", temp));
-                        } else {
-                            if (item->current_attach->data != NULL)
-                        fwrite(item->current_attach->data, 1, item->current_attach->size, fp);
-                            else {
-                        pst_attach_to_file(&pstfile, item->current_attach, fp);
-                            }
-                            fclose(fp);
-                        }
-                    } else {
-                        DEBUG_MAIN(("main: Attachment Size is %i\n", item->current_attach->size));
-                        DEBUG_MAIN(("main: Attachment Pointer is %p\n", item->current_attach->data));
-                        if (item->current_attach->data != NULL) {
-                            if ((enc = base64_encode (item->current_attach->data, item->current_attach->size)) == NULL) {
-                        DEBUG_MAIN(("main: ERROR base64_encode returned NULL. Must have failed\n"));
-                        item->current_attach = item->current_attach->next;
-                        continue;
-                            }
-                        }
-                        if (boundary) {
-                            fprintf(f->output, "\n--%s\n", boundary);
-                            if (item->current_attach->mimetype == NULL) {
-                        fprintf(f->output, "Content-type: %s\n", MIME_TYPE_DEFAULT);
-                            } else {
-                        fprintf(f->output, "Content-type: %s\n", item->current_attach->mimetype);
-                            }
-                            fprintf(f->output, "Content-transfer-encoding: base64\n");
-                            if (item->current_attach->filename2 == NULL) {
-                        fprintf(f->output, "Content-Disposition: inline\n\n");
-                            } else {
-                        fprintf(f->output, "Content-Disposition: attachment; filename=\"%s\"\n\n",
-                                item->current_attach->filename2);
-                            }
-                        }
-                        if (item->current_attach->data != NULL) {
-                            fwrite(enc, 1, strlen(enc), f->output);
-                            DEBUG_MAIN(("Attachment Size after encoding is %i\n", strlen(enc)));
-                        } else {
-                            pst_attach_to_file_base64(&pstfile, item->current_attach, f->output);
-                        }
-                        fprintf(f->output, "\n\n");
-                    }
-                    item->current_attach = item->current_attach->next;
-                    attach_num++;
-                }
-                if (mode != MODE_SEPERATE) {
-                    DEBUG_MAIN(("main: Writing buffer between emails\n"));
-                    if (boundary)
-                        fprintf(f->output, "\n--%s--\n", boundary);
-                    fprintf(f->output, "\n\n");
-                }
-            } else if (item->type == PST_TYPE_JOURNAL) {
-                // deal with journal items
-                if (mode == MODE_SEPERATE) {
-                    mk_seperate_file(f);
-                }
-                f->email_count++;
-
-                DEBUG_MAIN(("main: Processing Journal Entry\n"));
-                if (f->type != PST_TYPE_JOURNAL) {
-                    DEBUG_MAIN(("main: I have a journal entry, but folder isn't specified as a journal type. Processing...\n"));
-                }
-
-                /*  if (item->type != PST_TYPE_JOURNAL) {
-                    DEBUG_MAIN(("main: I have an item with journal info, but it's type is \"%s\" \n. Processing...\n",
-                                    item->ascii_type));
-                }*/
-                fprintf(f->output, "BEGIN:VJOURNAL\n");
-                if (item->email->subject != NULL)
-                    fprintf(f->output, "SUMMARY:%s\n", rfc2426_escape(item->email->subject->subj));
-                if (item->email->body != NULL)
-                    fprintf(f->output, "DESCRIPTION:%s\n", rfc2426_escape(item->email->body));
-                if (item->journal->start != NULL)
-                    fprintf(f->output, "DTSTART;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->journal->start));
-                fprintf(f->output, "END:VJOURNAL\n\n");
-
-            } else if (item->type == PST_TYPE_APPOINTMENT) {
-                // deal with Calendar appointments
-                if (mode == MODE_SEPERATE) {
-                    mk_seperate_file(f);
-                }
-                f->email_count++;
+        item->current_attach->data = item->email->encrypted_htmlbody;
+        item->current_attach->size = item->email->encrypted_htmlbody_size;
+        item->email->encrypted_htmlbody = NULL;
+      }
+      write_email_body(f->output, "The body of this email is encrypted. This isn't supported yet, but the body is now an attachment\n");
+    }
+    base64_body = 0;
+    // attachments
+    item->current_attach = item->attach;
+    while (item->current_attach != NULL) {
+      DEBUG_MAIN(("main: Attempting Attachment encoding\n"));
+      if (item->current_attach->data == NULL) {
+        DEBUG_MAIN(("main: Data of attachment is NULL!. Size is supposed to be %i\n", item->current_attach->size));
+      }
+      if (mode == MODE_SEPERATE) {
+        f->name = check_filename(f->name);
+        if (item->current_attach->filename2 == NULL) {
+          temp = xmalloc(strlen(f->name)+15);
+          sprintf(temp, "%s-attach%i", f->name, attach_num);
+        } else {
+          temp = xmalloc(strlen(f->name)+strlen(item->current_attach->filename2)+15);
+          fp = NULL; x=0;
+          do {
+        if (fp != NULL) fclose(fp);
+        if (x == 0)
+          sprintf(temp, "%s-%s", f->name, item->current_attach->filename2);
+        else
+          sprintf(temp, "%s-%s-%i", f->name, item->current_attach->filename2, x);
+          } while ((fp = fopen(temp, "r"))!=NULL && ++x < 99999999);
+          if (x > 99999999) {
+            DIE(("error finding attachment name. exhausted possibilities to %s\n", temp));
+          }
+        }
+        DEBUG_MAIN(("main: Saving attachment to %s\n", temp));
+        if ((fp = fopen(temp, "w")) == NULL) {
+          WARN(("main: Cannot open attachment save file \"%s\"\n", temp));
+        } else {
+          if (item->current_attach->data != NULL)
+        fwrite(item->current_attach->data, 1, item->current_attach->size, fp);
+          else {
+        pst_attach_to_file(&pstfile, item->current_attach, fp);
+          }
+          fclose(fp);
+        }
+      } else {
+        DEBUG_MAIN(("main: Attachment Size is %i\n", item->current_attach->size));
+        DEBUG_MAIN(("main: Attachment Pointer is %p\n", item->current_attach->data));
+        if (item->current_attach->data != NULL) {
+          if ((enc = base64_encode (item->current_attach->data, item->current_attach->size)) == NULL) {
+        DEBUG_MAIN(("main: ERROR base64_encode returned NULL. Must have failed\n"));
+        item->current_attach = item->current_attach->next;
+        continue;
+          }
+        }
+        if (boundary) {
+          fprintf(f->output, "\n--%s\n", boundary);
+          if (item->current_attach->mimetype == NULL) {
+        fprintf(f->output, "Content-type: %s\n", MIME_TYPE_DEFAULT);
+          } else {
+        fprintf(f->output, "Content-type: %s\n", item->current_attach->mimetype);
+          }
+          fprintf(f->output, "Content-transfer-encoding: base64\n");
+          if (item->current_attach->filename2 == NULL) {
+        fprintf(f->output, "Content-Disposition: inline\n\n");
+          } else {
+        fprintf(f->output, "Content-Disposition: attachment; filename=\"%s\"\n\n",
+            item->current_attach->filename2);
+          }
+        }
+        if (item->current_attach->data != NULL) {
+          fwrite(enc, 1, strlen(enc), f->output);
+          DEBUG_MAIN(("Attachment Size after encoding is %i\n", strlen(enc)));
+        } else {
+          pst_attach_to_file_base64(&pstfile, item->current_attach, f->output);
+        }
+        fprintf(f->output, "\n\n");
+      }
+      item->current_attach = item->current_attach->next;
+      attach_num++;
+    }
+    if (mode != MODE_SEPERATE) {
+      DEBUG_MAIN(("main: Writing buffer between emails\n"));
+      if (boundary)
+        fprintf(f->output, "\n--%s--\n", boundary);
+      fprintf(f->output, "\n\n");
+    }
+    // }}}2
+      } else if (item->type == PST_TYPE_JOURNAL) {
+    // Process Journal item {{{2
+    // deal with journal items
+    if (mode == MODE_SEPERATE) {
+      mk_seperate_file(f);
+    }
+    f->email_count++;
 
-                DEBUG_MAIN(("main: Processing Appointment Entry\n"));
-                if (f->type != PST_TYPE_APPOINTMENT) {
-                    DEBUG_MAIN(("main: I have an appointment, but folder isn't specified as an appointment type. Processing...\n"));
-                }
-                fprintf(f->output, "BEGIN:VEVENT\n");
-                if (item->create_date != NULL)
-                    fprintf(f->output, "CREATED:%s\n", rfc2445_datetime_format(item->create_date));
-                if (item->modify_date != NULL)
-                    fprintf(f->output, "LAST-MOD:%s\n", rfc2445_datetime_format(item->modify_date));
-                if (item->email != NULL && item->email->subject != NULL)
-                    fprintf(f->output, "SUMMARY:%s\n", rfc2426_escape(item->email->subject->subj));
-                if (item->email != NULL && item->email->body != NULL)
-                    fprintf(f->output, "DESCRIPTION:%s\n", rfc2426_escape(item->email->body));
-                if (item->appointment != NULL && item->appointment->start != NULL)
-                    fprintf(f->output, "DTSTART;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->start));
-                if (item->appointment != NULL && item->appointment->end != NULL)
-                    fprintf(f->output, "DTEND;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->end));
-                if (item->appointment != NULL && item->appointment->location != NULL)
-                    fprintf(f->output, "LOCATION:%s\n", rfc2426_escape(item->appointment->location));
-                if (item->appointment != NULL) {
-                    switch (item->appointment->showas) {
-                    case PST_FREEBUSY_TENTATIVE:
-                        fprintf(f->output, "STATUS:TENTATIVE\n");
-                        break;
-                    case PST_FREEBUSY_FREE:
-                        // mark as transparent and as confirmed
-                        fprintf(f->output, "TRANSP:TRANSPARENT\n");
-                    case PST_FREEBUSY_BUSY:
-                    case PST_FREEBUSY_OUT_OF_OFFICE:
-                        fprintf(f->output, "STATUS:CONFIRMED\n");
-                        break;
-                    }
-                    switch (item->appointment->label) {
-                    case PST_APP_LABEL_NONE:
-                        fprintf(f->output, "CATEGORIES:NONE\n"); break;
-                    case PST_APP_LABEL_IMPORTANT:
-                        fprintf(f->output, "CATEGORIES:IMPORTANT\n"); break;
-                    case PST_APP_LABEL_BUSINESS:
-                        fprintf(f->output, "CATEGORIES:BUSINESS\n"); break;
-                    case PST_APP_LABEL_PERSONAL:
-                        fprintf(f->output, "CATEGORIES:PERSONAL\n"); break;
-                    case PST_APP_LABEL_VACATION:
-                        fprintf(f->output, "CATEGORIES:VACATION\n"); break;
-                    case PST_APP_LABEL_MUST_ATTEND:
-                        fprintf(f->output, "CATEGORIES:MUST-ATTEND\n"); break;
-                    case PST_APP_LABEL_TRAVEL_REQ:
-                        fprintf(f->output, "CATEGORIES:TRAVEL-REQUIRED\n"); break;
-                    case PST_APP_LABEL_NEEDS_PREP:
-                        fprintf(f->output, "CATEGORIES:NEEDS-PREPARATION\n"); break;
-                    case PST_APP_LABEL_BIRTHDAY:
-                        fprintf(f->output, "CATEGORIES:BIRTHDAY\n"); break;
-                    case PST_APP_LABEL_ANNIVERSARY:
-                        fprintf(f->output, "CATEGORIES:ANNIVERSARY\n"); break;
-                    case PST_APP_LABEL_PHONE_CALL:
-                        fprintf(f->output, "CATEGORIES:PHONE-CALL\n"); break;
-                    }
-                }
-                fprintf(f->output, "END:VEVENT\n\n");
-            } else {
-                f->skip_count++;
-                DEBUG_MAIN(("main: Unknown item type. %i. Ascii1=\"%s\"\n",
-                              item->type, item->ascii_type));
-            }
-        } else {
-            f->skip_count++;
-            DEBUG_MAIN(("main: A NULL item was seen\n"));
-        }
-        DEBUG_MAIN(("main: Going to next d_ptr\n"));
-        if (boundary) {
-            free(boundary);
-            boundary = NULL;
-        }
-    check_parent:
-        //    _pst_freeItem(item);
-        while (!skip_child && d_ptr->next == NULL && d_ptr->parent != NULL) {
-            DEBUG_MAIN(("main: Going to Parent\n"));
-            head = f->next;
-            if (f->output != NULL)
-                fclose(f->output);
-            DEBUG_MAIN(("main: Email Count for folder %s is %i\n", f->dname, f->email_count));
-            if (output_mode != OUTPUT_QUIET)
-                printf("\t\"%s\" - %i items done, skipped %i, should have been %i\n",
-                              f->dname, f->email_count, f->skip_count, f->stored_count);
-            if (mode == MODE_KMAIL)
-                close_kmail_dir();
-            else if (mode == MODE_RECURSE)
-                close_recurse_dir();
-            else if (mode == MODE_SEPERATE)
-                close_seperate_dir();
-            free(f->name);
-            free(f->dname);
-            free(f);
-            f = head;
-            if (head == NULL) { //we can't go higher. Must be at start?
-                DEBUG_MAIN(("main: We are now trying to go above the highest level. We must be finished\n"));
-                break; //from main while loop
-            }
-            d_ptr = d_ptr->parent;
-            skip_child = 0;
-        }
-
-        if (item != NULL) {
-            DEBUG_MAIN(("main: Freeing memory used by item\n"));
-            _pst_freeItem(item);
-            item = NULL;
-        }
-        if (!skip_child)
-            d_ptr = d_ptr->next;
-        else
-            skip_child = 0;
-
-        if (d_ptr == NULL) {
-            DEBUG_MAIN(("main: d_ptr is now NULL\n"));
-        }
-    }
-    if (output_mode != OUTPUT_QUIET) printf("Finished.\n");
-
-    DEBUG_MAIN(("main: Finished.\n"));
-    pst_close(&pstfile);
-    //  fclose(pstfile.fp);
-    while (f != NULL) {
-        if (f->output != NULL)
-          fclose(f->output);
-        free(f->name);
-        free(f->dname);
-
-        if (mode == MODE_KMAIL)
-            close_kmail_dir();
-        else if (mode == MODE_RECURSE)
-            close_recurse_dir();
-        else if (mode == MODE_SEPERATE)
-            // DO SOMETHING HERE
-            ;
-        head = f->next;
-        free (f);
-        f = head;
+    DEBUG_MAIN(("main: Processing Journal Entry\n"));
+    if (f->type != PST_TYPE_JOURNAL) {
+      DEBUG_MAIN(("main: I have a journal entry, but folder isn't specified as a journal type. Processing...\n"));
     }
 
-    DEBUG_RET();
-    return 0;
-}
+    /*  if (item->type != PST_TYPE_JOURNAL) {
+      DEBUG_MAIN(("main: I have an item with journal info, but it's type is \"%s\" \n. Processing...\n",
+              item->ascii_type));
+    }*/
+    fprintf(f->output, "BEGIN:VJOURNAL\n");
+    if (item->email->subject != NULL)
+      fprintf(f->output, "SUMMARY:%s\n", rfc2426_escape(item->email->subject->subj));
+    if (item->email->body != NULL)
+      fprintf(f->output, "DESCRIPTION:%s\n", rfc2426_escape(item->email->body));
+    if (item->journal->start != NULL)
+      fprintf(f->output, "DTSTART;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->journal->start));
+    fprintf(f->output, "END:VJOURNAL\n\n");
+    // }}}2
+      } else if (item->type == PST_TYPE_APPOINTMENT) {
+    // Process Calendar Appointment item {{{2
+    // deal with Calendar appointments
+    if (mode == MODE_SEPERATE) {
+      mk_seperate_file(f);
+    }
+    f->email_count++;
 
-void write_email_body(FILE *f, char *body) {
-    char *n = body;
-    //  DEBUG_MAIN(("write_email_body(): \"%s\"\n", body));
-    DEBUG_ENT("write_email_body");
-    while (n != NULL) {
-        if (strncmp(body, "From ", 5) == 0)
-            fprintf(f, ">");
-        if ((n = strchr(body, '\n'))) {
-            n++;
-            fwrite(body, n-body, 1, f); //write just a line
+    DEBUG_MAIN(("main: Processing Appointment Entry\n"));
+    if (f->type != PST_TYPE_APPOINTMENT) {
+      DEBUG_MAIN(("main: I have an appointment, but folder isn't specified as an appointment type. Processing...\n"));
+    }
+    fprintf(f->output, "BEGIN:VEVENT\n");
+    if (item->create_date != NULL)
+      fprintf(f->output, "CREATED:%s\n", rfc2445_datetime_format(item->create_date));
+    if (item->modify_date != NULL)
+      fprintf(f->output, "LAST-MOD:%s\n", rfc2445_datetime_format(item->modify_date));
+    if (item->email != NULL && item->email->subject != NULL)
+      fprintf(f->output, "SUMMARY:%s\n", rfc2426_escape(item->email->subject->subj));
+    if (item->email != NULL && item->email->body != NULL)
+      fprintf(f->output, "DESCRIPTION:%s\n", rfc2426_escape(item->email->body));
+    if (item->appointment != NULL && item->appointment->start != NULL)
+      fprintf(f->output, "DTSTART;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->start));
+    if (item->appointment != NULL && item->appointment->end != NULL)
+      fprintf(f->output, "DTEND;VALUE=DATE-TIME:%s\n", rfc2445_datetime_format(item->appointment->end));
+    if (item->appointment != NULL && item->appointment->location != NULL)
+      fprintf(f->output, "LOCATION:%s\n", rfc2426_escape(item->appointment->location));
+    if (item->appointment != NULL) {
+      switch (item->appointment->showas) {
+      case PST_FREEBUSY_TENTATIVE:
+        fprintf(f->output, "STATUS:TENTATIVE\n");
+        break;
+      case PST_FREEBUSY_FREE:
+        // mark as transparent and as confirmed
+        fprintf(f->output, "TRANSP:TRANSPARENT\n");
+      case PST_FREEBUSY_BUSY:
+      case PST_FREEBUSY_OUT_OF_OFFICE:
+        fprintf(f->output, "STATUS:CONFIRMED\n");
+        break;
+      }
+      switch (item->appointment->label) {
+      case PST_APP_LABEL_NONE:
+        fprintf(f->output, "CATEGORIES:NONE\n"); break;
+      case PST_APP_LABEL_IMPORTANT:
+        fprintf(f->output, "CATEGORIES:IMPORTANT\n"); break;
+      case PST_APP_LABEL_BUSINESS:
+        fprintf(f->output, "CATEGORIES:BUSINESS\n"); break;
+      case PST_APP_LABEL_PERSONAL:
+        fprintf(f->output, "CATEGORIES:PERSONAL\n"); break;
+      case PST_APP_LABEL_VACATION:
+        fprintf(f->output, "CATEGORIES:VACATION\n"); break;
+      case PST_APP_LABEL_MUST_ATTEND:
+        fprintf(f->output, "CATEGORIES:MUST-ATTEND\n"); break;
+      case PST_APP_LABEL_TRAVEL_REQ:
+        fprintf(f->output, "CATEGORIES:TRAVEL-REQUIRED\n"); break;
+      case PST_APP_LABEL_NEEDS_PREP:
+        fprintf(f->output, "CATEGORIES:NEEDS-PREPARATION\n"); break;
+      case PST_APP_LABEL_BIRTHDAY:
+        fprintf(f->output, "CATEGORIES:BIRTHDAY\n"); break;
+      case PST_APP_LABEL_ANNIVERSARY:
+        fprintf(f->output, "CATEGORIES:ANNIVERSARY\n"); break;
+      case PST_APP_LABEL_PHONE_CALL:
+        fprintf(f->output, "CATEGORIES:PHONE-CALL\n"); break;
+      }
+    }
+    fprintf(f->output, "END:VEVENT\n\n");
+    // }}}2
+      } else {
+    f->skip_count++;
+    DEBUG_MAIN(("main: Unknown item type. %i. Ascii1=\"%s\"\n",
+           item->type, item->ascii_type));
+      }
+    } else {
+      f->skip_count++;
+      DEBUG_MAIN(("main: A NULL item was seen\n"));
+    }
 
-            body = n;
-        }
+    DEBUG_MAIN(("main: Going to next d_ptr\n"));
+    if (boundary) {
+      free(boundary);
+      boundary = NULL;
     }
-    fwrite(body, strlen(body), 1, f);
-    DEBUG_RET();
-}
 
-char * removeCR (char *c) {
-    // converts /r/n to /n
-    char *a, *b;
-    DEBUG_ENT("removeCR");
-    a = b = c;
-    while (*a != '\0') {
-        *b = *a;
-        if (*a != '\r')
-            b++;
-        a++;
+  check_parent:
+    //    _pst_freeItem(item);
+    while (!skip_child && d_ptr->next == NULL && d_ptr->parent != NULL) {
+      DEBUG_MAIN(("main: Going to Parent\n"));
+      head = f->next;
+      if (f->output != NULL)
+    fclose(f->output);
+      DEBUG_MAIN(("main: Email Count for folder %s is %i\n", f->dname, f->email_count));
+      if (output_mode != OUTPUT_QUIET)
+    printf("\t\"%s\" - %i items done, skipped %i, should have been %i\n",
+           f->dname, f->email_count, f->skip_count, f->stored_count);
+      if (mode == MODE_KMAIL)
+    close_kmail_dir();
+      else if (mode == MODE_RECURSE)
+    close_recurse_dir();
+      else if (mode == MODE_SEPERATE)
+    close_seperate_dir();
+      free(f->name);
+      free(f->dname);
+      free(f);
+      f = head;
+      if (head == NULL) { //we can't go higher. Must be at start?
+    DEBUG_MAIN(("main: We are now trying to go above the highest level. We must be finished\n"));
+    break; //from main while loop
+      }
+      d_ptr = d_ptr->parent;
+      skip_child = 0;
+    }
+
+    if (item != NULL) {
+      DEBUG_MAIN(("main: Freeing memory used by item\n"));
+      _pst_freeItem(item);
+      item = NULL;
+    }
+
+    if (!skip_child)
+      d_ptr = d_ptr->next;
+    else
+      skip_child = 0;
+
+    if (d_ptr == NULL) {
+      DEBUG_MAIN(("main: d_ptr is now NULL\n"));
     }
-    *b = '\0';
-    DEBUG_RET();
-    return c;
+  }
+  if (output_mode != OUTPUT_QUIET) printf("Finished.\n");
+  DEBUG_MAIN(("main: Finished.\n"));
+
+    // Cleanup {{{2
+  pst_close(&pstfile);
+  //  fclose(pstfile.fp);
+  while (f != NULL) {
+    if (f->output != NULL)
+     fclose(f->output);
+    free(f->name);
+    free(f->dname);
+
+    if (mode == MODE_KMAIL)
+      close_kmail_dir();
+    else if (mode == MODE_RECURSE)
+      close_recurse_dir();
+    else if (mode == MODE_SEPERATE)
+      // DO SOMETHING HERE
+      ;
+    head = f->next;
+    free (f);
+    f = head;
+  }
+
+  DEBUG_RET();
+    // }}}2
+
+  return 0;
 }
+// }}}1
+// void write_email_body(FILE *f, char *body) {{{1
+void write_email_body(FILE *f, char *body) {
+  char *n = body;
+  //  DEBUG_MAIN(("write_email_body(): \"%s\"\n", body));
+  DEBUG_ENT("write_email_body");
+  while (n != NULL) {
+    if (strncmp(body, "From ", 5) == 0)
+      fprintf(f, ">");
+    if ((n = strchr(body, '\n'))) {
+      n++;
+      fwrite(body, n-body, 1, f); //write just a line
 
+      body = n;
+    }
+  }
+  fwrite(body, strlen(body), 1, f);
+  DEBUG_RET();
+}
+// }}}1
+// char *removeCR (char *c) {{{1
+char *removeCR (char *c) {
+  // converts /r/n to /n
+  char *a, *b;
+  DEBUG_ENT("removeCR");
+  a = b = c;
+  while (*a != '\0') {
+    *b = *a;
+    if (*a != '\r')
+      b++;
+    a++;
+  }
+  *b = '\0';
+  DEBUG_RET();
+  return c;
+}
+// }}}1
+// int usage() {{{1
 int usage() {
-    DEBUG_ENT("usage");
-    version();
-    printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name);
-    printf("OPTIONS:\n");
-    printf("\t-c[v|l]\t- Set the Contact output mode. -cv = VCard, -cl = EMail list\n");
-    printf("\t-d\t- Debug to file. This is a binary log. Use readlog to print it\n");
-    printf("\t-h\t- Help. This screen\n");
-    printf("\t-k\t- KMail. Output in kmail format\n");
-    printf("\t-o\t- Output Dir. Directory to write files to. CWD is changed *after* opening pst file\n");
-    printf("\t-q\t- Quiet. Only print error messages\n");
-    printf("\t-r\t- Recursive. Output in a recursive format\n");
-    printf("\t-S\t- Seperate. Write emails in the seperate format\n");
-    printf("\t-V\t- Version. Display program version\n");
-    printf("\t-w\t- Overwrite any output mbox files\n");
-    DEBUG_RET();
-    return 0;
+  DEBUG_ENT("usage");
+  version();
+  printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name);
+  printf("OPTIONS:\n");
+  printf("\t-c[v|l]\t- Set the Contact output mode. -cv = VCard, -cl = EMail list\n");
+  printf("\t-d\t- Debug to file. This is a binary log. Use readlog to print it\n");
+  printf("\t-h\t- Help. This screen\n");
+  printf("\t-k\t- KMail. Output in kmail format\n");
+  printf("\t-o\t- Output Dir. Directory to write files to. CWD is changed *after* opening pst file\n");
+  printf("\t-q\t- Quiet. Only print error messages\n");
+  printf("\t-r\t- Recursive. Output in a recursive format\n");
+  printf("\t-S\t- Seperate. Write emails in the seperate format\n");
+  printf("\t-V\t- Version. Display program version\n");
+  printf("\t-w\t- Overwrite any output mbox files\n");
+  DEBUG_RET();
+  return 0;
 }
-
+// }}}1
+// int version() {{{1
 int version() {
-    DEBUG_ENT("version");
-    printf("ReadPST v%s implementing LibPST v%s\n", VERSION, PST_VERSION);
+  DEBUG_ENT("version");
+  printf("ReadPST v%s implementing LibPST v%s\n", VERSION, PST_VERSION);
 #if BYTE_ORDER == BIG_ENDIAN
-    printf("Big Endian implementation being used.\n");
+  printf("Big Endian implementation being used.\n");
 #elif BYTE_ORDER == LITTLE_ENDIAN
-    printf("Little Endian implementation being used.\n");
+  printf("Little Endian implementation being used.\n");
 #else
 #  error "Byte order not supported by this library"
 #endif
 #ifdef __GNUC__
-    printf("GCC %d.%d : %s %s\n", __GNUC__, __GNUC_MINOR__, __DATE__, __TIME__);
+  printf("GCC %d.%d : %s %s\n", __GNUC__, __GNUC_MINOR__, __DATE__, __TIME__);
 #endif
-    DEBUG_RET();
-    return 0;
+  DEBUG_RET();
+  return 0;
 }
-
-char *kmail_chdir = NULL;
-
-char* mk_kmail_dir(char *fname) {
-    //change to that directory
-    //make a directory based on OUTPUT_KMAIL_DIR_TEMPLATE
-    //allocate space for OUTPUT_TEMPLATE and form a char* with fname
-    //return that value
-    char *dir, *out_name, *index;
-    int x;
-    DEBUG_ENT("mk_kmail_dir");
-    if (kmail_chdir != NULL && chdir(kmail_chdir)) {
-        x = errno;
-        DIE(("mk_kmail_dir: Cannot change to directory %s: %s\n", kmail_chdir, strerror(x)));
+// }}}1
+// char *mk_kmail_dir(char *fname) {{{1
+char *mk_kmail_dir(char *fname) {
+  //change to that directory
+  //make a directory based on OUTPUT_KMAIL_DIR_TEMPLATE
+  //allocate space for OUTPUT_TEMPLATE and form a char* with fname
+  //return that value
+  char *dir, *out_name, *index;
+  int x;
+  DEBUG_ENT("mk_kmail_dir");
+  if (kmail_chdir != NULL && chdir(kmail_chdir)) {
+    x = errno;
+    DIE(("mk_kmail_dir: Cannot change to directory %s: %s\n", kmail_chdir, strerror(x)));
+  }
+  dir = malloc(strlen(fname)+strlen(OUTPUT_KMAIL_DIR_TEMPLATE)+1);
+  sprintf(dir, OUTPUT_KMAIL_DIR_TEMPLATE, fname);
+  dir = check_filename(dir);
+  if (D_MKDIR(dir)) {
+    //error occured
+    if (errno != EEXIST) {
+      x = errno;
+      DIE(("mk_kmail_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
     }
-    dir = malloc(strlen(fname)+strlen(OUTPUT_KMAIL_DIR_TEMPLATE)+1);
-    sprintf(dir, OUTPUT_KMAIL_DIR_TEMPLATE, fname);
-    dir = check_filename(dir);
-    if (D_MKDIR(dir)) {
-        //error occured
-        if (errno != EEXIST) {
-            x = errno;
-            DIE(("mk_kmail_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
-        }
-    }
-    kmail_chdir = realloc(kmail_chdir, strlen(dir)+1);
-    strcpy(kmail_chdir, dir);
-    free (dir);
+  }
+  kmail_chdir = realloc(kmail_chdir, strlen(dir)+1);
+  strcpy(kmail_chdir, dir);
+  free (dir);
 
-    //we should remove any existing indexes created by KMail, cause they might be different now
-    index = malloc(strlen(fname)+strlen(KMAIL_INDEX)+1);
-    sprintf(index, KMAIL_INDEX, fname);
-    unlink(index);
-    free(index);
+  //we should remove any existing indexes created by KMail, cause they might be different now
+  index = malloc(strlen(fname)+strlen(KMAIL_INDEX)+1);
+  sprintf(index, KMAIL_INDEX, fname);
+  unlink(index);
+  free(index);
 
-    out_name = malloc(strlen(fname)+strlen(OUTPUT_TEMPLATE)+1);
-    sprintf(out_name, OUTPUT_TEMPLATE, fname);
-    DEBUG_RET();
-    return out_name;
+  out_name = malloc(strlen(fname)+strlen(OUTPUT_TEMPLATE)+1);
+  sprintf(out_name, OUTPUT_TEMPLATE, fname);
+  DEBUG_RET();
+  return out_name;
 }
-
+// }}}1
+// int close_kmail_dir() {{{1
 int close_kmail_dir() {
-    // change ..
-    int x;
-    DEBUG_ENT("close_kmail_dir");
-    if (kmail_chdir != NULL) { //only free kmail_chdir if not NULL. do not change directory
-        free(kmail_chdir);
-        kmail_chdir = NULL;
-    } else {
-        if (chdir("..")) {
-            x = errno;
-            DIE(("close_kmail_dir: Cannot move up dir (..): %s\n", strerror(x)));
-        }
+  // change ..
+  int x;
+  DEBUG_ENT("close_kmail_dir");
+  if (kmail_chdir != NULL) { //only free kmail_chdir if not NULL. do not change directory
+    free(kmail_chdir);
+    kmail_chdir = NULL;
+  } else {
+    if (chdir("..")) {
+      x = errno;
+      DIE(("close_kmail_dir: Cannot move up dir (..): %s\n", strerror(x)));
     }
-    DEBUG_RET();
-    return 0;
+  }
+  DEBUG_RET();
+  return 0;
 }
-
-char* mk_recurse_dir(char *dir) {
-    // this will create a directory by that name, then make an mbox file inside that dir.
-    // any subsequent dirs will be created by name, and they will contain mbox files
-    int x;
-    char *out_name;
-    DEBUG_ENT("mk_recurse_dir");
-    dir = check_filename(dir);
-    if (D_MKDIR (dir)) {
-        if (errno != EEXIST) { // not an error because it exists
-            x = errno;
-            DIE(("mk_recurse_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
-        }
-    }
-    if (chdir (dir)) {
-        x = errno;
-        DIE(("mk_recurse_dir: Cannot change to directory %s: %s\n", dir, strerror(x)));
+// }}}1
+// char *mk_recurse_dir(char *dir) {{{1
+// this will create a directory by that name, then make an mbox file inside
+// that dir.  any subsequent dirs will be created by name, and they will
+// contain mbox files
+char *mk_recurse_dir(char *dir) {
+  int x;
+  char *out_name;
+  DEBUG_ENT("mk_recurse_dir");
+  dir = check_filename(dir);
+  if (D_MKDIR (dir)) {
+    if (errno != EEXIST) { // not an error because it exists
+      x = errno;
+      DIE(("mk_recurse_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
     }
-    out_name = malloc(strlen("mbox")+1);
-    strcpy(out_name, "mbox");
-    DEBUG_RET();
-    return out_name;
+  }
+  if (chdir (dir)) {
+    x = errno;
+    DIE(("mk_recurse_dir: Cannot change to directory %s: %s\n", dir, strerror(x)));
+  }
+  out_name = malloc(strlen("mbox")+1);
+  strcpy(out_name, "mbox");
+  DEBUG_RET();
+  return out_name;
 }
-
+// }}}1
+// int close_recurse_dir() {{{1
 int close_recurse_dir() {
-    int x;
-    DEBUG_ENT("close_recurse_dir");
-    if (chdir("..")) {
-        x = errno;
-        DIE(("close_recurse_dir: Cannot go up dir (..): %s\n", strerror(x)));
-    }
-    DEBUG_RET();
-    return 0;
+  int x;
+  DEBUG_ENT("close_recurse_dir");
+  if (chdir("..")) {
+    x = errno;
+    DIE(("close_recurse_dir: Cannot go up dir (..): %s\n", strerror(x)));
+  }
+  DEBUG_RET();
+  return 0;
 }
-
-char* mk_seperate_dir(char *dir, int overwrite) {
+// }}}1
+// char *mk_seperate_dir(char *dir, int overwrite) {{{1
+char *mk_seperate_dir(char *dir, int overwrite) {
 #if !defined(WIN32) && !defined(__CYGWIN__)
-    DIR * sdir = NULL;
-    struct dirent *dirent = NULL;
-    struct stat *filestat = xmalloc(sizeof(struct stat));
+  DIR * sdir = NULL;
+  struct dirent *dirent = NULL;
+  struct stat *filestat = xmalloc(sizeof(struct stat));
 #endif
 
-    char *dir_name = NULL;
-    int x = 0, y = 0;
-    DEBUG_ENT("mk_seperate_dir");
-    /*#if defined(WIN32) || defined(__CYGWIN__)
-    DIE(("mk_seperate_dir: Win32 applications cannot use this function yet.\n"));
-    #endif*/
+  char *dir_name = NULL;
+  int x = 0, y = 0;
+  DEBUG_ENT("mk_seperate_dir");
+  /*#if defined(WIN32) || defined(__CYGWIN__)
+  DIE(("mk_seperate_dir: Win32 applications cannot use this function yet.\n"));
+  #endif*/
 
-    dir_name = xmalloc(strlen(dir)+10);
+  dir_name = xmalloc(strlen(dir)+10);
+
+  do {
+    if (y == 0)
+      sprintf(dir_name, "%s", dir);
+    else
+      sprintf(dir_name, "%s%09i", dir, y); // enough for 9 digits allocated above
 
-    do {
-        if (y == 0)
-            sprintf(dir_name, "%s", dir);
-        else
-            sprintf(dir_name, "%s%09i", dir, y); // enough for 9 digits allocated above
+    dir_name = check_filename(dir_name);
+    DEBUG_MAIN(("mk_seperate_dir: about to try creating %s\n", dir_name));
+    if (D_MKDIR(dir_name)) {
+      if (errno != EEXIST) { // if there is an error, and it doesn't already exist
+    x = errno;
+    DIE(("mk_seperate_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
+      }
+    } else {
+      break;
+    }
+    y++;
+  } while (overwrite == 0);
 
-        dir_name = check_filename(dir_name);
-        DEBUG_MAIN(("mk_seperate_dir: about to try creating %s\n", dir_name));
-        if (D_MKDIR(dir_name)) {
-            if (errno != EEXIST) { // if there is an error, and it doesn't already exist
-        x = errno;
-        DIE(("mk_seperate_dir: Cannot create directory %s: %s\n", dir, strerror(x)));
-            }
-        } else {
-            break;
+  if (chdir (dir_name)) {
+    x = errno;
+    DIE(("mk_recurse_dir: Cannot change to directory %s: %s\n", dir, strerror(x)));
+  }
+
+  if (overwrite) {
+    // we should probably delete all files from this directory
+#if !defined(WIN32) && !defined(__CYGWIN__)
+    if ((sdir = opendir("./")) == NULL) {
+      WARN(("mk_seperate_dir: Cannot open dir \"%s\" for deletion of old contents\n", "./"));
+    } else {
+      while ((dirent = readdir(sdir)) != NULL) {
+    if (lstat(dirent->d_name, filestat) != -1)
+      if (S_ISREG(filestat->st_mode)) {
+        if (unlink(dirent->d_name)) {
+          y = errno;
+          DIE(("mk_seperate_dir: unlink returned error on file %s: %s\n", dirent->d_name, strerror(y)));
         }
-        y++;
-    } while (overwrite == 0);
+      }
+      }
+    }
+#endif
+  }
 
-    if (chdir (dir_name)) {
-        x = errno;
-        DIE(("mk_recurse_dir: Cannot change to directory %s: %s\n", dir, strerror(x)));
-    }
+  // overwrite will never change during this function, it is just there so that
+  //  if overwrite is set, we only go through this loop once.
 
-    if (overwrite) {
-        // we should probably delete all files from this directory
-#if !defined(WIN32) && !defined(__CYGWIN__)
-        if ((sdir = opendir("./")) == NULL) {
-            WARN(("mk_seperate_dir: Cannot open dir \"%s\" for deletion of old contents\n", "./"));
-        } else {
-            while ((dirent = readdir(sdir)) != NULL) {
-        if (lstat(dirent->d_name, filestat) != -1)
-            if (S_ISREG(filestat->st_mode)) {
-                if (unlink(dirent->d_name)) {
-                    y = errno;
-                    DIE(("mk_seperate_dir: unlink returned error on file %s: %s\n", dirent->d_name, strerror(y)));
-                }
-            }
-            }
-        }
-#endif
+  // we don't return a filename here cause it isn't necessary.
+  DEBUG_RET();
+  return NULL;
+}
+// }}}1
+// int close_seperate_dir() {{{1
+int close_seperate_dir() {
+  int x;
+  DEBUG_ENT("close_seperate_dir");
+  if (chdir("..")) {
+    x = errno;
+    DIE(("close_seperate_dir: Cannot go up dir (..): %s\n", strerror(x)));
+  }
+  DEBUG_RET();
+  return 0;
+}
+// }}}1
+// int mk_seperate_file(struct file_ll *f) {{{1
+int mk_seperate_file(struct file_ll *f) {
+  DEBUG_ENT("mk_seperate_file");
+  DEBUG_MAIN(("mk_seperate_file: opening next file to save email\n"));
+  if (f->email_count > 999999999) { // bigger than nine 9's
+    DIE(("mk_seperate_file: The number of emails in this folder has become too high to handle"));
+  }
+  sprintf(f->name, "%09i", f->email_count);
+  if (f->output != NULL)
+    fclose(f->output);
+  f->output = NULL;
+  f->name = check_filename(f->name);
+  if ((f->output = fopen(f->name, "w")) == NULL) {
+    DIE(("mk_seperate_file: Cannot open file to save email \"%s\"\n", f->name));
+  }
+  DEBUG_RET();
+  return 0;
+}
+// }}}1
+// char *my_stristr(char *haystack, char *needle) {{{1
+char *my_stristr(char *haystack, char *needle) {
+// my_stristr varies from strstr in that its searches are case-insensitive
+  char *x=haystack, *y=needle, *z = NULL;
+  DEBUG_ENT("my_stristr");
+  if (haystack == NULL || needle == NULL)
+    return NULL;
+  while (*y != '\0' && *x != '\0') {
+    if (tolower(*y) == tolower(*x)) {
+      // move y on one
+      y++;
+      if (z == NULL) {
+    z = x; // store first position in haystack where a match is made
+      }
+    } else {
+      y = needle; // reset y to the beginning of the needle
+      z = NULL; // reset the haystack storage point
+    }
+    x++; // advance the search in the haystack
+  }
+  DEBUG_RET();
+  return z;
+}
+// }}}1
+// char *check_filename(char *fname) {{{1
+char *check_filename(char *fname) {
+  char *t = fname;
+  DEBUG_ENT("check_filename");
+  if (t == NULL) {
+    DEBUG_RET();
+    return fname;
+  }
+  while ((t = strpbrk(t, "/\\:")) != NULL) {
+    // while there are characters in the second string that we don't want
+    *t = '_'; //replace them with an underscore
+  }
+  DEBUG_RET();
+  return fname;
+}
+// }}}1
+// char *rfc2426_escape(char *str) {{{1
+char *rfc2426_escape(char *str) {
+  static char* buf = NULL;
+  char *ret, *a, *b;
+  int x = 0, y, z;
+  DEBUG_ENT("rfc2426_escape");
+  if (str == NULL)
+    ret = str;
+  else {
+
+    // calculate space required to escape all the following characters
+    x = strlen(str) +(y=(chr_count(str, ',')*2) + (chr_count(str, '\\')*2) + (chr_count(str, ';')*2) + (chr_count(str, '\n')*2));
+    z = chr_count(str, '\r');
+    if (y == 0 && z == 0)
+      // there isn't any extra space required
+      ret = str;
+    else {
+      buf = (char*) realloc(buf, x+1);
+      a = str;
+      b = buf;
+      while (*a != '\0') {
+    switch(*a) {
+    case ',' :
+    case '\\':
+    case ';' :
+    case '\n':
+      *(b++)='\\';
+      *b=*a;
+    break;
+    case '\r':
+      break;
+    default:
+      *b=*a;
+    }
+    b++;
+      a++;
+      }
+      *b = '\0';
+      ret = buf;
+    }
+  }
+  DEBUG_RET();
+  return ret;
+}
+// }}}1
+// int chr_count(char *str, char x) {{{1
+int chr_count(char *str, char x) {
+  int r = 0;
+  while (*str != '\0') {
+    if (*str == x)
+      r++;
+    str++;
+  }
+  return r;
+}
+// }}}1
+// char *rfc2425_datetime_format(FILETIME *ft) {{{1
+char *rfc2425_datetime_format(FILETIME *ft) {
+  static char * buffer = NULL;
+  struct tm *stm = NULL;
+  DEBUG_ENT("rfc2425_datetime_format");
+  if (buffer == NULL)
+    buffer = malloc(30); // should be enough for the date as defined below
+
+  stm = fileTimeToStructTM(ft);
+  //Year[4]-Month[2]-Day[2] Hour[2]:Min[2]:Sec[2]
+  if (strftime(buffer, 30, "%Y-%m-%dT%H:%M:%SZ", stm)==0) {
+    DEBUG_INFO(("Problem occured formatting date\n"));
+  }
+  DEBUG_RET();
+  return buffer;
+}
+// }}}1
+// char *rfc2445_datetime_format(FILETIME *ft) {{{1
+char *rfc2445_datetime_format(FILETIME *ft) {
+  static char* buffer = NULL;
+  struct tm *stm = NULL;
+  DEBUG_ENT("rfc2445_datetime_format");
+  if (buffer == NULL)
+    buffer = malloc(30); // should be enough
+  stm = fileTimeToStructTM(ft);
+  if (strftime(buffer, 30, "%Y%m%dT%H%M%SZ", stm)==0) {
+    DEBUG_INFO(("Problem occured formatting date\n"));
+  }
+  DEBUG_RET();
+  return buffer;
+}
+// }}}1
+// char *skip_header_prologue(char *headers) {{{1
+// The sole purpose of this function is to bypass the pseudo-header prologue
+// that Microsoft Outlook inserts at the beginning of the internet email
+// headers for emails stored in their "Personal Folders" files.
+char *skip_header_prologue(char *headers) {
+    const char *bad = "Microsoft Mail Internet Headers";
+
+    if ( strncmp(headers, bad, strlen(bad)) == 0 ) {
+        // Found the offensive header prologue
+        char *pc;
+
+        pc = strchr(headers, '\n');
+        return pc + 1;
     }
 
-    // overwrite will never change during this function, it is just there so that
-    //  if overwrite is set, we only go through this loop once.
-
-    // we don't return a filename here cause it isn't necessary.
-    DEBUG_RET();
-    return NULL;
-}
-
-int close_seperate_dir() {
-    int x;
-    DEBUG_ENT("close_seperate_dir");
-    if (chdir("..")) {
-        x = errno;
-        DIE(("close_seperate_dir: Cannot go up dir (..): %s\n", strerror(x)));
-    }
-    DEBUG_RET();
-    return 0;
-}
-
-int mk_seperate_file(struct file_ll *f) {
-    DEBUG_ENT("mk_seperate_file");
-    DEBUG_MAIN(("mk_seperate_file: opening next file to save email\n"));
-    if (f->email_count > 999999999) { // bigger than nine 9's
-        DIE(("mk_seperate_file: The number of emails in this folder has become too high to handle"));
-    }
-    sprintf(f->name, "%09i", f->email_count);
-    if (f->output != NULL)
-        fclose(f->output);
-    f->output = NULL;
-    f->name = check_filename(f->name);
-    if ((f->output = fopen(f->name, "w")) == NULL) {
-        DIE(("mk_seperate_file: Cannot open file to save email \"%s\"\n", f->name));
-    }
-    DEBUG_RET();
-    return 0;
+    return headers;
 }
-
-// my_stristr varies from strstr in that its searches are case-insensitive
-char * my_stristr(char *haystack, char *needle) {
-    char *x=haystack, *y=needle, *z = NULL;
-    DEBUG_ENT("my_stristr");
-    if (haystack == NULL || needle == NULL)
-        return NULL;
-    while (*y != '\0' && *x != '\0') {
-        if (tolower(*y) == tolower(*x)) {
-            // move y on one
-            y++;
-            if (z == NULL) {
-        z = x; // store first position in haystack where a match is made
-            }
-        } else {
-            y = needle; // reset y to the beginning of the needle
-            z = NULL; // reset the haystack storage point
-        }
-        x++; // advance the search in the haystack
-    }
-    DEBUG_RET();
-    return z;
-}
-
-char *check_filename(char *fname) {
-    char *t = fname;
-    DEBUG_ENT("check_filename");
-    if (t == NULL) {
-        DEBUG_RET();
-        return fname;
-    }
-    while ((t = strpbrk(t, "/\\:")) != NULL) {
-        // while there are characters in the second string that we don't want
-        *t = '_'; //replace them with an underscore
-    }
-    DEBUG_RET();
-    return fname;
-}
+// }}}1
 
-char *rfc2426_escape(char *str) {
-    static char* buf = NULL;
-    char *ret, *a, *b;
-    int x = 0, y, z;
-    DEBUG_ENT("rfc2426_escape");
-    if (str == NULL)
-        ret = str;
-    else {
-
-        // calculate space required to escape all the following characters
-        x = strlen(str) +(y=(chr_count(str, ',')*2) + (chr_count(str, '\\')*2) + (chr_count(str, ';')*2) + (chr_count(str, '\n')*2));
-        z = chr_count(str, '\r');
-        if (y == 0 && z == 0)
-            // there isn't any extra space required
-            ret = str;
-        else {
-            buf = (char*) realloc(buf, x+1);
-            a = str;
-            b = buf;
-            while (*a != '\0') {
-        switch(*a) {
-        case ',' :
-        case '\\':
-        case ';' :
-        case '\n':
-            *(b++)='\\';
-            *b=*a;
-        break;
-        case '\r':
-            break;
-        default:
-            *b=*a;
-        }
-        b++;
-            a++;
-            }
-            *b = '\0';
-            ret = buf;
-        }
-    }
-    DEBUG_RET();
-    return ret;
-}
-
-int chr_count(char *str, char x) {
-    int r = 0;
-    while (*str != '\0') {
-        if (*str == x)
-            r++;
-        str++;
-    }
-    return r;
-}
-
-char *rfc2425_datetime_format(FILETIME *ft) {
-    static char * buffer = NULL;
-    struct tm *stm = NULL;
-    DEBUG_ENT("rfc2425_datetime_format");
-    if (buffer == NULL)
-        buffer = malloc(30); // should be enough for the date as defined below
-
-    stm = fileTimeToStructTM(ft);
-    //Year[4]-Month[2]-Day[2] Hour[2]:Min[2]:Sec[2]
-    if (strftime(buffer, 30, "%Y-%m-%dT%H:%M:%SZ", stm)==0) {
-        DEBUG_INFO(("Problem occured formatting date\n"));
-    }
-    DEBUG_RET();
-    return buffer;
-}
-char *rfc2445_datetime_format(FILETIME *ft) {
-    static char* buffer = NULL;
-    struct tm *stm = NULL;
-    DEBUG_ENT("rfc2445_datetime_format");
-    if (buffer == NULL)
-        buffer = malloc(30); // should be enough
-    stm = fileTimeToStructTM(ft);
-    if (strftime(buffer, 30, "%Y%m%dT%H%M%SZ", stm)==0) {
-        DEBUG_INFO(("Problem occured formatting date\n"));
-    }
-    DEBUG_RET();
-    return buffer;
-}
+// vim:sw=4 ts=4:
+// vim600: set foldlevel=0 foldmethod=marker: