X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=handler.c;h=1ed6c23189d09537725998bf02a039eb5f6b4961;hp=a118df79f4e4851215d29b9e275d2c9e6e101f48;hb=207c707f2c7073a6fbd14124197a559d9d471f65;hpb=ae0ce4dfcafa0c3820f107c5bfa8bd06e5272b57

diff --git a/handler.c b/handler.c
index a118df7..1ed6c23 100644
--- a/handler.c
+++ b/handler.c
@@ -328,14 +328,14 @@ void mutt_decode_uuencoded (STATE * s, long len, int istext, iconv_t cd)
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
     len -= m_strlen(tmps);
-    if ((!str_ncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
+    if ((!m_strncmp(tmps, "begin", 5)) && ISSPACE (tmps[5]))
       break;
   }
   while (len > 0) {
     if ((fgets (tmps, sizeof (tmps), s->fpin)) == NULL)
       return;
     len -= m_strlen(tmps);
-    if (!str_ncmp (tmps, "end", 3))
+    if (!m_strncmp(tmps, "end", 3))
       break;
     pt = tmps;
     linelen = decode_byte (*pt);
@@ -1104,7 +1104,7 @@ static int autoview_handler (BODY * a, STATE * s)
   p_delete(&fname);
 
   if (entry->command) {
-    strfcpy (command, entry->command, sizeof (command));
+    m_strcpy(command, sizeof(command), entry->command);
 
     /* rfc1524_expand_command returns 0 if the file is required */
     piped =
@@ -1399,7 +1399,7 @@ int mutt_body_handler (BODY * b, STATE * s)
         handler = mutt_signed_handler;
     }
     else if ((WithCrypto & APPLICATION_PGP)
-             && str_casecmp ("encrypted", b->subtype) == 0) {
+             && m_strcasecmp("encrypted", b->subtype) == 0) {
       p = mutt_get_parameter ("protocol", b->parameter);
 
       if (!p)