Use good m_ functions, because it smell like a flower, version 2.

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 65007ae..9afd5cd 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -198,7 +198,7 @@ void mutt_pretty_mailbox (char *s)
   /* if s is an url, only collapse path component */
   if (scheme != U_UNKNOWN) {
     p = strchr (s, ':') + 1;
   /* if s is an url, only collapse path component */
   if (scheme != U_UNKNOWN) {
     p = strchr (s, ':') + 1;

-    if (!strncmp (p, "//", 2))
+    if (!m_strncmp (p, "//", 2))

       q = strchr (p + 2, '/');
     if (!q)
       q = strchr (p, '\0');
       q = strchr (p + 2, '/');
     if (!q)
       q = strchr (p, '\0');


@@ -846,7 +846,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
                 tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
                 ptr = xmalloc(tok->dsize);
                 memcpy(ptr, expn.data, expnlen);
                 tok->dsize = expnlen + m_strlen(tok->dptr) + 1;
                 ptr = xmalloc(tok->dsize);
                 memcpy(ptr, expn.data, expnlen);

-                strcpy(ptr + expnlen, tok->dptr);      /* __STRCPY_CHECKED__ */
+                m_strcpy(ptr + expnlen, tok->dsize - expnlen, tok->dptr);

                 if (tok->destroy)
                     p_delete(&tok->data);
                 tok->data = ptr;
                 if (tok->destroy)
                     p_delete(&tok->data);
                 tok->data = ptr;