X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fmime.c;h=80e820b2bcd0123917e92a2546c774b32c720194;hb=b7d3afcfad94edf99a8dbc50ab670ded417e6bea;hp=821cb541d8ea42ded344a04c87e0fdef81335f1f;hpb=e1d04f48a45c9f8e8ff75610003048f8ead73219;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/mime.c b/src/src/mime.c
index 821cb541d..80e820b2b 100644
--- a/src/src/mime.c
+++ b/src/src/mime.c
@@ -157,24 +157,16 @@ while (fgets(CS ibuf, MIME_MAX_LINE_LENGTH, in) != NULL)
 	{
 	/* Error from decoder. ipos is unchanged. */
 	mime_set_anomaly(MIME_ANOMALY_BROKEN_QP);
-	*opos = '=';
-	++opos;
+	*opos++ = '=';
 	++ipos;
 	}
       else if (decode_qp_result == -1)
 	break;
       else if (decode_qp_result >= 0)
-	{
-	*opos = decode_qp_result;
-	++opos;
-	}
+	*opos++ = decode_qp_result;
       }
     else
-      {
-      *opos = *ipos;
-      ++opos;
-      ++ipos;
-      }
+      *opos++ = *ipos++;
     }
   /* something to write? */
   len = opos - obuf;
@@ -225,9 +217,8 @@ mime_decode(const uschar **listptr)
 {
 int sep = 0;
 const uschar *list = *listptr;
-uschar *option;
-uschar option_buffer[1024];
-uschar decode_path[1024];
+uschar * option;
+uschar * decode_path;
 FILE *decode_file = NULL;
 long f_pos = 0;
 ssize_t size_counter = 0;
@@ -237,12 +228,10 @@ if (!mime_stream || (f_pos = ftell(mime_stream)) < 0)
   return FAIL;
 
 /* build default decode path (will exist since MBOX must be spooled up) */
-(void)string_format(decode_path,1024,"%s/scan/%s",spool_directory,message_id);
+decode_path = string_sprintf("%s/scan/%s", spool_directory, message_id);
 
 /* try to find 1st option */
-if ((option = string_nextinlist(&list, &sep,
-				option_buffer,
-				sizeof(option_buffer))) != NULL)
+if ((option = string_nextinlist(&list, &sep, NULL, 0)))
   {
   /* parse 1st option */
   if ((Ustrcmp(option,"false") == 0) || (Ustrcmp(option,"0") == 0))