# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1238341873 25200
# Node ID 6c1e75bc4caca64c88f72e7f3a878d4d669ed258
# Parent  0e1e048716e4ae1b3d2807bc0dd05be1cd17f1da
properly add trailing mime boundary in all modes

diff -r 0e1e048716e4 -r 6c1e75bc4cac ChangeLog
--- a/ChangeLog	Sun Mar 22 14:34:26 2009 -0700
+++ b/ChangeLog	Sun Mar 29 08:51:13 2009 -0700
@@ -3,6 +3,7 @@
     * fix bug where we failed to pickup the last extended attribute.
     * patch from Emmanuel Andry to fix potential security bug in
       pst2dii with printf(err).
+    * properly add trailing mime boundary in all modes.	
 
 LibPST 0.6.34 (2009-03-19)
 ===============================
diff -r 0e1e048716e4 -r 6c1e75bc4cac src/libpst.c
--- a/src/libpst.c	Sun Mar 22 14:34:26 2009 -0700
+++ b/src/libpst.c	Sun Mar 29 08:51:13 2009 -0700
@@ -628,7 +628,7 @@
             // add it to the list
             pst_x_attrib_ll *p_sh  = p_head;
             pst_x_attrib_ll *p_sh2 = NULL;
-            while (p_sh && ptr->map > p_sh->map) {
+            while (p_sh && (ptr->map > p_sh->map)) {
                 p_sh2 = p_sh;
                 p_sh  = p_sh->next;
             }
diff -r 0e1e048716e4 -r 6c1e75bc4cac src/readpst.c
--- a/src/readpst.c	Sun Mar 22 14:34:26 2009 -0700
+++ b/src/readpst.c	Sun Mar 29 08:51:13 2009 -0700
@@ -1367,12 +1367,7 @@
         }
     }
 
-    // end of this mail message
-    if (mode != MODE_SEPARATE) { /* do not add a boundary after the last attachment for mode_MH */
-        DEBUG_EMAIL(("Writing buffer between emails\n"));
-        fprintf(f_output, "\n--%s--\n", boundary);
-        fprintf(f_output, "\n\n");
-    }
+    fprintf(f_output, "\n--%s--\n\n\n", boundary);
     DEBUG_RET();
 }