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

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 5776ef3..ed1b822 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.
@@ -14,7 +12,6 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
@@ -51,7 +48,6 @@ typedef int (*qsort_comp) (const void *, const void *);
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
-int make_intermediates (char *);
 void flush_errors (void);
 
 /* mhshowsbr.c */
@@ -96,9 +92,7 @@ store_all_messages (CT *cts)
      * Check for the directory in which to
      * store any contents.
      */
-    if (autosw)
-	dir = getcpy (cwd);
-    else if ((cp = context_find (nmhstorage)) && *cp)
+    if ((cp = context_find (nmhstorage)) && *cp)
 	dir = getcpy (cp);
     else
 	dir = getcpy (cwd);
@@ -225,8 +219,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 +228,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 +476,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 +554,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 +1035,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 +1066,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 */
     }