X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstoresbr.c;h=7c91184f9c26b0a3cb24d9525f0b970fe0e533b0;hp=5776ef357859f4e492e87ae0b275303e5219aa37;hb=f480c03187724e54e5391ee61b810827da319a6c;hpb=08aa8c17c3241bb5c6a997ed2e01e25a4d0089ce

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 5776ef3..7c91184 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -2,8 +2,6 @@
 /*
  * mhstoresbr.c -- routines to save/store the contents of MIME messages
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -225,8 +223,8 @@ store_application (CT ct)
 
 	for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
 	    /* check for "type=tar" attribute */
-	    if (!strcasecmp (*ap, "type")) {
-		if (strcasecmp (*ep, "tar"))
+	    if (!mh_strcasecmp (*ap, "type")) {
+		if (mh_strcasecmp (*ep, "tar"))
 		    break;
 
 		tarP = 1;
@@ -234,14 +232,14 @@ store_application (CT ct)
 	    }
 
 	    /* check for "conversions=compress" attribute */
-	    if ((!strcasecmp (*ap, "conversions") || !strcasecmp (*ap, "x-conversions"))
-		&& (!strcasecmp (*ep, "compress") || !strcasecmp (*ep, "x-compress"))) {
+	    if ((!mh_strcasecmp (*ap, "conversions") || !mh_strcasecmp (*ap, "x-conversions"))
+		&& (!mh_strcasecmp (*ep, "compress") || !mh_strcasecmp (*ep, "x-compress"))) {
 		zP = 1;
 		continue;
 	    }
 	    /* check for "conversions=gzip" attribute */
-	    if ((!strcasecmp (*ap, "conversions") || !strcasecmp (*ap, "x-conversions"))
-		&& (!strcasecmp (*ep, "gzip") || !strcasecmp (*ep, "x-gzip"))) {
+	    if ((!mh_strcasecmp (*ap, "conversions") || !mh_strcasecmp (*ap, "x-conversions"))
+		&& (!mh_strcasecmp (*ep, "gzip") || !mh_strcasecmp (*ep, "x-gzip"))) {
 		gzP = 1;
 		continue;
 	    }
@@ -482,7 +480,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];
@@ -534,8 +532,8 @@ store_content (CT ct, CT p)
      * Get storage formatting string.
      *
      * 1) If we have storeproc defined, then use that
-     * 2) Else check for a mhn-store-<type>/<subtype> entry
-     * 3) Else check for a mhn-store-<type> entry
+     * 2) Else check for a mhstore-store-<type>/<subtype> entry
+     * 3) Else check for a mhstore-store-<type> entry
      * 4) Else if content is "message", use "+" (current folder)
      * 5) Else use string "%m%P.%s".
      */
@@ -560,17 +558,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);
@@ -1041,7 +1039,7 @@ get_storeproc (CT ct)
      * the storeproc.
      */
     for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-	if (!strcasecmp (*ap, "name")
+	if (!mh_strcasecmp (*ap, "name")
 	    && *(cp = *ep) != '/'
 	    && *cp != '.'
 	    && *cp != '|'
@@ -1072,10 +1070,10 @@ copy_some_headers (FILE *out, CT ct)
 	 * messages are not copied.
 	 */
 	if (!uprf (hp->name, XXX_FIELD_PRF)
-		&& strcasecmp (hp->name, VRSN_FIELD)
-		&& strcasecmp (hp->name, "Subject")
-		&& strcasecmp (hp->name, "Encrypted")
-		&& strcasecmp (hp->name, "Message-ID"))
+		&& mh_strcasecmp (hp->name, VRSN_FIELD)
+		&& mh_strcasecmp (hp->name, "Subject")
+		&& mh_strcasecmp (hp->name, "Encrypted")
+		&& mh_strcasecmp (hp->name, "Message-ID"))
 	    fprintf (out, "%s:%s", hp->name, hp->value);
 	hp = hp->next;	/* next header field */
     }