move rfc2047.c into lib-mime, reindent it.

[apps/madmutt.git] / mh.c

diff --git a/mh.c b/mh.c
index 09a2fb3..a013376 100644 (file)
--- a/mh.c
+++ b/mh.c
@@ -495,7 +495,7 @@ static void maildir_parse_flags (HEADER * h, const char *path)
   if ((p = strrchr (path, ':')) != NULL && m_strncmp(p + 1, "2,", 2) == 0) {
     p += 3;
 
-    str_replace (&h->maildir_flags, p);
+    m_strreplace(&h->maildir_flags, p);
     q = h->maildir_flags;
 
     while (*p) {
@@ -1134,7 +1134,7 @@ static int maildir_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr)
 
     if (safe_rename (msg->path, full) == 0) {
       if (hdr)
-        str_replace (&hdr->path, path);
+        m_strreplace(&hdr->path, path);
       p_delete(&msg->path);
 
       /*
@@ -1220,7 +1220,7 @@ static int _mh_commit_message (MESSAGE * msg, CONTEXT * ctx, HEADER * hdr,
     snprintf (path, sizeof (path), "%s/%s", ctx->path, tmp);
     if (safe_rename (msg->path, path) == 0) {
       if (hdr)
-        str_replace (&hdr->path, tmp);
+        m_strreplace(&hdr->path, tmp);
       p_delete(&msg->path);
       break;
     }
@@ -1299,7 +1299,7 @@ static int mh_rewrite_message (CONTEXT * ctx, int msgno)
     if (ctx->magic == M_MH && rc == 0) {
       snprintf (newpath, _POSIX_PATH_MAX, "%s/%s", ctx->path, h->path);
       if ((rc = safe_rename (newpath, oldpath)) == 0)
-        str_replace (&h->path, partpath);
+        m_strreplace(&h->path, partpath);
     }
   }
   else
@@ -1377,7 +1377,7 @@ static int maildir_sync_message (CONTEXT * ctx, int msgno)
       mutt_perror ("rename");
       return (-1);
     }
-    str_replace (&h->path, partpath);
+    m_strreplace(&h->path, partpath);
   }
   return (0);
 }
@@ -1631,7 +1631,7 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
        * subdirectory.  If so, update the associated filename.
        */
       if (m_strcmp(ctx->hdrs[i]->path, p->h->path))
-        str_replace (&ctx->hdrs[i]->path, p->h->path);
+        m_strreplace(&ctx->hdrs[i]->path, p->h->path);
 
       /* if the user hasn't modified the flags on this message, update
        * the flags we just detected.