X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhstoresbr.c;h=151b2e6474ceadc827011f4bf4fe9cf5481cbbbc;hb=03bf20a885b3953a0385e814ba4e0196b46f6159;hp=bf5088e7ee4567b420a4385a84db6f88c608861b;hpb=d2f12554a254e814dcdafb3828fc0d9936154eef;p=mmh

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index bf5088e..151b2e6 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -482,7 +482,7 @@ ct_compar (CT *a, CT *b)
 static int
 store_content (CT ct, CT p)
 {
-    int appending = 0, msgnum;
+    int appending = 0, msgnum = 0;
     int is_partial = 0, first_partial = 0;
     int last_partial = 0;
     char *cp, buffer[BUFSIZ];
@@ -560,17 +560,17 @@ store_content (CT ct, CT p)
 	char *tmpfilenam, *folder;
 
 	/* Store content in temporary file for now */
-	tmpfilenam = m_scratch ("", invo_name);
+	tmpfilenam = m_mktemp(invo_name, NULL, NULL);
 	ct->c_storage = add (tmpfilenam, NULL);
 
 	/* Get the folder name */
 	if (cp[1])
-	    folder = path (cp + 1, *cp == '+' ? TFOLDER : TSUBCWF);
+	    folder = pluspath (cp);
 	else
 	    folder = getfolder (1);
 
 	/* Check if folder exists */
-	create_folder(folder, 0, exit);
+	create_folder(m_mailpath(folder), 0, exit);
 
 	/* Record the folder name */
 	ct->c_folder = add (folder, NULL);