Mercurial > libpst

diff src/readpst.c @ 79:56fa05fd5271

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Patch from Robert Simpson for encryption type 2. Fix the order of testing item types to avoid claiming there are multiple message stores.
author Carl Byington <carl@five-ten-sg.com>
date Fri, 13 Jun 2008 20:47:01 -0700
parents 87216aefc6df
children 1e4a7610d525
line wrap: on
line diff
--- a/src/readpst.c	Tue Jun 10 14:28:55 2008 -0700
+++ b/src/readpst.c	Fri Jun 13 20:47:01 2008 -0700
@@ -133,11 +133,6 @@
                 DEBUG_EMAIL(("item->email->subject->subj = %p\n", item->email->subject->subj));
             }
             if (item) {
-                if (item->message_store) {
-                    // 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 && d_ptr->child && strcasecmp(item->file_as, "Deleted Items")) {
                     //if this is a non-empty folder other than deleted items, we want to recurse into it
                     if (output_mode != OUTPUT_QUIET) printf("Processing Folder \"%s\"\n", item->file_as);
@@ -194,6 +189,10 @@
                     }
                     write_appointment(ff.output, item->appointment, item->email, item->create_date, item->modify_date);
 
+                } else if (item->message_store) {
+                    // there should only be one message_store, and we have already done it
+                    DEBUG_MAIN(("item with message store content, type %i %s folder type %i, skipping it\n", item->type, item->ascii_type, ff.type));
+
                 } else {
                     // these all seem to be things that MS agrees are not included in the item count
                     //ff.skip_count++;
@@ -308,7 +307,7 @@
         }
 
         while (0 != (l = fread(buf, 1, 1024, fp))) {
-            if (0 != pst_decrypt(buf, l, PST_COMP_ENCRYPT))
+            if (0 != pst_decrypt(0, buf, l, PST_COMP_ENCRYPT))
                 fprintf(stderr, "pst_decrypt() failed (I'll try to continue)\n");
 
             if (l != pst_fwrite(buf, 1, l, stdout)) {
@@ -413,7 +412,7 @@
     version();
     printf("Usage: %s [OPTIONS] {PST FILENAME}\n", prog_name);
     printf("OPTIONS:\n");
-    printf("\t-C\t- Decrypt the entire file and output on stdout (not typically useful)\n");
+    printf("\t-C\t- Decrypt (compressible encryption) the entire file and output on stdout (not typically useful)\n");
     printf("\t-M\t- MH. Write emails in the MH format\n");
     printf("\t-S\t- Separate. Write emails in the separate format\n");
     printf("\t-V\t- Version. Display program version\n");