libpst: src/readpst.c comparison

comparison src/readpst.c @ 291:bc23fba0da8e

possible fix for corrupted output forking for separate messages

author	Carl Byington <carl@five-ten-sg.com>
date	Sat, 04 Jun 2011 11:38:12 -0700
parents	fec37c150982
children	e0e5844d91b3

comparison

equal deleted inserted replaced

-:fec37c150982
+:bc23fba0da8e
 int       close_kmail_dir();
 char*     mk_recurse_dir(char* dir, int32_t folder_type);
 int       close_recurse_dir();
 char*     mk_separate_dir(char *dir);
 int       close_separate_dir();
-int       mk_separate_file(struct file_ll *f, char *extension);
+void      mk_separate_file(struct file_ll *f, char *extension);
+void      close_separate_file(struct file_ll *f);
 char*     my_stristr(char *haystack, char *needle);
 void      check_filename(char *fname);
 void      write_separate_attachment(char f_name[], pst_item_attach* attach, int attach_num, pst_file* pst);
 void      write_embedded_message(FILE* f_output, pst_item_attach* attach, char *boundary, pst_file* pf, char** extra_mime_headers);
 void      write_inline_attachment(FILE* f_output, pst_item_attach* attach, char *boundary, pst_file* pst);
 else {
 pst_convert_utf8(item, &item->contact->fullname);
 pst_convert_utf8(item, &item->contact->address1);
 fprintf(ff.output, "%s <%s>\n", item->contact->fullname.str, item->contact->address1.str);
 }
+if (mode == MODE_SEPARATE) close_separate_file(&ff);
 }
 }
 } else if (item->email && ((item->type == PST_TYPE_NOTE) || (item->type == PST_TYPE_SCHEDULE) || (item->type == PST_TYPE_REPORT))) {
 DEBUG_INFO(("Processing Email\n"));
 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 {
 char *extra_mime_headers = NULL;
 ff.item_count++;
-if (mode == MODE_SEPARATE) mk_separate_file(&ff, (mode_EX) ? ".eml" : "");
 if (mode == MODE_SEPARATE) {
 // process this single email message, possibly forking
 pid_t parent = getpid();
 pid_t child = try_fork(item->file_as.str);
 if (child == 0) {
 // we are the child process, or the original parent if no children were available
 pid_t me = getpid();
+mk_separate_file(&ff, (mode_EX) ? ".eml" : "");
 write_normal_email(ff.output, ff.name, item, mode, mode_MH, &pstfile, save_rtf_body, &extra_mime_headers);
+close_separate_file(&ff);
 #ifdef HAVE_FORK
 #ifdef HAVE_SEMAPHORE_H
 if (me != parent) {
 // we really were a child, forked for the sole purpose of processing this message
 // free my child count slot before really exiting, since
 else {
 ff.item_count++;
 if (mode == MODE_SEPARATE) mk_separate_file(&ff, (mode_EX) ? ".ics" : "");
 write_journal(ff.output, item);
 fprintf(ff.output, "\n");
+if (mode == MODE_SEPARATE) close_separate_file(&ff);
 }
 }
 } else if (item->appointment && (item->type == PST_TYPE_APPOINTMENT)) {
 DEBUG_INFO(("Processing Appointment Entry\n"));
 else {
 ff.item_count++;
 if (mode == MODE_SEPARATE) mk_separate_file(&ff, (mode_EX) ? ".ics" : "");
 write_schedule_part_data(ff.output, item, NULL, NULL);
 fprintf(ff.output, "\n");
+if (mode == MODE_SEPARATE) close_separate_file(&ff);
 }
 }
 } else if (item->message_store) {
 // there should only be one message_store, and we have already done it
 DEBUG_RET();
 return 0;
 }
-int mk_separate_file(struct file_ll *f, char *extension) {
+void mk_separate_file(struct file_ll *f, char *extension) {
 DEBUG_ENT("mk_separate_file");
 DEBUG_INFO(("opening next file to save email\n"));
 if (f->item_count > 999999999) { // bigger than nine 9's
 DIE(("mk_separate_file: The number of emails in this folder has become too high to handle\n"));
 }
 sprintf(f->name, SEP_MAIL_FILE_TEMPLATE, f->item_count, extension);
-if (f->output) fclose(f->output);
-f->output = NULL;
 check_filename(f->name);
 if (!(f->output = fopen(f->name, "w"))) {
 DIE(("mk_separate_file: Cannot open file to save email \"%s\"\n", f->name));
 }
 DEBUG_RET();
-return 0;
+}
+void close_separate_file(struct file_ll *f) {
+DEBUG_ENT("close_separate_file");
+if (f->output) {
+struct stat st;
+fclose(f->output);
+stat(f->name, &st);
+if (!st.st_size) {
+DEBUG_WARN(("removing empty output file %s\n", f->name));
+remove(f->name);
+}
+f->output = NULL;
+}
+DEBUG_RET();
 }
 char *my_stristr(char *haystack, char *needle) {
 // my_stristr varies from strstr in that its searches are case-insensitive
 printf("\t\"%s\" - %i items done, %i items skipped.\n", f->dname, f->item_count, f->skip_count);
 fflush(stdout);
 pst_debug_unlock();
 }
 if (f->output) {
+if (mode == MODE_SEPARATE) DEBUG_WARN(("close_enter_dir finds open separate file\n"));
 struct stat st;
 fclose(f->output);
 stat(f->name, &st);
 if (!st.st_size) {
 DEBUG_WARN(("removing empty output file %s\n", f->name));
 remove(f->name);
 }
+f->output = NULL;
 }
 free(f->name);
 free(f->dname);
 if (mode == MODE_KMAIL)

Mercurial > libpst

comparison src/readpst.c @ 291:bc23fba0da8e