libpst: src/readpst.c comparison

comparison src/readpst.c @ 231:fe64279df92b

patches from Chris White, Roberto Polli, Justin Greer

author	Carl Byington <carl@five-ten-sg.com>
date	Thu, 10 Sep 2009 15:21:23 -0700
parents	42b38d65f7e4
children	1d50ff3c5091

comparison

equal deleted inserted replaced

-:42b38d65f7e4
+:fe64279df92b
 #define RTF_ATTACH_TYPE "application/rtf"
 // global settings
 int         mode         = MODE_NORMAL;
 int         mode_MH      = 0;   // a submode of MODE_SEPARATE
+int         mode_thunder = 0;   // a submode of MODE_RECURSE
 int         output_mode  = OUTPUT_NORMAL;
 int         contact_mode = CMODE_VCARD;
 int         deleted_mode = DMODE_EXCLUDE;
 int         output_type_mode = 0xff;    // Default to all.
 int         contact_mode_specified = 0;
 printf("cannot compile regex pattern to find content charset in html bodies\n");
 exit(3);
 }
 // command-line option handling
-while ((c = getopt(argc, argv, "bc:Dd:hj:kMo:qrSt:Vw"))!= -1) {
+while ((c = getopt(argc, argv, "bc:Dd:hj:kMo:qrSt:uVw"))!= -1) {
 switch (c) {
 case 'b':
 save_rtf_body = 0;
 break;
 case 'c':
 case 'q':
 output_mode = OUTPUT_QUIET;
 break;
 case 'r':
 mode = MODE_RECURSE;
+mode_thunder = 0;
 break;
 case 'S':
 mode = MODE_SEPARATE;
 mode_MH = 0;
-break;
-case 'V':
-version();
-exit(0);
 break;
 case 't':
 // email, appointment, contact, other
 if (!optarg) {
 usage();
 break;
 }
 temp++;
 }
 break;
+case 'u':
+mode = MODE_RECURSE;
+mode_thunder = 1;
+break;
+case 'V':
+version();
+exit(0);
+break;
 case 'w':
 overwrite = 1;
 break;
 default:
 usage();
 printf("\t-D\t- Include deleted items in output\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-b\t- Don't save RTF-Body attachments\n");
 printf("\t-c[v|l]\t- Set the Contact output mode. -cv = VCard, -cl = EMail list\n");
-printf("\t-t[eajc]\t- Set the output type list. e = email, a = attachment, j = journal, c = contact\n");
 printf("\t-d <filename> \t- Debug to file. This is a binary log. Use readpstlog to print it\n");
 printf("\t-h\t- Help. This screen\n");
 printf("\t-j <integer>\t- Number of parallel jobs to run\n");
 printf("\t-k\t- KMail. Output in kmail format\n");
 printf("\t-o <dirname>\t- Output 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-t[eajc]\t- Set the output type list. e = email, a = attachment, j = journal, c = contact\n");
+printf("\t-u\t- Thunderbird mode. Write two extra .size and .type files\n");
 printf("\t-w\t- Overwrite any output mbox files\n");
 printf("\n");
 printf("Only one of -k -M -r -S should be specified\n");
 DEBUG_RET();
 }
 void write_embedded_message(FILE* f_output, pst_item_attach* attach, char *boundary, pst_file* pf, char** extra_mime_headers)
 {
 pst_index_ll *ptr;
 DEBUG_ENT("write_embedded_message");
-fprintf(f_output, "\n--%s\n", boundary);
-fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str);
 ptr = pst_getID(pf, attach->i_id);
 pst_desc_tree d_ptr;
 d_ptr.d_id        = 0;
 d_ptr.parent_d_id = 0;
 d_ptr.parent      = NULL;
 d_ptr.child       = NULL;
 d_ptr.child_tail  = NULL;
 pst_item *item = pst_parse_item(pf, &d_ptr, attach->id2_head);
-write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers);
+// It appears that if the embedded message contains an appointment/
-pst_freeItem(item);
+// calendar item, pst_parse_item returns NULL due to the presence of
+// an unexpected reference type of 0x1048, which seems to represent
+// an array of GUIDs representing a CLSID. It's likely that this is
+// a reference to an internal Outlook COM class.
+//      Log the skipped item and continue on.
+if (!item) {
+DEBUG_WARN(("write_embedded_message: pst_parse_item was unable to parse the embedded message in attachment ID %llu", attach->i_id));
+} else {
+fprintf(f_output, "\n--%s\n", boundary);
+fprintf(f_output, "Content-Type: %s\n\n", attach->mimetype.str);
+write_normal_email(f_output, "", item, MODE_NORMAL, 0, pf, 0, extra_mime_headers);
+pst_freeItem(item);
+}
 DEBUG_RET();
 }
 f->stored_count = (item->folder) ? item->folder->item_count : 0;
 DEBUG_ENT("create_enter_dir");
 if (mode == MODE_KMAIL)
 f->name = mk_kmail_dir(item->file_as.str);
-else if (mode == MODE_RECURSE)
+else if (mode == MODE_RECURSE) {
 f->name = mk_recurse_dir(item->file_as.str, f->type);
-else if (mode == MODE_SEPARATE) {
+if (mode_thunder) {
+FILE *type_file = fopen(".type", "w");
+fprintf(type_file, "%d\n", item->type);
+fclose(type_file);
+}
+} else if (mode == MODE_SEPARATE) {
 // do similar stuff to recurse here.
 mk_separate_dir(item->file_as.str);
 f->name = (char*) pst_malloc(10);
 memset(f->name, 0, 10);
 } else {
 free(f->name);
 free(f->dname);
 if (mode == MODE_KMAIL)
 close_kmail_dir();
-else if (mode == MODE_RECURSE)
+else if (mode == MODE_RECURSE) {
+if (mode_thunder) {
+FILE *type_file = fopen(".size", "w");
+fprintf(type_file, "%i %i\n", f->item_count, f->stored_count);
+fclose(type_file);
+}
 close_recurse_dir();
-else if (mode == MODE_SEPARATE)
+} else if (mode == MODE_SEPARATE)
 close_separate_dir();
 }

Mercurial > libpst

comparison src/readpst.c @ 231:fe64279df92b