X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc3676.c;h=0ca9ff74ce114a7c7a22617d30e304354e8f6392;hp=68bf1f5c6fb8598e0a99dccdb5fe428d69f78db9;hb=58e0ddff3bd5e1b9455e8c3ebb1f4b9e7dd71920;hpb=9ed7a487e3a922f2cbb222961c2c9710c3a65f91

diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index 68bf1f5..0ca9ff7 100644
--- a/lib-mime/rfc3676.c
+++ b/lib-mime/rfc3676.c
@@ -165,7 +165,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
      * which may make the line look like fixed although it wasn't
      * so keep this in mind for later processing */
     fixed = buf_len == 0 || buf[buf_len - 1] != ' ' ||
-            (strcmp(buf + buf_off, "-- ") == 0);
+            (m_strcmp(buf + buf_off, "-- ") == 0);
 
     if (delsp && buf_len >= 1 && buf[buf_len-1] == ' ')
       buf[--buf_len] = '\0';
@@ -180,14 +180,14 @@ int rfc3676_handler (BODY * a, STATE * s) {
     }
 
     /* signature separator also flushes the previous paragraph */
-    if (strcmp(buf + buf_off, "-- ") == 0 && curline && *curline) {
+    if (m_strcmp(buf + buf_off, "-- ") == 0 && curline && *curline) {
       print_flowed_line (curline, s, quotelevel);
       *curline = '\0';
       curline_len = 1;
     }
 
     p_realloc(&curline, curline_len + buf_len - buf_off);
-    strcpy (curline + curline_len - 1, buf + buf_off);
+    m_strcpy(curline + curline_len - 1, buf_len - buf_off + 1, buf + buf_off);
     curline_len += buf_len - buf_off;
 
     /* if this was a fixed line the paragraph is finished */
@@ -225,7 +225,7 @@ void rfc3676_space_stuff (HEADER* hdr) {
   if ((in = safe_fopen (hdr->content->filename, "r")) == NULL)
     return;
 
-  out = m_tempfile(tmpf, sizeof(tmpf), NONULL(Tempdir), NULL);
+  out = m_tempfile(tmpf, sizeof(tmpf), NONULL(MCore.tmpdir), NULL);
   if (!out) {
     m_fclose(&in);
     return;