libpst: src/readpst.c comparison

comparison src/readpst.c @ 230:42b38d65f7e4

patches from Justin Greer

author	Carl Byington <carl@five-ten-sg.com>
date	Thu, 10 Sep 2009 13:01:08 -0700
parents	4a659f3138b7
children	fe64279df92b

comparison

equal deleted inserted replaced

-:e7f363452178
+:42b38d65f7e4
 // output mode for deleted items
 #define DMODE_EXCLUDE 0
 #define DMODE_INCLUDE 1
+// Output type mode flags
+#define OTMODE_EMAIL        1
+#define OTMODE_APPOINTMENT  2
+#define OTMODE_JOURNAL      4
+#define OTMODE_CONTACT      8
 // output settings for RTF bodies
 // filename for the attachment
 #define RTF_ATTACH_NAME "rtf-body.rtf"
 // mime type for the attachment
 #define RTF_ATTACH_TYPE "application/rtf"
 int         mode         = MODE_NORMAL;
 int         mode_MH      = 0;   // a submode of MODE_SEPARATE
 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;
 int         overwrite = 0;
 int         save_rtf_body = 1;
 pst_file    pstfile;
 regex_t     meta_charset_pattern;
 DEBUG_INFO(("Processing Contact\n"));
 if (ff.type != PST_TYPE_CONTACT) {
 ff.skip_count++;
 DEBUG_INFO(("I have a contact, but the folder type %"PRIi32" isn't a contacts folder. Skipping it\n", ff.type));
 }
+else if (!(output_type_mode & OTMODE_CONTACT)) {
+ff.skip_count++;
+DEBUG_INFO(("skipping contact: not in output type list\n"));
+}
 else {
 ff.item_count++;
 if (mode == MODE_SEPARATE) mk_separate_file(&ff);
 if (contact_mode == CMODE_VCARD) {
 pst_convert_utf8_null(item, &item->comment);
 DEBUG_INFO(("Processing Email\n"));
 if ((ff.type != PST_TYPE_NOTE) && (ff.type != PST_TYPE_SCHEDULE) && (ff.type != PST_TYPE_REPORT)) {
 ff.skip_count++;
 DEBUG_INFO(("I have an email type %"PRIi32", but the folder type %"PRIi32" isn't an email folder. Skipping it\n", item->type, ff.type));
 }
+else if (!(output_type_mode & OTMODE_EMAIL)) {
+ff.skip_count++;
+DEBUG_INFO(("skipping email: not in output type list\n"));
+}
 else {
 char *extra_mime_headers = NULL;
 ff.item_count++;
 if (mode == MODE_SEPARATE) mk_separate_file(&ff);
 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body, &extra_mime_headers);
 DEBUG_INFO(("Processing Journal Entry\n"));
 if (ff.type != PST_TYPE_JOURNAL) {
 ff.skip_count++;
 DEBUG_INFO(("I have a journal entry, but the folder type %"PRIi32" isn't a journal folder. Skipping it\n", ff.type));
 }
+else if (!(output_type_mode & OTMODE_JOURNAL)) {
+ff.skip_count++;
+DEBUG_INFO(("skipping journal entry: not in output type list\n"));
+}
 else {
 ff.item_count++;
 if (mode == MODE_SEPARATE) mk_separate_file(&ff);
 write_journal(ff.output, item);
 fprintf(ff.output, "\n");
 if (!ff.type) ff.type = item->type;
 DEBUG_INFO(("Processing Appointment Entry\n"));
 if (ff.type != PST_TYPE_APPOINTMENT) {
 ff.skip_count++;
 DEBUG_INFO(("I have an appointment, but the folder type %"PRIi32" isn't an appointment folder. Skipping it\n", ff.type));
+}
+else if (!(output_type_mode & OTMODE_APPOINTMENT)) {
+ff.skip_count++;
+DEBUG_INFO(("skipping appointment: not in output type list\n"));
 }
 else {
 ff.item_count++;
 if (mode == MODE_SEPARATE) mk_separate_file(&ff);
 write_appointment(ff.output, item, 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:qrSVw"))!= -1) {
+while ((c = getopt(argc, argv, "bc:Dd:hj:kMo:qrSt:Vw"))!= -1) {
 switch (c) {
 case 'b':
 save_rtf_body = 0;
 break;
 case 'c':
 mode_MH = 0;
 break;
 case 'V':
 version();
 exit(0);
+break;
+case 't':
+// email, appointment, contact, other
+if (!optarg) {
+usage();
+exit(0);
+}
+temp = optarg;
+output_type_mode = 0;
+while (*temp > 0) {
+switch (temp[0]) {
+case 'e':
+output_type_mode |= OTMODE_EMAIL;
+break;
+case 'a':
+output_type_mode |= OTMODE_APPOINTMENT;
+break;
+case 'j':
+output_type_mode |= OTMODE_JOURNAL;
+break;
+case 'c':
+output_type_mode |= OTMODE_CONTACT;
+break;
+default:
+usage();
+exit(0);
+break;
+}
+temp++;
+}
 break;
 case 'w':
 overwrite = 1;
 break;
 default:
 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");
 fprintf(f_output, "From \"%s\" %s\n", sender, c_time);
 }
 // print the supplied email headers
 if (headers) {
-int len;
+int len = strlen(headers);
-fprintf(f_output, "%s", headers);
+if (len > 0) {
-// make sure the headers end with a \n
+fprintf(f_output, "%s", headers);
-len = strlen(headers);
+// make sure the headers end with a \n
-if (!len || (headers[len-1] != '\n')) fprintf(f_output, "\n");
+if (headers[len-1] != '\n') fprintf(f_output, "\n");
+}
 }
 // create required header fields that are not already written
 if (!has_from) {

Mercurial > libpst

comparison src/readpst.c @ 230:42b38d65f7e4