# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1237505537 25200
# Node ID c1a2fd06ffe66596ad31db025724d600c2626e21
# Parent  40e9de4450387f9a9da22e4c80f127c754542291
prep for fedora build

diff -r 40e9de445038 -r c1a2fd06ffe6 ChangeLog
--- a/ChangeLog	Wed Mar 18 22:31:18 2009 -0700
+++ b/ChangeLog	Thu Mar 19 16:32:17 2009 -0700
@@ -1,4 +1,4 @@
-LibPST 0.6.34 (2009-0x-xx)
+LibPST 0.6.34 (2009-03-19)
 ===============================
     * improve consistency checking when fetching items from the pst file.
     * avoid putting mixed item types into the same output folder.
diff -r 40e9de445038 -r c1a2fd06ffe6 NEWS
--- a/NEWS	Wed Mar 18 22:31:18 2009 -0700
+++ b/NEWS	Thu Mar 19 16:32:17 2009 -0700
@@ -1,3 +1,4 @@
+0.6.34  2009-03-19 avoid putting mixed item types into the same output folder
 0.6.33  2009-03-17 fix utf-7 conversions, don't produce empty attachment files in separate mode
 0.6.32  2009-03-14 fix ppc64 compile error
 0.6.31  2009-03-14 bump version for fedora cvs tagging mistake
diff -r 40e9de445038 -r c1a2fd06ffe6 libpst.spec.in
--- a/libpst.spec.in	Wed Mar 18 22:31:18 2009 -0700
+++ b/libpst.spec.in	Thu Mar 19 16:32:17 2009 -0700
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Thu Mar 19 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.34-1
+- avoid putting mixed item types into the same output folder.
+
 * Tue Mar 17 2009 Carl Byington <carl@five-ten-sg.com> - 0.6.33-1
 - compensate for iconv conversion to utf-7 that produces strings that
   are not null terminated.
diff -r 40e9de445038 -r c1a2fd06ffe6 regression/regression-tests.bash
--- a/regression/regression-tests.bash	Wed Mar 18 22:31:18 2009 -0700
+++ b/regression/regression-tests.bash	Thu Mar 19 16:32:17 2009 -0700
@@ -50,7 +50,7 @@
 
 
 val="valgrind --leak-check=full"
-#val=''
+val=''
 
 pushd ..
 make || exit
@@ -84,8 +84,6 @@
     #doldif  18 test-mac.pst
     #doldif  19 harris.pst
 else
-    dopst  11 flow.pst
-    exit
     dopst   1 ams.pst
     dopst   2 sample_64.pst
     dopst   3 test.pst
@@ -96,6 +94,7 @@
     dopst   8 ol2k3high.pst
     dopst   9 ol97high.pst
     dopst  10 returned_message.pst
+    dopst  11 flow.pst
     dopst  12 test-html.pst
     dopst  13 test-text.pst
     dopst  14 joe.romanowski.pst
@@ -108,4 +107,3 @@
 fi
 
 grep 'lost:' *err | grep -v 'lost: 0 '
-grep 'should have been' *err
diff -r 40e9de445038 -r c1a2fd06ffe6 src/libpst.c
--- a/src/libpst.c	Wed Mar 18 22:31:18 2009 -0700
+++ b/src/libpst.c	Thu Mar 19 16:32:17 2009 -0700
@@ -2038,7 +2038,7 @@
                     break;
                 case 0x001A: // PR_MESSAGE_CLASS IPM.x
                     if ((list->elements[x]->type == 0x1e) ||
-                        (list->elements[x]->type == 0x1e)) {
+                        (list->elements[x]->type == 0x1f)) {
                         LIST_COPY_CSTR(item->ascii_type);
                         if (!item->ascii_type) item->ascii_type = strdup("unknown");
                         if (pst_strincmp("IPM.Note", item->ascii_type, 8) == 0)
diff -r 40e9de445038 -r c1a2fd06ffe6 src/readpst.c
--- a/src/readpst.c	Wed Mar 18 22:31:18 2009 -0700
+++ b/src/readpst.c	Thu Mar 19 16:32:17 2009 -0700
@@ -1669,8 +1669,8 @@
 {
     DEBUG_MAIN(("main: processed item count for folder %s is %i, skipped %i, total %i \n",
                 f->dname, f->item_count, f->skip_count, f->stored_count));
-    if (output_mode != OUTPUT_QUIET)
-        printf("\t\"%s\" - %i items done.\n", f->dname, f->item_count);
+    if (output_mode != OUTPUT_QUIET) printf("\t\"%s\" - %i items done, %i items skipped.\n",
+                                            f->dname, f->item_count, f->skip_count);
     if (f->output) fclose(f->output);
     free(f->name);
     free(f->dname);